Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source

 Conflicts:

	core/src/mindustry/ui/dialogs/PlanetDialog.java

...

This commit is contained in:

Anuken

2021-08-13 10:08:34 -04:00

parent 90a58388d6 033dadae2c

commit 2200a44653

56 changed files with 415 additions and 142 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/blocks/turrets/arc-heat.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/turrets/fuse-heat.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/turrets/hail-heat.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/turrets/lancer-heat.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/turrets/meltdown-heat.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 889 B After Width:  |  Height:  |  Size: 1.6 KiB

BIN

core/assets-raw/sprites/blocks/turrets/ripple-heat.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/turrets/salvo-heat.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/turrets/scorch-heat.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/turrets/spectre-heat.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

core/assets-raw/sprites/teams/team-derelict.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/sideline-over.9.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/sideline.9.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/underline-over.9.png Normal file

Binary file not shown.

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