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

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java

2018-02-27 19:58:34 -05:00

..

icons

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

2018-02-27 19:58:34 -05:00

border.9.png

Updated build.gradle, changed scroll dialog, UI tweaks

2017-11-27 22:23:47 -05:00

button-down.9.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

button-map-down.9.png

Increased number of save slots, UI colors tweaked

2017-12-02 00:29:44 -05:00

button-map-over.9.png

Many bugfixes and tweaks, added doors

2017-12-02 12:46:02 -05:00

button-map.9.png

Added new blocks, maps, and a temporary editor

2017-11-30 19:11:54 -05:00

button-over.9.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

button-select.9.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

button.9.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

check-off.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

check-on-over.png

Finished most of new save system, added new localized strings

2017-12-29 15:54:59 -05:00

check-on.png

Finished most of new save system, added new localized strings

2017-12-29 15:54:59 -05:00

check-over.png

Finished most of new save system, added new localized strings

2017-12-29 15:54:59 -05:00

clear.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

cursor.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

logotext.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

pane-button.9.png

Mobile and desktop UI changes

2017-11-10 19:47:57 -05:00

pane.9.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

scroll-horizontal.9.png

Finish map editor core functionality

2017-12-19 00:05:41 -05:00

scroll-knob-horizontal.9.png

Finish map editor core functionality

2017-12-19 00:05:41 -05:00

scroll-knob-vertical-black.9.png

Finished most of new save system, added new localized strings

2017-12-29 15:54:59 -05:00

scroll-knob-vertical.9.png

Finished most of new save system, added new localized strings

2017-12-29 15:54:59 -05:00

scroll.9.png

Updated build.gradle, changed scroll dialog, UI tweaks

2017-11-27 22:23:47 -05:00

selection.png

Finish map editor core functionality

2017-12-19 00:05:41 -05:00

slider-knob-down.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

slider-knob-over.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

slider-knob.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

slider-vertical.png

Finish map editor core functionality

2017-12-19 00:05:41 -05:00

slider.png

Add basic map editor, change map system

2017-12-17 23:51:55 -05:00

text-sides-down.png

Fixed zoom/web save export/liquid crafter/menu button scale bugs

2018-01-26 14:01:16 -05:00

text-sides-over.png

Added language select menu

2018-01-18 22:13:45 -05:00

text-sides.png

Fixed zoom/web save export/liquid crafter/menu button scale bugs

2018-01-26 14:01:16 -05:00

textfield-over.9.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

textfield.9.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

white.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00

window-empty.9.png

Many UI changes, WIP main menu rework

2017-11-09 23:05:47 -05:00

window.9.png

Cleaned up UI, merged atlases, added GLProfiling

2017-10-22 16:24:49 -04:00