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

2018-07-05 17:11:27 -04:00
parent cb9d3414f2 6b3329845b
commit ab0f8defa4
93 changed files with 1338 additions and 1273 deletions
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -39,7 +39,7 @@ public class Vars{
 	//respawn time in frames
 	public static final float respawnduration = 60*4;
 	//time between waves in frames (on normal mode)
-	public static final float wavespace = 60*60*1.5f;
+	public static final float wavespace = 60*60*2f;
 	//waves can last no longer than 3 minutes, otherwise the next one spawns
 	public static final float maxwavespace = 60*60*4f;