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

Browse Source

...

This commit is contained in:

Anuken

2018-03-16 22:18:58 -04:00

parent 714fdc751a e2effa1c5d

commit 4a7c722673

31 changed files with 305 additions and 95 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/backgrounds/background.png

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/discord-banner-over.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/discord-banner.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-dev-builds.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-exit.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-github.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-google-play.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-itch.io.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-link.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-trello.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/ui/icons/icon-wiki.png Normal file

Binary file not shown.

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