Merge branches 'master' and 'mod-spritepack-refactor' of https://github.com/Anuken/Mindustry

Browse Source

...

This commit is contained in:

Anuken

2019-11-25 23:55:18 -05:00

parent 2631c4f7af e6753ace87

commit 1e1b84a201

15 changed files with 1641 additions and 1529 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/sprites.atlas

+1472 -1465

File diff suppressed because it is too large Load Diff

core/assets/sprites/sprites5.png

BIN

Binary file not shown.

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