Anuken 91c3cb93f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ...

# Conflicts:
#	build.gradle
#	core/assets/bundles/bundle_es_LA.properties
#	core/assets/version.properties

2018-04-25 20:45:39 -04:00

..

bundles

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

2018-04-25 20:45:39 -04:00

cursors

Added custom cursors

2018-03-16 12:34:35 -04:00

maps

Implemented JPS badly

2018-04-20 19:55:41 -04:00

music

Convert audio files to ogg

2017-12-20 11:39:21 -05:00

shaders

Merged with master

2018-04-08 10:46:48 -04:00

sounds

Convert audio files to ogg

2017-12-20 11:39:21 -05:00

sprites

Moved bullet FX to ammo type, beginning of weapon rework

2018-04-23 21:35:40 -04:00

ui

Implemented ammo ressuplying

2018-04-24 21:38:57 -04:00