Patrick 'Quezler' Mounier 8a089ba3c9 Resolve conflicts ...

# 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

2019-11-12 08:44:26 +01:00

..

bloomshaders

Bloom fix

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

bundles

Resolve conflicts

2019-11-12 08:44:26 +01: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

Thruster fix / Removed info on Steam to prevent confusion

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

sprites

Resolve conflicts

2019-11-12 08:44:26 +01:00

contributors

🚧 Add insulator wall (#840)

2019-10-27 17:41:00 -04:00