Merge

Browse Source

...

This commit is contained in:

Anuken

2018-09-18 17:04:24 -04:00

parent bf57318307 0c63b27eea

commit 8c7258e839

133 changed files with 1940 additions and 4188 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/mechs/dart-ship-factory.png → core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png

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

core/assets-raw/sprites/blocks/mechs/delta-mech-factory.png → core/assets-raw/sprites/blocks/mechs/delta-mech-pad.png

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

core/assets-raw/sprites/blocks/mechs/glaive-ship-factory.png → core/assets-raw/sprites/blocks/mechs/glaive-ship-pad.png

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

core/assets-raw/sprites/blocks/mechs/javelin-ship-factory.png → core/assets-raw/sprites/blocks/mechs/javelin-ship-pad.png

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

core/assets-raw/sprites/blocks/mechs/omega-mech-factory.png → core/assets-raw/sprites/blocks/mechs/omega-mech-pad.png

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

core/assets-raw/sprites/blocks/mechs/tau-mech-factory.png → core/assets-raw/sprites/blocks/mechs/tau-mech-pad.png

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

core/assets-raw/sprites/blocks/mechs/trident-ship-factory.png → core/assets-raw/sprites/blocks/mechs/trident-ship-pad.png

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

core/assets-raw/sprites/blocks/turrets/bases/block-4-top.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/turrets/bases/block-4.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/turrets/turrets/spectre.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/units/dagger-pad-top-open.png → core/assets-raw/sprites/blocks/units/dagger-factory-top-open.png

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

core/assets-raw/sprites/blocks/units/dagger-pad-top.png → core/assets-raw/sprites/blocks/units/dagger-factory-top.png

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

core/assets-raw/sprites/blocks/units/dagger-pad.png → core/assets-raw/sprites/blocks/units/dagger-factory.png

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

core/assets-raw/sprites/blocks/units/fortress-pad-top-open.png → core/assets-raw/sprites/blocks/units/fortress-factory-top-open.png

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

core/assets-raw/sprites/blocks/units/fortress-pad-top.png → core/assets-raw/sprites/blocks/units/fortress-factory-top.png

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

core/assets-raw/sprites/blocks/units/fortress-pad.png → core/assets-raw/sprites/blocks/units/fortress-factory.png

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

core/assets-raw/sprites/blocks/units/monsoon-pad-top-open.png → core/assets-raw/sprites/blocks/units/ghoul-factory-top-open.png

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

core/assets-raw/sprites/blocks/units/monsoon-pad-top.png → core/assets-raw/sprites/blocks/units/ghoul-factory-top.png

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

core/assets-raw/sprites/blocks/units/monsoon-pad.png → core/assets-raw/sprites/blocks/units/ghoul-factory.png

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

core/assets-raw/sprites/blocks/units/fabricator-pad-top-open.png → core/assets-raw/sprites/blocks/units/phantom-factory-top-open.png

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

core/assets-raw/sprites/blocks/units/fabricator-pad-top.png → core/assets-raw/sprites/blocks/units/phantom-factory-top.png

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

core/assets-raw/sprites/blocks/units/drone-pad.png → core/assets-raw/sprites/blocks/units/phantom-factory.png

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

core/assets-raw/sprites/blocks/units/titan-pad-top-open.png → core/assets-raw/sprites/blocks/units/revenant-factory-top-open.png

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

core/assets-raw/sprites/blocks/units/titan-pad-top.png → core/assets-raw/sprites/blocks/units/revenant-factory-top.png

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

core/assets-raw/sprites/blocks/units/titan-pad.png → core/assets-raw/sprites/blocks/units/revenant-factory.png

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

core/assets-raw/sprites/blocks/units/drone-pad-top-open.png → core/assets-raw/sprites/blocks/units/spirit-factory-top-open.png

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

core/assets-raw/sprites/blocks/units/drone-pad-top.png → core/assets-raw/sprites/blocks/units/spirit-factory-top.png

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

core/assets-raw/sprites/blocks/units/fabricator-pad.png → core/assets-raw/sprites/blocks/units/spirit-factory.png

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

core/assets-raw/sprites/blocks/units/titan-factory-top-open.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/units/titan-factory-top.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/units/interceptor-pad-top-open.png → core/assets-raw/sprites/blocks/units/wraith-factory-top-open.png

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

core/assets-raw/sprites/blocks/units/interceptor-pad-top.png → core/assets-raw/sprites/blocks/units/wraith-factory-top.png

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

core/assets-raw/sprites/blocks/units/interceptor-pad.png → core/assets-raw/sprites/blocks/units/wraith-factory.png

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

core/assets-raw/sprites/blocks/walls/composite-wall-large.png → core/assets-raw/sprites/blocks/walls/dense-alloy-wall-large.png

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

core/assets-raw/sprites/blocks/walls/composite-wall.png → core/assets-raw/sprites/blocks/walls/dense-alloy-wall.png

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

core/assets-raw/sprites/effects/bullet-back.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/effects/bullet.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/icons/icon-unlocked.png

BIN

Binary file not shown.

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

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

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

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

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

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

BIN

Binary file not shown.

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

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

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

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

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

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

BIN

Binary file not shown.

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