Merge branch 'master' of https://github.com/Anuken/Mindustry into v105

Browse Source

...

This commit is contained in:

Petr Gašparík

2020-05-28 08:23:37 +02:00

parent 6a8d66c169 638343d25e

commit 5119959b0f

27 changed files with 921 additions and 701 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

1340

core/assets/sprites/sprites.atlas

File diff suppressed because it is too large Load Diff

BIN

core/assets/sprites/sprites.png

Binary file not shown.

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

BIN

core/assets/sprites/sprites2.png

Binary file not shown.

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