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

Extra merge changes

Browse Source
This commit is contained in:
Anuken
2018-03-16 22:19:35 -04:00
parent 4a7c722673
commit ed0b796c5a
4 changed files with 441 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1046
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 93 KiB

4
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Fri Mar 16 21:46:55 EDT 2018 #Fri Mar 16 22:18:26 EDT 2018
version=release version=release
androidBuildCode=528 androidBuildCode=531
name=Mindustry name=Mindustry
code=3.4 code=3.4
build=custom build build=custom build

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

@@ -36,7 +36,6 @@ import io.anuke.ucore.graphics.*;
import io.anuke.ucore.modules.RendererModule; import io.anuke.ucore.modules.RendererModule;
import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.scene.utils.Cursors; import io.anuke.ucore.scene.utils.Cursors;
import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Tmp; import io.anuke.ucore.util.Tmp;