Resolve conflicts

Browse Source

# 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

...

This commit is contained in:

Patrick 'Quezler' Mounier

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

parent 6141b135fe 56917483d6

commit 8a089ba3c9

84 changed files with 3281 additions and 2412 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

core/assets/sprites/block_colors.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 740 B After Width:  |  Height:  |  Size: 743 B

core/assets/sprites/sprites.atlas

+1962 -1899

File diff suppressed because it is too large Load Diff

core/assets/sprites/sprites.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 935 KiB After Width:  |  Height:  |  Size: 935 KiB

core/assets/sprites/sprites3.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 MiB After Width:  |  Height:  |  Size: 1.0 MiB

core/assets/sprites/sprites5.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 331 KiB After Width:  |  Height:  |  Size: 331 KiB