Anuken 3ae51edf3a Merge branch '4.0' of https://github.com/Anuken/Mindustry ...

# Conflicts:
#	core/assets/bundles/bundle_ko.properties
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/UI.java

2018-07-14 09:32:55 -04:00

..

bundles

Merge branch '4.0' of https://github.com/Anuken/Mindustry

2018-07-14 09:32:55 -04:00

cursors

Bugfixes, cleanup, optimization

2018-06-02 21:45:07 -04:00

maps

Moved over Streamable inner classes, added test map

2018-06-14 17:11:38 -04:00

music

iOS plist fixes, re-added music

2018-05-16 11:06:15 -07:00

shaders

Optimizations

2018-07-11 12:19:21 -04:00

sounds

Changed OGGs to MP3s, fixed desktop version being unable to start

2018-04-27 22:44:21 -04:00

sprites

Added requirement display / Text fixes / Better crash reports

2018-07-10 16:53:35 -04:00

ui

Merge branch '4.0' of https://github.com/Anuken/Mindustry

2018-07-14 09:32:55 -04:00