Merge

Browse Source

...

This commit is contained in:

Anuken

2019-11-16 00:15:45 -05:00

parent 8952dd7f56 1f6ef9d9ae

commit 8798fa101a

91 changed files with 2174 additions and 1898 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: 739 B

core/assets/sprites/sprites.atlas

+1203 -1210

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: 718 KiB After Width:  |  Height:  |  Size: 720 KiB

core/assets/sprites/sprites3.png

BIN

Binary file not shown.

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

core/assets/sprites/sprites5.png

BIN

Binary file not shown.

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