Commit Graph

19 Commits

Author SHA1 Message Date
Anuken
732769524c 🔥🔥🔥 2020-06-11 12:03:27 -04:00
Anuken
2662228bec Use GL3.0 for all platforms 2020-06-10 15:31:43 -04:00
Anuken
69d0751e65 Cleanup 2020-06-01 18:55:19 -04:00
Anuken
8b5adca750 Early prototype loading screen 2020-05-05 23:01:12 -04:00
Anuken
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
Anuken
0cbd9a1fcc Removed redundant file move code 2020-02-11 18:03:17 -05:00
Anuken
a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
Anuken
a6801af128 Use zip files when exporting 2020-02-07 20:11:43 -05:00
Anuken
30ea039246 Fixed #1521 2020-02-07 20:11:05 -05:00
Anuken
be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties
2020-02-04 12:25:18 -05:00
Anuken
63d84bead3 Cleanup 2020-01-31 20:10:21 -05:00
Anuken
1ab81fa4ab Bugfixes 2020-01-24 19:14:49 -05:00
Anuken
69711151a5 Bugfixes 2020-01-24 18:48:26 -05:00
Anuken
f044f30829 Merge 2020-01-18 11:16:03 -05:00
Anuken
eb79f3288c Added Android crash logging 2020-01-16 10:59:27 -05:00
Anuken
bbf87df373 a revelation 2020-01-11 23:41:12 -05:00
Anuken
7e7d2019af Made Android files external 2020-01-11 19:21:16 -05:00
Anuken
c611ce9d58 Removed old Matrix4 class 2020-01-07 11:16:04 -05:00
Anuken
03342dc2f5 Android fixes 2019-12-25 12:06:19 -05:00