Merge branch 'master' of https://github.com/Anuken/Mindustry into v105
Petr Gašparík
BIN
core/assets-raw/sprites/blocks/campaign/data-processor-2.png
Normal file
|
After Width: | Height: | Size: 836 B |
BIN
core/assets-raw/sprites/blocks/campaign/data-processor-top.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 895 B |
@@ -2,7 +2,7 @@
|
||||
duplicatePadding: true,
|
||||
combineSubdirectories: true,
|
||||
flattenPaths: true,
|
||||
maxWidth: 2048,
|
||||
maxHeight: 2048,
|
||||
maxWidth: 4096,
|
||||
maxHeight: 4096,
|
||||
fast: true
|
||||
}
|
||||
|
||||
BIN
core/assets-raw/sprites/blocks/power/turbine-generator-cap.png
Normal file
|
After Width: | Height: | Size: 558 B |
|
After Width: | Height: | Size: 260 B |
|
After Width: | Height: | Size: 206 B |
|
Before Width: | Height: | Size: 782 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 693 B After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 994 B After Width: | Height: | Size: 991 B |
|
Before Width: | Height: | Size: 157 B After Width: | Height: | Size: 223 B |
|
Before Width: | Height: | Size: 191 B After Width: | Height: | Size: 283 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 256 B After Width: | Height: | Size: 400 B |
|
Before Width: | Height: | Size: 259 B After Width: | Height: | Size: 413 B |
|
Before Width: | Height: | Size: 234 B After Width: | Height: | Size: 376 B |
|
Before Width: | Height: | Size: 777 B After Width: | Height: | Size: 1.2 KiB |
BIN
core/assets-raw/sprites/blocks/storage/core-foundation-team.png
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
core/assets-raw/sprites/blocks/storage/core-nucleus-team.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.9 KiB |
BIN
core/assets-raw/sprites/blocks/storage/core-shard-team.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 989 B After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
BIN
core/assets-raw/sprites/blocks/units/additive-reconstructor.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 792 B |
|
Before Width: | Height: | Size: 430 B |
|
After Width: | Height: | Size: 2.2 KiB |
|
After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 675 B After Width: | Height: | Size: 675 B |
BIN
core/assets-raw/sprites/blocks/units/factory-in-5.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
core/assets-raw/sprites/blocks/units/factory-in-7.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
core/assets-raw/sprites/blocks/units/factory-in-9.png
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 651 B After Width: | Height: | Size: 651 B |
BIN
core/assets-raw/sprites/blocks/units/factory-out-5.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
core/assets-raw/sprites/blocks/units/factory-out-7.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
core/assets-raw/sprites/blocks/units/factory-out-9.png
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
BIN
core/assets-raw/sprites/blocks/units/resupply-point.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 899 B |
|
Before Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 2.7 KiB |
BIN
core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png
Normal file
|
After Width: | Height: | Size: 8.6 KiB |
|
Before Width: | Height: | Size: 586 B After Width: | Height: | Size: 585 B |
|
Before Width: | Height: | Size: 282 B After Width: | Height: | Size: 281 B |
@@ -2,7 +2,7 @@
|
||||
duplicatePadding: true,
|
||||
combineSubdirectories: true,
|
||||
flattenPaths: true,
|
||||
maxWidth: 2048,
|
||||
maxHeight: 2048,
|
||||
maxWidth: 4096,
|
||||
maxHeight: 4096,
|
||||
fast: true
|
||||
}
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
duplicatePadding: true,
|
||||
combineSubdirectories: true,
|
||||
flattenPaths: true,
|
||||
maxWidth: 2048,
|
||||
maxHeight: 2048,
|
||||
fast: true,
|
||||
bleedIterations: 4
|
||||
maxWidth: 4096,
|
||||
maxHeight: 4096,
|
||||
fast: true
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
duplicatePadding: true,
|
||||
combineSubdirectories: true,
|
||||
flattenPaths: true,
|
||||
maxWidth: 2048,
|
||||
maxHeight: 2048,
|
||||
maxWidth: 4096,
|
||||
maxHeight: 4096,
|
||||
fast: true
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
duplicatePadding: true,
|
||||
combineSubdirectories: true,
|
||||
flattenPaths: true,
|
||||
maxWidth: 2048,
|
||||
maxHeight: 2048,
|
||||
maxWidth: 4096,
|
||||
maxHeight: 4096,
|
||||
fast: true
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 325 B After Width: | Height: | Size: 600 B |
|
Before Width: | Height: | Size: 689 B After Width: | Height: | Size: 570 B |
|
Before Width: | Height: | Size: 623 B After Width: | Height: | Size: 670 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 620 B After Width: | Height: | Size: 624 B |
|
Before Width: | Height: | Size: 662 B After Width: | Height: | Size: 592 B |
|
Before Width: | Height: | Size: 641 B After Width: | Height: | Size: 553 B |
|
Before Width: | Height: | Size: 660 B After Width: | Height: | Size: 618 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 176 B |
|
Before Width: | Height: | Size: 170 B |
|
Before Width: | Height: | Size: 380 B After Width: | Height: | Size: 704 B |
|
Before Width: | Height: | Size: 655 B After Width: | Height: | Size: 560 B |
|
Before Width: | Height: | Size: 440 B After Width: | Height: | Size: 652 B |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 333 B |
|
Before Width: | Height: | Size: 270 B |
|
Before Width: | Height: | Size: 528 B |
|
Before Width: | Height: | Size: 246 B After Width: | Height: | Size: 246 B |
|
Before Width: | Height: | Size: 284 B After Width: | Height: | Size: 284 B |
|
Before Width: | Height: | Size: 354 B After Width: | Height: | Size: 354 B |
|
Before Width: | Height: | Size: 676 B After Width: | Height: | Size: 676 B |
|
Before Width: | Height: | Size: 361 B After Width: | Height: | Size: 361 B |
BIN
core/assets-raw/sprites/units/oculon-base-old.png
Normal file
|
After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 331 B |
BIN
core/assets-raw/sprites/units/oculon-cell-old.png
Normal file
|
After Width: | Height: | Size: 663 B |
|
Before Width: | Height: | Size: 663 B After Width: | Height: | Size: 373 B |
BIN
core/assets-raw/sprites/units/oculon-leg-old.png
Normal file
|
After Width: | Height: | Size: 729 B |
|
Before Width: | Height: | Size: 729 B After Width: | Height: | Size: 415 B |
BIN
core/assets-raw/sprites/units/oculon-old.png
Normal file
|
After Width: | Height: | Size: 991 B |
|
Before Width: | Height: | Size: 991 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 181 B |
|
Before Width: | Height: | Size: 415 B |
|
Before Width: | Height: | Size: 200 B |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 607 B After Width: | Height: | Size: 607 B |
BIN
core/assets-raw/sprites/units/weapons/beam-weapon.png
Normal file
|
After Width: | Height: | Size: 794 B |
|
Before Width: | Height: | Size: 709 B After Width: | Height: | Size: 709 B |
|
Before Width: | Height: | Size: 927 B After Width: | Height: | Size: 927 B |
|
Before Width: | Height: | Size: 524 B After Width: | Height: | Size: 524 B |
|
Before Width: | Height: | Size: 455 B After Width: | Height: | Size: 455 B |
|
Before Width: | Height: | Size: 604 B After Width: | Height: | Size: 604 B |
|
Before Width: | Height: | Size: 296 B After Width: | Height: | Size: 296 B |
|
Before Width: | Height: | Size: 362 B After Width: | Height: | Size: 362 B |
|
Before Width: | Height: | Size: 490 B After Width: | Height: | Size: 490 B |