Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	core/assets-raw/sprites/units/phantom-cell.png

...

This commit is contained in:

Anuken

2020-04-25 22:49:38 -04:00

parent 9b74b69950 46762ab0e1

commit 08f8323465

26 changed files with 1 additions and 1 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/units/alpha-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/chaos-array-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/crawler-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/dagger-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/dart-cell.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/eradicator-cell.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/fortress-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/ghoul-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/glaive-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/javelin-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/lich-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/omega-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/reaper-cell.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/revenant-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/spirit-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/tau-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/titan-cell.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/vanguard-cell.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/units/wraith-cell.png Normal file

Binary file not shown.

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