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

Browse Source

# Conflicts:
#	core/assets-raw/sprites/blocks/chainturret-icon.png
#	core/assets-raw/sprites/blocks/chainturret.png
#	core/assets-raw/sprites/blocks/titancannon-icon.png
#	core/assets-raw/sprites/blocks/titancannon.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java
#	core/src/io/anuke/mindustry/graphics/BlockRenderer.java
#	core/src/io/anuke/mindustry/input/InputHandler.java
#	core/src/io/anuke/mindustry/input/PlaceMode.java

...

This commit is contained in:

Anuken

2018-04-21 18:47:43 -04:00

parent 9f4f107b6d 90716ebaad

commit 1a9d701d32

21 changed files with 759 additions and 46 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/chainturret-icon_old.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/chainturret_old.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/titancannon-icon_old.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/titancannon_old.png Normal file

Binary file not shown.

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