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

Browse Source

...

This commit is contained in:

Anuken

2019-06-24 19:45:13 -04:00

parent f8526e1ac7 266744b1dd

commit b7a0ebad17

10 changed files with 4302 additions and 4296 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

BIN

core/assets/sprites/block_colors.png

Binary file not shown.

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

768

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

BIN

core/assets/sprites/sprites2.png

Binary file not shown.

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

7824

core/assets/sprites/sprites_fallback.atlas

File diff suppressed because it is too large Load Diff

BIN

core/assets/sprites/sprites_fallback2.png

Binary file not shown.

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

BIN

core/assets/sprites/sprites_fallback3.png

Binary file not shown.

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

BIN

core/assets/sprites/sprites_fallback4.png

Binary file not shown.

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

BIN

core/assets/sprites/sprites_fallback5.png

Binary file not shown.

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