Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations

Browse Source

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/src/io/anuke/mindustry/core/Renderer.java
#	core/src/io/anuke/mindustry/entities/units/types/Drone.java
#	core/src/io/anuke/mindustry/graphics/CacheLayer.java
#	core/src/io/anuke/mindustry/world/blocks/Floor.java

...

This commit is contained in:

Anuken

2018-11-26 13:23:38 -05:00

parent 46c6b2168c ef85d1d83e

commit b721d7a10f

109 changed files with 1495 additions and 1370 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/ui/icons/icon-liquid-small.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/icons/icon-power-small.png

BIN

Binary file not shown.

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