Merge branch 'master' of https://github.com/Anuken/Mindustry into resource-rework

Browse Source

...

This commit is contained in:

Anuken

2018-08-18 13:10:22 -04:00

parent e9d03c179c 0f173bcc5a

commit a60ce3c54c

63 changed files with 1674 additions and 1830 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-raw/sprites/units/dagger.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/drone.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/fabricator.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/interceptor.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/monsoon.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/power-cell.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 388 B

BIN

core/assets-raw/sprites/units/titan.png

Binary file not shown.

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