Anuken b721d7a10f Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations ... # 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		2018-11-26 13:23:38 -05:00
..
res	New mobile text dialog / Cleanup / Minimap fix / Collision optimization	2018-11-17 11:13:59 -05:00
src/io/anuke/mindustry	Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations	2018-11-26 13:23:38 -05:00
AndroidManifest.xml	Android build update	2018-11-24 19:39:35 -05:00
build.gradle	Android build update	2018-11-24 19:39:35 -05:00
ic_launcher-web.png	Add drop shadow to icon	2017-12-20 00:46:01 -05:00
proguard-project.txt	Implemented Android support	2017-06-29 00:54:10 -04:00
project.properties	Implemented Android support	2017-06-29 00:54:10 -04:00