Merge branch 'master' of https://github.com/Anuken/Mindustry into tutorial

core/src/io/anuke/mindustry/game/Gamemode.java

@@ -30,11 +30,11 @@ public enum Gamemode{
         rules.pvp = true;
         rules.enemyCoreBuildRadius = 600f;
         rules.respawnTime = 60 * 10;
-        rules.buildCostMultiplier = 0.5f;
-        rules.buildSpeedMultiplier = 2f;
+        rules.buildCostMultiplier = 1f;
+        rules.buildSpeedMultiplier = 1f;
         rules.playerDamageMultiplier = 0.33f;
         rules.playerHealthMultiplier = 0.5f;
-        rules.unitBuildSpeedMultiplier = 3f;
+        rules.unitBuildSpeedMultiplier = 2f;
         rules.unitHealthMultiplier = 3f;
         rules.attackMode = true;
     }, map -> map.teams.size > 1),

core/src/io/anuke/mindustry/game/MusicControl.java

@@ -8,7 +8,7 @@ import io.anuke.arc.util.*;
 
 /** Controls playback of multiple music tracks.*/
 public class MusicControl{
-    private static final float finTime = 80f, foutTime = 80f;
+    private static final float finTime = 120f, foutTime = 120f;
     private @Nullable Music current;
     private float fade;