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

Browse Source

 Conflicts:

	core/assets/sprites/block_colors.png

	core/assets/sprites/fallback/sprites.atlas

	core/assets/sprites/fallback/sprites.png

	core/assets/sprites/fallback/sprites2.png

	core/assets/sprites/fallback/sprites3.png

	core/assets/sprites/fallback/sprites4.png

	core/assets/sprites/fallback/sprites5.png

	core/assets/sprites/fallback/sprites7.png

	core/assets/sprites/fallback/sprites8.png

	core/assets/sprites/sprites.atlas

	core/assets/sprites/sprites.png

	core/assets/sprites/sprites2.png

	core/assets/sprites/sprites4.png

	core/assets/sprites/sprites5.png

...

This commit is contained in:

slava0135

2020-09-29 18:31:42 +03:00

parent 79f4608e81 521ca1aea4

commit cbc2205347

116 changed files with 25350 additions and 25276 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: 815 B After Width:  |  Height:  |  Size: 812 B

core/assets/sprites/fallback/sprites.atlas

+12517 -12573

File diff suppressed because it is too large Load Diff

core/assets/sprites/fallback/sprites.png

BIN

Binary file not shown.

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

core/assets/sprites/fallback/sprites2.png

BIN

Binary file not shown.

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

core/assets/sprites/fallback/sprites3.png

BIN

Binary file not shown.

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

core/assets/sprites/fallback/sprites4.png

BIN

Binary file not shown.

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

core/assets/sprites/fallback/sprites5.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 MiB After Width:  |  Height:  |  Size: 189 KiB

core/assets/sprites/fallback/sprites7.png

BIN

Binary file not shown.

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

core/assets/sprites/fallback/sprites8.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 319 KiB After Width:  |  Height:  |  Size: 1.4 MiB

core/assets/sprites/sprites.atlas

+12435 -12491

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

core/assets/sprites/sprites2.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 MiB After Width:  |  Height:  |  Size: 190 KiB

core/assets/sprites/sprites4.png

BIN

Binary file not shown.

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

core/assets/sprites/sprites5.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 307 KiB After Width:  |  Height:  |  Size: 1.4 MiB