Anuken 9c05ddbd7d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # core/assets/sprites/sprites.atlas # core/assets/version.properties		2018-03-09 20:58:21 -05:00
..
bundles	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-03-09 20:58:21 -05:00
maps	Finish map editor core functionality	2017-12-19 00:05:41 -05:00
music	Convert audio files to ogg	2017-12-20 11:39:21 -05:00
shaders	Added fullscreen, player outlines, better weapon display	2018-01-29 15:24:10 -05:00
sounds	Convert audio files to ogg	2017-12-20 11:39:21 -05:00
sprites	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-03-09 20:58:21 -05:00
ui	Fixed some admin bugs	2018-02-26 22:05:07 -05:00
version.properties	Added generic drill class, cleanup of other subclasses	2018-03-09 20:57:12 -05:00