From 03079e9611aa49972dbcfe5e1c1af5ed5056d90e Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 19 Feb 2018 12:47:57 -0500 Subject: [PATCH] Updated uCore, recorder fix --- build.gradle | 2 +- core/assets/version.properties | 4 ++-- core/src/io/anuke/mindustry/Vars.java | 4 ++-- core/src/io/anuke/mindustry/core/Renderer.java | 3 ++- core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java | 2 ++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 64e982f490..5c82c7843f 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' aiVersion = '1.8.1' - uCoreVersion = '1deab5e' + uCoreVersion = '4c049ea' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets/version.properties b/core/assets/version.properties index a43c657acd..b6b452788f 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Mon Feb 19 11:31:19 EST 2018 +#Mon Feb 19 12:47:29 EST 2018 version=beta -androidBuildCode=241 +androidBuildCode=243 name=Mindustry code=3.3 build=custom build diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index b3ed97bcdf..fb8609d82f 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -47,10 +47,10 @@ public class Vars{ public static final String serverURL = "http://localhost:3000"; //directory for user-created map data - public static final FileHandle customMapDirectory = gwt ? null : UCore.isAssets ? + public static final FileHandle customMapDirectory = gwt ? null : UCore.isAssets() ? Gdx.files.local("../../desktop/mindustry-maps") : Gdx.files.local("mindustry-maps/"); //save file directory - public static final FileHandle saveDirectory = gwt ? null : UCore.isAssets ? + public static final FileHandle saveDirectory = gwt ? null : UCore.isAssets() ? Gdx.files.local("../../desktop/mindustry-saves") : Gdx.files.local("mindustry-saves/"); //scale of the font public static float fontscale = Math.max(Unit.dp.scl(1f)/2f, 0.5f); diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index d3adc77fe9..635c52f03d 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -156,7 +156,8 @@ public class Renderer extends RendererModule{ camera.position.set(lastx - deltax, lasty - deltay, 0); - if(debug && ui.chatfrag.chatOpen()) record(); //this only does something if GdxGifRecorder is on the class path, which it usually isn't + if(debug && !ui.chatfrag.chatOpen()) + record(); //this only does something if GdxGifRecorder is on the class path, which it usually isn't } } diff --git a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java index 2e3cb2cf12..b7060729b9 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java @@ -49,6 +49,8 @@ public class DebugFragment implements Fragment { row(); new button("noclip", "toggle", () -> noclip = !noclip); row(); + new button("hideplayer", "toggle", () -> showPlayer = !showPlayer); + row(); new button("paths", "toggle", () -> showPaths = !showPaths); row(); new button("infammo", "toggle", () -> infiniteAmmo = !infiniteAmmo);