mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-08 14:57:18 +07:00
Code Issues Packages Projects Releases Wiki Activity

Updated uCore, recorder fix

Browse Source
This commit is contained in:
Anuken
2018-02-19 12:47:57 -05:00
parent cba42d2f19
commit 03079e9611
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -24,7 +24,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
aiVersion = '1.8.1' aiVersion = '1.8.1'
uCoreVersion = '1deab5e' uCoreVersion = '4c049ea'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

4
core/assets/version.properties
View File

@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Mon Feb 19 11:31:19 EST 2018 #Mon Feb 19 12:47:29 EST 2018
version=beta version=beta
androidBuildCode=241 androidBuildCode=243
name=Mindustry name=Mindustry
code=3.3 code=3.3
build=custom build build=custom build

4
core/src/io/anuke/mindustry/Vars.java
View File

@ -47,10 +47,10 @@ public class Vars{
public static final String serverURL = "http://localhost:3000"; public static final String serverURL = "http://localhost:3000";
//directory for user-created map data //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/"); Gdx.files.local("../../desktop/mindustry-maps") : Gdx.files.local("mindustry-maps/");
//save file directory //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/"); Gdx.files.local("../../desktop/mindustry-saves") : Gdx.files.local("mindustry-saves/");
//scale of the font //scale of the font
public static float fontscale = Math.max(Unit.dp.scl(1f)/2f, 0.5f); public static float fontscale = Math.max(Unit.dp.scl(1f)/2f, 0.5f);

3
core/src/io/anuke/mindustry/core/Renderer.java
View File

@ -156,7 +156,8 @@ public class Renderer extends RendererModule{
camera.position.set(lastx - deltax, lasty - deltay, 0); 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
} }
} }

2
core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
View File

@ -49,6 +49,8 @@ public class DebugFragment implements Fragment {
row(); row();
new button("noclip", "toggle", () -> noclip = !noclip); new button("noclip", "toggle", () -> noclip = !noclip);
row(); row();
new button("hideplayer", "toggle", () -> showPlayer = !showPlayer);
row();
new button("paths", "toggle", () -> showPaths = !showPaths); new button("paths", "toggle", () -> showPaths = !showPaths);
row(); row();
new button("infammo", "toggle", () -> infiniteAmmo = !infiniteAmmo); new button("infammo", "toggle", () -> infiniteAmmo = !infiniteAmmo);