Merge

Browse Source

...

This commit is contained in:

Anuken

2019-05-30 00:27:05 -04:00

parent 00b953a04e 75b8f5e543

commit a3454e50d7

19 changed files with 1738 additions and 1550 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: 702 B After Width:  |  Height:  |  Size: 701 B

core/assets/sprites/sprites.atlas

+604 -597

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: 1.2 MiB After Width:  |  Height:  |  Size: 1.2 MiB

core/assets/sprites/sprites2.png

BIN

Binary file not shown.

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

core/assets/sprites/sprites_fallback.atlas

+846 -839

File diff suppressed because it is too large Load Diff

core/assets/sprites/sprites_fallback4.png

BIN

Binary file not shown.

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

core/assets/sprites/sprites_fallback5.png

BIN

Binary file not shown.

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