Cleaned up UI, merged atlases, added GLProfiling

Browse source

...

This commit is contained in:

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

parent 2ca4f8b90a

commit 70693ffdd3

130 changed files with 662 additions and 939 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/shieldgenerator.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 262 B After Width:  |  Height:  |  Size: 238 B

BIN

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

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 235 B

BIN

core/assets-raw/sprites/blocks/titaniumwall.png

View file

Binary file not shown.

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

BIN

core/assets-raw/sprites/circle.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 235 B After Width:  |  Height:  |  Size: 258 B

BIN

core/assets-raw/sprites/circle2.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

core/assets-raw/ui/button-down.9.png → core/assets-raw/sprites/ui/button-down.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/button-gray-over.9.png → core/assets-raw/sprites/ui/button-gray-over.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/button-gray.9.png → core/assets-raw/sprites/ui/button-gray.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/button-map-down.9.png → core/assets-raw/sprites/ui/button-map-down.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/button-map-over.9.png → core/assets-raw/sprites/ui/button-map-over.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/button-map.9.png → core/assets-raw/sprites/ui/button-map.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/button-over.9.png → core/assets-raw/sprites/ui/button-over.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/button-select.9.png → core/assets-raw/sprites/ui/button-select.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/button.9.png → core/assets-raw/sprites/ui/button.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/check-off.png → core/assets-raw/sprites/ui/check-off.png

Unescape Escape View file

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

0

core/assets-raw/ui/check-on.png → core/assets-raw/sprites/ui/check-on.png

Unescape Escape View file

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

0

core/assets-raw/ui/check-over.png → core/assets-raw/sprites/ui/check-over.png

Unescape Escape View file

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

0

core/assets-raw/ui/clear.png → core/assets-raw/sprites/ui/clear.png

Unescape Escape View file

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

0

core/assets-raw/ui/cursor.png → core/assets-raw/sprites/ui/cursor.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-cancel.png → core/assets-raw/sprites/ui/icon-cancel.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-check.png → core/assets-raw/sprites/ui/icon-check.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-close-down.png → core/assets-raw/sprites/ui/icon-close-down.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-close-over.png → core/assets-raw/sprites/ui/icon-close-over.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-close.png → core/assets-raw/sprites/ui/icon-close.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-cursor.png → core/assets-raw/sprites/ui/icon-cursor.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-defense.png → core/assets-raw/sprites/ui/icon-defense.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-distribution.png → core/assets-raw/sprites/ui/icon-distribution.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-menu.png → core/assets-raw/sprites/ui/icon-menu.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-pause.png → core/assets-raw/sprites/ui/icon-pause.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-play.png → core/assets-raw/sprites/ui/icon-play.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-production.png → core/assets-raw/sprites/ui/icon-production.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-rotate-arrow.png → core/assets-raw/sprites/ui/icon-rotate-arrow.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-rotate.png → core/assets-raw/sprites/ui/icon-rotate.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-settings.png → core/assets-raw/sprites/ui/icon-settings.png

Unescape Escape View file

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

0

core/assets-raw/ui/icon-touch.png → core/assets-raw/sprites/ui/icon-touch.png

Unescape Escape View file

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

0

core/assets-raw/ui/logotext-gray.png → core/assets-raw/sprites/ui/logotext-gray.png

Unescape Escape View file

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

0

core/assets-raw/ui/logotext.png → core/assets-raw/sprites/ui/logotext.png

Unescape Escape View file

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

0

core/assets-raw/ui/pane.9.png → core/assets-raw/sprites/ui/pane.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/scroll-horizontal.9.png → core/assets-raw/sprites/ui/scroll-horizontal.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/scroll-knob-horizontal.9.png → core/assets-raw/sprites/ui/scroll-knob-horizontal.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/scroll-knob-vertical.9.png → core/assets-raw/sprites/ui/scroll-knob-vertical.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/scroll.9.png → core/assets-raw/sprites/ui/scroll.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/selection.png → core/assets-raw/sprites/ui/selection.png

Unescape Escape View file

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

0

core/assets-raw/ui/separator.png → core/assets-raw/sprites/ui/separator.png

Unescape Escape View file

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

0

core/assets-raw/ui/slider-knob-down.png → core/assets-raw/sprites/ui/slider-knob-down.png

Unescape Escape View file

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

0

