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

..

blocks

Resolve conflicts

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

editor

Cleanup

2019-06-04 23:30:07 -04:00

effects

Fixed performance regression / Removed useless fallback sprites

2019-07-03 17:07:22 -04:00

items

Cleanup, main menu progress

2019-07-03 23:36:51 -04:00

mechs

Bugfixes

2019-07-10 09:55:31 -04:00

shapes

Fixed performance regression / Removed useless fallback sprites

2019-07-03 17:07:22 -04:00

ui

Mobile schematics / Randomized projector reloads

2019-10-31 22:44:07 -04:00

units

Display document import errors on iOS

2019-11-09 15:30:02 -05:00

weapons

Updated sprites/UI colors

2019-07-07 14:11:57 -04:00

zones

Fixed map loading bugs

2019-09-01 10:46:44 -04:00

pack.json

Cleanup

2019-06-04 23:30:07 -04:00