Merge branch 'master' into crater

Browse Source

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png

...

This commit is contained in:

Patrick 'Quezler' Mounier

2020-04-23 21:10:48 +02:00

parent 561198f517 7091cad704

commit 39266d23c8

140 changed files with 6579 additions and 6547 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/production/block-forge.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/production/block-launcher.png Normal file

Binary file not shown.

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

0

core/assets-raw/sprites/blocks/environment/rock1.png → core/assets-raw/sprites/blocks/props/rock1.png

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

0

core/assets-raw/sprites/blocks/environment/rock2.png → core/assets-raw/sprites/blocks/props/rock2.png

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

0

core/assets-raw/sprites/blocks/environment/sand-boulder1.png → core/assets-raw/sprites/blocks/props/sand-boulder1.png

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

0

core/assets-raw/sprites/blocks/environment/sand-boulder2.png → core/assets-raw/sprites/blocks/props/sand-boulder2.png

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

0

core/assets-raw/sprites/blocks/environment/shale-boulder1.png → core/assets-raw/sprites/blocks/props/shale-boulder1.png

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

0

core/assets-raw/sprites/blocks/environment/shale-boulder2.png → core/assets-raw/sprites/blocks/props/shale-boulder2.png

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

0

core/assets-raw/sprites/blocks/environment/snowrock1.png → core/assets-raw/sprites/blocks/props/snowrock1.png

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

0

core/assets-raw/sprites/blocks/environment/snowrock2.png → core/assets-raw/sprites/blocks/props/snowrock2.png

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

0

core/assets-raw/sprites/blocks/environment/spore-cluster1.png → core/assets-raw/sprites/blocks/props/spore-cluster1.png

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

0

core/assets-raw/sprites/blocks/environment/spore-cluster2.png → core/assets-raw/sprites/blocks/props/spore-cluster2.png

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

0

core/assets-raw/sprites/blocks/environment/spore-cluster3.png → core/assets-raw/sprites/blocks/props/spore-cluster3.png

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

0

core/assets-raw/sprites/blocks/environment/white-tree-dead.png → core/assets-raw/sprites/blocks/props/white-tree-dead.png

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

0

core/assets-raw/sprites/blocks/environment/white-tree.png → core/assets-raw/sprites/blocks/props/white-tree.png

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