diff --git a/build.gradle b/build.gradle index 3094edfff4..5a627c72cc 100644 --- a/build.gradle +++ b/build.gradle @@ -67,4 +67,4 @@ project(":core") { tasks.eclipse.doLast { delete ".project" -} \ No newline at end of file +} diff --git a/core/assets/maps/canyon.png b/core/assets/maps/canyon.png index 3b9d43316c..ab4521e23d 100644 Binary files a/core/assets/maps/canyon.png and b/core/assets/maps/canyon.png differ diff --git a/core/lib/ucore.jar b/core/lib/ucore.jar index cb536c92dc..37a4d65055 100644 Binary files a/core/lib/ucore.jar and b/core/lib/ucore.jar differ diff --git a/core/src/io/anuke/mindustry/Renderer.java b/core/src/io/anuke/mindustry/Renderer.java index fe59511f49..53241c6e14 100644 --- a/core/src/io/anuke/mindustry/Renderer.java +++ b/core/src/io/anuke/mindustry/Renderer.java @@ -36,7 +36,7 @@ public class Renderer{ for(int cx = 0; cx < chunksx; cx ++){ for(int cy = 0; cy < chunksy; cy ++){ - Caches.begin(); + Caches.begin(1600); for(int tilex = cx*chunksize; tilex < (cx+1)*chunksize; tilex++){ for(int tiley = cy*chunksize; tiley < (cy+1)*chunksize; tiley++){ diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index f3dfa9930b..d68def2fde 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -18,7 +18,7 @@ public class Vars{ public static final float respawnduration = 60*4; public static final float wavespace = 20*60; public static final float enemyspawnspace = 65; - public static boolean debug = true; + public static boolean debug = false; public static final Vector2 vector = new Vector2(); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 97b7bf83fe..7b8094008f 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -149,6 +149,7 @@ public class Block{ for(int dx = -1; dx <= 1; dx ++){ for(int dy = -1; dy <= 1; dy ++){ + if(dx == 0 && dy == 0) continue; Tile other = World.tile(tile.x+dx, tile.y+dy); diff --git a/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml b/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml index 71e69e367c..5fa5ec9f27 100644 --- a/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml +++ b/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml @@ -3,9 +3,10 @@ - + +