diff --git a/core/lib/ucore.jar b/core/lib/ucore.jar new file mode 100644 index 0000000000..ab942371c0 Binary files /dev/null and b/core/lib/ucore.jar differ diff --git a/core/src/io/anuke/mindustry/Control.java b/core/src/io/anuke/mindustry/Control.java index cff3c765b7..c7ce3becbf 100644 --- a/core/src/io/anuke/mindustry/Control.java +++ b/core/src/io/anuke/mindustry/Control.java @@ -5,7 +5,6 @@ import static io.anuke.mindustry.Vars.*; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Keys; -import io.anuke.gif.GifRecorder; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.world.Generator; import io.anuke.mindustry.world.blocks.ProductionBlocks; @@ -17,7 +16,7 @@ import io.anuke.ucore.util.Timers; public class Control extends RendererModule{ public int rangex = 10, rangey = 10; - GifRecorder recoder = new GifRecorder(batch); + //GifRecorder recoder = new GifRecorder(batch); public Control(){ cameraScale = 4f; @@ -113,7 +112,7 @@ public class Control extends RendererModule{ Renderer.renderOverlay(); batch.end(); - recoder.update(); + //recoder.update(); } if(!paused){ diff --git a/core/src/io/anuke/mindustry/Renderer.java b/core/src/io/anuke/mindustry/Renderer.java index 2d73f9b5e8..3a92f71e61 100644 --- a/core/src/io/anuke/mindustry/Renderer.java +++ b/core/src/io/anuke/mindustry/Renderer.java @@ -126,7 +126,7 @@ public class Renderer{ if(recipe == null && !ui.hasMouse()){ Tile tile = World.cursorTile(); - if(tile.block() != Blocks.air){ + if(tile != null && tile.block() != Blocks.air){ if(tile.entity != null) drawHealth(tile.entity.x, tile.entity.y, tile.entity.health, tile.entity.maxhealth); diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 21ac682d6a..8536cf324b 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 wavespace = 20*60; public static final float enemyspawnspace = 65; public static final float breakduration = 40; - 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/entities/BulletType.java b/core/src/io/anuke/mindustry/entities/BulletType.java index a6628d2982..6cc6368a1a 100644 --- a/core/src/io/anuke/mindustry/entities/BulletType.java +++ b/core/src/io/anuke/mindustry/entities/BulletType.java @@ -23,7 +23,7 @@ public abstract class BulletType extends BaseBulletType{ Draw.clear(); } }, - sniper = new BulletType(3f, 17){ + sniper = new BulletType(3f, 20){ public void draw(Bullet b){ Draw.color("lightgray"); Draw.rect("bullet", b.x, b.y, b.angle()); diff --git a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java index 7f1f9c12e8..7abf10c4e4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java @@ -77,13 +77,13 @@ public class WeaponBlocks{ reload = 5f; bullet = BulletType.flame; ammo = Item.coal; - health = 85; + health = 90; } }, sniperturret = new Turret("sniperturret"){ { - range = 100; + range = 120; reload = 60f; bullet = BulletType.sniper; ammo = Item.steel; diff --git a/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml b/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml index c032402765..71e69e367c 100644 --- a/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml +++ b/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml @@ -1,8 +1,8 @@ - - + + diff --git a/html/webapp/index.html b/html/webapp/index.html index bf0395e9fa..aee5f541d2 100644 --- a/html/webapp/index.html +++ b/html/webapp/index.html @@ -8,11 +8,10 @@ - +
-