Anuken 3f293190cf Merge branch 'master' of https://github.com/Anuken/Mindustry into messages ...

# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites5.png

2019-09-21 18:59:49 -04:00

..

bloomshaders

Bloom fix

2019-06-28 23:31:34 -04:00

bundles

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

2019-09-21 18:59:49 -04:00

cursors

Cursor antialiasing

2019-08-04 09:41:25 -04:00

fonts

Fix fonts (#424)

2019-03-10 08:03:54 -06:00

icons

Updated Mac icon

2019-08-16 12:05:00 -04:00

maps

Travis testing

2019-09-12 17:19:01 -04:00

music

Fixed "disconnected" bug / Updated menu music

2019-09-01 10:19:13 -04:00

shaders

More drone changes

2019-06-14 21:06:58 -04:00

sounds

Fixed moving unit target prediction

2019-08-17 11:23:49 -04:00

sprites

Unit enemy spawnpoint camping

2019-09-20 23:09:11 -04:00

contributors

Update the French translation (#631)

2019-09-15 20:39:59 -04:00