core/assets-raw/ui/slider-knob-over.png → core/assets-raw/sprites/ui/slider-knob-over.png

Unescape Escape View file

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

0

core/assets-raw/ui/slider-knob.png → core/assets-raw/sprites/ui/slider-knob.png

Unescape Escape View file

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

0

core/assets-raw/ui/slider-vertical.png → core/assets-raw/sprites/ui/slider-vertical.png

Unescape Escape View file

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

0

core/assets-raw/ui/slider.png → core/assets-raw/sprites/ui/slider.png

Unescape Escape View file

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

0

core/assets-raw/ui/slot.9.png → core/assets-raw/sprites/ui/slot.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/textfield-over.9.png → core/assets-raw/sprites/ui/textfield-over.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/textfield.9.png → core/assets-raw/sprites/ui/textfield.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/white.png → core/assets-raw/sprites/ui/white.png

Unescape Escape View file

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

0

core/assets-raw/ui/window-gray.9.png → core/assets-raw/sprites/ui/window-gray.9.png

Unescape Escape View file

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

0

core/assets-raw/ui/window.9.png → core/assets-raw/sprites/ui/window.9.png

Unescape Escape View file

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

BIN

core/assets-raw/ui/blank.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 85 B

BIN

core/assets-raw/ui/border-circle-error.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 995 B

BIN

core/assets-raw/ui/border-circle.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

core/assets-raw/ui/border-dark-blue.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 86 B

BIN

core/assets-raw/ui/border-error.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 87 B

BIN

core/assets-raw/ui/border-white.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 176 B

BIN

core/assets-raw/ui/border.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 178 B

BIN

core/assets-raw/ui/button-blue-down.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 124 B

BIN

core/assets-raw/ui/button-blue-over.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 125 B

BIN

core/assets-raw/ui/button-blue.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 127 B

BIN

core/assets-raw/ui/button-red.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 126 B

BIN

core/assets-raw/ui/button-window-bg.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 200 B

BIN

core/assets-raw/ui/button-window-over.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 199 B

BIN

core/assets-raw/ui/color-picker-bar-selector.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 309 B

BIN

core/assets-raw/ui/color-picker-cross.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 104 B

BIN

core/assets-raw/ui/color-picker-selector-horizontal.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 74 B

BIN

core/assets-raw/ui/color-picker-selector-vertical.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 76 B

BIN

core/assets-raw/ui/cursor-normal.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 103 B

BIN

core/assets-raw/ui/default-pane-no-border.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 78 B

BIN

core/assets-raw/ui/default-pane.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 88 B

BIN

core/assets-raw/ui/default-select-selection.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 86 B

BIN

core/assets-raw/ui/default-select.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 303 B

BIN

core/assets-raw/ui/grey.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 70 B

BIN

core/assets-raw/ui/list-selection.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 70 B

BIN

core/assets-raw/ui/menu-bg.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 70 B

BIN

core/assets-raw/ui/padded-list-selection.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 82 B

BIN

core/assets-raw/ui/progressbar-filled-vertical.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 72 B

BIN

core/assets-raw/ui/progressbar-filled.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 73 B

BIN

core/assets-raw/ui/progressbar-vertical.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 72 B

BIN

core/assets-raw/ui/progressbar.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 73 B

BIN

core/assets-raw/ui/radio-off.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 591 B

BIN

core/assets-raw/ui/radio-on.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 743 B

BIN

core/assets-raw/ui/select-box-list-bg.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 70 B

BIN

core/assets-raw/ui/select-down.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 254 B

BIN

core/assets-raw/ui/select-up.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 262 B

BIN

core/assets-raw/ui/separator-menu.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 70 B

BIN

core/assets-raw/ui/slider-knob-disabled.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 102 B

BIN

core/assets-raw/ui/splitpane-over.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 72 B

BIN

core/assets-raw/ui/splitpane-vertical-over.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 73 B

BIN

core/assets-raw/ui/splitpane-vertical.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 73 B

BIN

core/assets-raw/ui/splitpane.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 72 B

BIN

core/assets-raw/ui/sub-menu.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 247 B

BIN

core/assets-raw/ui/tooltip-bg.9.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 90 B

BIN

core/assets-raw/ui/touchpad-knob.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.1 KiB

BIN

core/assets-raw/ui/tree-minus.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 133 B

Some files were not shown because too many files have changed in this diff Show more