Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations

Browse Source 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/src/io/anuke/mindustry/core/Renderer.java
#	core/src/io/anuke/mindustry/entities/units/types/Drone.java
#	core/src/io/anuke/mindustry/graphics/CacheLayer.java
#	core/src/io/anuke/mindustry/world/blocks/Floor.java
This commit is contained in:
Anuken
2018-11-26 13:23:38 -05:00
parent 46c6b2168c ef85d1d83e
commit b721d7a10f
109 changed files with 1495 additions and 1370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
desktop/src/io/anuke/mindustry/desktop/CrashHandler.java
View File

@@ -80,7 +80,6 @@ public class CrashHandler{
ex(() -> value.addChild("gamemode", new JsonValue(Vars.state.mode.name())));
ex(() -> value.addChild("state", new JsonValue(Vars.state.getState().name())));
ex(() -> value.addChild("os", new JsonValue(System.getProperty("os.name"))));
ex(() -> value.addChild("multithreading", new JsonValue(Settings.getBool("multithread"))));
ex(() -> value.addChild("trace", new JsonValue(parseException(e))));
try{

3
desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
View File

@@ -17,8 +17,6 @@ import io.anuke.ucore.util.OS;
import io.anuke.ucore.util.Strings;
import java.net.NetworkInterface;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Enumeration;
import static io.anuke.mindustry.Vars.*;
@@ -26,7 +24,6 @@ import static io.anuke.mindustry.Vars.*;
public class DesktopPlatform extends Platform{
final static boolean useDiscord = OS.is64Bit;
final static String applicationId = "398246104468291591";
final static DateFormat format = SimpleDateFormat.getDateTimeInstance();
String[] args;
public DesktopPlatform(String[] args){