Patrick 'Quezler' Mounier e5e4884448 Merge branch 'master' into crater ...

# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/world/modules/ItemModule.java

2020-03-05 10:00:02 +01:00

..

bloomshaders

Bloom fix

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

bundles

Merge branch 'master' into crater

2020-03-05 10:00:02 +01:00

cursors

Cursor antialiasing

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

fonts

Fixed #1558 / Fixed #1556

2020-02-12 10:16:43 -05:00

icons

Register crater emoji via ui folder

2020-01-27 19:33:36 +01: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

scripts

add floatf/p and func to global.js (#1633)

2020-02-24 15:06:33 -05:00

shaders

Lighting improvements

2019-11-10 16:18:47 -05:00

sounds

Thruster fix / Removed info on Steam to prevent confusion

2019-09-28 15:40:31 -04:00

sprites

Merge branch 'master' into crater

2020-03-05 10:00:02 +01:00

contributors

:)

2020-02-12 19:28:54 +00:00