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

Browse Source

...

This commit is contained in:

Petr Gašparík

2020-07-13 10:42:30 +02:00

parent f0882d8d5e d31a530d6e

commit 682bfcc8e8

485 changed files with 11639 additions and 9071 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-raw/sprites/blocks/defense/parallax.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/block-loader.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/mass-driver-base.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/distribution/mass-driver.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/drills/laser-drill.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 874 B After Width:  |  Height:  |  Size: 1.4 KiB

core/assets-raw/sprites/blocks/environment/sand1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/power/rtg-generator.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 831 B After Width:  |  Height:  |  Size: 1.1 KiB

core/assets-raw/sprites/blocks/power/thorium-reactor.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/production/cultivator-top.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/production/item-void.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/production/liquid-void.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/production/spore-press-frame0.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/production/spore-press-frame1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/production/spore-press-frame2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/production/spore-press.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/effects/parallax-laser-end.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/effects/parallax-laser.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/button.9.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/lich-cell.png → core/assets-raw/sprites/units/antumbra-cell.png

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

core/assets-raw/sprites/units/lich.png → core/assets-raw/sprites/units/antumbra.png

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

core/assets-raw/sprites/units/cix-cell.png → core/assets-raw/sprites/units/arkyid-cell.png

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

core/assets-raw/sprites/units/cix-foot.png → core/assets-raw/sprites/units/arkyid-foot.png

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

core/assets-raw/sprites/units/cix-joint-base.png → core/assets-raw/sprites/units/arkyid-joint-base.png

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

core/assets-raw/sprites/units/cix-leg-base.png → core/assets-raw/sprites/units/arkyid-leg-base.png

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

core/assets-raw/sprites/units/cix-leg.png → core/assets-raw/sprites/units/arkyid-leg.png

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

core/assets-raw/sprites/units/cix.png → core/assets-raw/sprites/units/arkyid.png

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

core/assets-raw/sprites/units/eruptor-base.png → core/assets-raw/sprites/units/atrax-base.png

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

core/assets-raw/sprites/units/atrax-cell.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/eruptor-foot.png → core/assets-raw/sprites/units/atrax-foot.png

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

core/assets-raw/sprites/units/eruptor-joint.png → core/assets-raw/sprites/units/atrax-joint.png

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

core/assets-raw/sprites/units/eruptor-leg-base.png → core/assets-raw/sprites/units/atrax-leg-base.png

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

core/assets-raw/sprites/units/eruptor-leg.png → core/assets-raw/sprites/units/atrax-leg.png

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/beta-cell.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/cix-old.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.0 KiB

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/delta-cell.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 381 B

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

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 421 B

core/assets-raw/sprites/units/draug-cell.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 333 B

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

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 629 B

core/assets-raw/sprites/units/reaper-cell.png → core/assets-raw/sprites/units/eclipse-cell.png

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

core/assets-raw/sprites/units/reaper.aseprite → core/assets-raw/sprites/units/eclipse.aseprite

core/assets-raw/sprites/units/reaper.png → core/assets-raw/sprites/units/eclipse.png

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

core/assets-raw/sprites/units/eruptor-cell.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 464 B

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

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.0 KiB

core/assets-raw/sprites/units/wraith.png → core/assets-raw/sprites/units/flare.png

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

core/assets-raw/sprites/units/glaive-cell.png → core/assets-raw/sprites/units/gamma-cell.png

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.1 KiB

core/assets-raw/sprites/units/ghoul-cell.png → core/assets-raw/sprites/units/horizon-cell.png

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

core/assets-raw/sprites/units/ghoul.png → core/assets-raw/sprites/units/horizon.png

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

core/assets-raw/sprites/units/mega-cell.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/spirit-cell.png → core/assets-raw/sprites/units/mono-cell.png

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/tau-base.png → core/assets-raw/sprites/units/nova-base.png

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

core/assets-raw/sprites/units/tau-cell.png → core/assets-raw/sprites/units/nova-cell.png

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

core/assets-raw/sprites/units/tau-leg.png → core/assets-raw/sprites/units/nova-leg.png

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

core/assets-raw/sprites/units/tau.png → core/assets-raw/sprites/units/nova.png

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

core/assets-raw/sprites/units/oculon-armor.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 361 B

core/assets-raw/sprites/units/oculon-base-old.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.6 KiB

core/assets-raw/sprites/units/oculon-cell-old.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 663 B

core/assets-raw/sprites/units/oculon-cell.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 373 B

core/assets-raw/sprites/units/oculon-old.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 991 B

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

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 901 B

core/assets-raw/sprites/units/phantom-cell.png → core/assets-raw/sprites/units/poly-cell.png

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/oculon-leg-old.png → core/assets-raw/sprites/units/pulsar-base.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/pulsar-cell.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/pulsar-leg.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/oculon-base.png → core/assets-raw/sprites/units/quasar-base.png

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

core/assets-raw/sprites/units/quasar-cell.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/oculon-leg.png → core/assets-raw/sprites/units/quasar-leg.png

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

core/assets-raw/sprites/units/oculon.png → core/assets-raw/sprites/units/quasar.png

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

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

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 372 B

core/assets-raw/sprites/units/spiroct-cell.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/spiroct-foot.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/spiroct-joint.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/spiroct-leg-base.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/spiroct-leg.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/trident-cell.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 332 B

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

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.9 KiB

core/assets-raw/sprites/units/weapons/antumbra-missiles.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/artillery.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/beam-weapon.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/chaos.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 709 B After Width:  |  Height:  |  Size: 1.2 KiB

core/assets-raw/sprites/units/weapons/reaper-weapon.png → core/assets-raw/sprites/units/weapons/eclipse-weapon.png

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

core/assets-raw/sprites/units/weapons/eradication.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/eruption.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/flakgun.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/flamethrower.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/heal-shotgun-weapon.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/heal-weapon-mount.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/heal-weapon.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/large-weapon.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/lich-missiles.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 448 B

core/assets-raw/sprites/units/weapons/missiles.png

BIN

Binary file not shown.

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

Some files were not shown because too many files have changed in this diff Show More