Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Multiple UI changes, new logo, other misc. changes

Browse Source
This commit is contained in:
Anuken
2017-09-19 21:20:31 -04:00
parent 28bb82ef4b
commit 8b22ef2691
22 changed files with 179 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/ui/uiskin.atlas
+127 -113
View File
@@ -6,14 +6,14 @@ filter: Nearest,Nearest
repeat: none
blank
rotate: false
xy: 116, 2
xy: 202, 14
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
border
rotate: false
xy: 90, 3
xy: 336, 2
size: 12, 12
split: 4, 4, 4, 4
orig: 12, 12
@@ -21,21 +21,21 @@ border
index: -1
border-circle
rotate: false
xy: 136, 12
xy: 418, 35
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
border-circle-error
rotate: false
xy: 166, 10
xy: 82, 10
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
border-dark-blue
rotate: false
xy: 84, 12
xy: 324, 11
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
@@ -43,7 +43,7 @@ border-dark-blue
index: -1
border-error
rotate: false
xy: 76, 54
xy: 500, 42
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
@@ -51,31 +51,23 @@ border-error
index: -1
border-white
rotate: false
xy: 421, 17
xy: 58, 2
size: 12, 12
split: 4, 4, 4, 4
orig: 12, 12
offset: 0, 0
index: -1
bump
rotate: false
xy: 2, 54
size: 72, 72
split: 8, 12, 12, 8
orig: 72, 72
offset: 0, 0
index: -1
button
rotate: false
xy: 327, 14
xy: 238, 2
size: 24, 40
split: 10, 10, 8, 8
split: 10, 10, 6, 10
orig: 24, 40
offset: 0, 0
index: -1
button-blue
rotate: false
xy: 223, 44
xy: 82, 40
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
@@ -84,7 +76,7 @@ button-blue
index: -1
button-blue-down
rotate: false
xy: 171, 40
xy: 448, 40
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
@@ -93,7 +85,7 @@ button-blue-down
index: -1
button-blue-over
rotate: false
xy: 197, 40
xy: 474, 40
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
@@ -102,15 +94,23 @@ button-blue-over
index: -1
button-down
rotate: false
xy: 249, 44
xy: 108, 40
size: 24, 40
split: 10, 10, 8, 8
split: 10, 10, 6, 10
orig: 24, 40
offset: 0, 0
index: -1
button-over
rotate: false
xy: 108, 40
size: 24, 40
split: 10, 10, 6, 10
orig: 24, 40
offset: 0, 0
index: -1
button-gray
rotate: false
xy: 301, 44
xy: 160, 40
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
@@ -119,7 +119,7 @@ button-gray
index: -1
button-gray-over
rotate: false
xy: 275, 44
xy: 134, 40
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
@@ -128,7 +128,7 @@ button-gray-over
index: -1
button-map
rotate: false
xy: 110, 20
xy: 238, 44
size: 24, 40
split: 10, 10, 8, 8
orig: 24, 40
@@ -136,7 +136,7 @@ button-map
index: -1
button-map-down
rotate: false
xy: 58, 12
xy: 186, 40
size: 24, 40
split: 10, 10, 8, 8
orig: 24, 40
@@ -144,15 +144,7 @@ button-map-down
index: -1
button-map-over
rotate: false
xy: 84, 20
size: 24, 40
split: 10, 10, 8, 8
orig: 24, 40
offset: 0, 0
index: -1
button-over
rotate: false
xy: 223, 2
xy: 212, 44
size: 24, 40
split: 10, 10, 8, 8
orig: 24, 40
@@ -160,7 +152,7 @@ button-over
index: -1
button-red
rotate: false
xy: 249, 2
xy: 264, 44
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
@@ -169,7 +161,7 @@ button-red
index: -1
button-select
rotate: false
xy: 196, 14
xy: 354, 39
size: 24, 24
split: 4, 4, 4, 4
orig: 24, 24
@@ -177,7 +169,7 @@ button-select
index: -1
button-window-bg
rotate: false
xy: 275, 2
xy: 290, 44
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
@@ -186,7 +178,7 @@ button-window-bg
index: -1
button-window-over
rotate: false
xy: 301, 2
xy: 212, 2
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
@@ -195,77 +187,77 @@ button-window-over
index: -1
check-off
rotate: false
xy: 353, 31
xy: 474, 6
size: 28, 32
orig: 28, 32
offset: 0, 0
index: -1
check-on
rotate: false
xy: 383, 31
xy: 264, 10
size: 28, 32
orig: 28, 32
offset: 0, 0
index: -1
check-over
rotate: false
xy: 413, 31
xy: 294, 10
size: 28, 32
orig: 28, 32
offset: 0, 0
index: -1
clear
rotate: false
xy: 327, 2
xy: 500, 50
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
color-picker-bar-selector
rotate: false
xy: 327, 56
xy: 495, 98
size: 14, 28
orig: 14, 28
offset: 0, 0
index: -1
color-picker-cross
rotate: false
xy: 339, 2
xy: 402, 30
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
color-picker-selector-horizontal
rotate: false
xy: 76, 59
xy: 495, 95
size: 6, 1
orig: 6, 1
offset: 0, 0
index: -1
color-picker-selector-vertical
rotate: false
xy: 220, 6
xy: 72, 2
size: 1, 6
orig: 1, 6
offset: 0, 0
index: -1
cursor
rotate: false
xy: 383, 14
xy: 316, 44
size: 4, 4
orig: 4, 4
offset: 0, 0
index: -1
cursor-normal
rotate: false
xy: 196, 2
xy: 350, 4
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
default-pane
rotate: false
xy: 466, 77
xy: 324, 81
size: 5, 3
split: 1, 1, 1, 1
orig: 5, 3
@@ -273,7 +265,7 @@ default-pane
index: -1
default-pane-no-border
rotate: false
xy: 118, 17
xy: 386, 42
size: 1, 1
split: 0, 0, 0, 0
orig: 1, 1
@@ -281,7 +273,7 @@ default-pane-no-border
index: -1
default-select
rotate: false
xy: 2, 4
xy: 2, 12
size: 54, 48
split: 8, 32, 0, 48
orig: 54, 48
@@ -289,7 +281,7 @@ default-select
index: -1
default-select-selection
rotate: false
xy: 116, 12
xy: 324, 76
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
@@ -297,162 +289,184 @@ default-select-selection
index: -1
grey
rotate: false
xy: 509, 23
xy: 72, 10
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
menu-bg
rotate: false
xy: 509, 23
xy: 72, 10
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
icon-cancel
rotate: false
xy: 367, 4
xy: 324, 16
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
icon-check
rotate: false
xy: 389, 15
xy: 340, 16
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
icon-close
rotate: false
xy: 217, 86
xy: 205, 86
size: 40, 40
orig: 40, 40
offset: 0, 0
index: -1
icon-close-down
rotate: false
xy: 259, 86
xy: 247, 86
size: 40, 40
orig: 40, 40
offset: 0, 0
index: -1
icon-close-over
rotate: false
xy: 301, 86
xy: 289, 86
size: 40, 40
orig: 40, 40
offset: 0, 0
index: -1
icon-defense
rotate: false
xy: 208, 2
xy: 402, 18
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
icon-distribution
rotate: false
xy: 104, 5
xy: 414, 23
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
icon-menu
rotate: false
xy: 383, 2
xy: 426, 23
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
icon-pause
rotate: false
xy: 395, 2
xy: 414, 11
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
icon-production
rotate: false
xy: 407, 2
xy: 426, 11
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
icon-rotate
rotate: false
xy: 405, 15
xy: 386, 26
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
icon-settings
rotate: false
xy: 419, 2
xy: 358, 27
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
list-selection
rotate: false
xy: 220, 3
xy: 205, 83
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
logotext
rotate: false
xy: 68, 105
size: 89, 21
orig: 89, 21
offset: 0, 0
index: -1
logotext-gray
rotate: false
xy: 68, 82
size: 89, 21
orig: 89, 21
offset: 0, 0
index: -1
padded-list-selection
rotate: false
xy: 104, 2
xy: 500, 47
size: 10, 1
split: 4, 4, 0, 1
orig: 10, 1
offset: 0, 0
index: -1
pane
rotate: false
xy: 448, 2
size: 24, 36
split: 10, 10, 5, 5
orig: 24, 36
offset: 0, 0
index: -1
progressbar
rotate: false
xy: 503, 22
xy: 380, 31
size: 1, 32
orig: 1, 32
offset: 0, 0
index: -1
progressbar-filled
rotate: false
xy: 506, 22
xy: 383, 31
size: 1, 32
orig: 1, 32
offset: 0, 0
index: -1
progressbar-filled-vertical
rotate: false
xy: 84, 17
xy: 474, 3
size: 32, 1
orig: 32, 1
offset: 0, 0
index: -1
progressbar-vertical
rotate: false
xy: 353, 20
xy: 324, 32
size: 32, 1
orig: 32, 1
offset: 0, 0
index: -1
radio-off
rotate: false
xy: 443, 44
xy: 112, 10
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
radio-on
rotate: false
xy: 473, 52
xy: 142, 10
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
scroll
rotate: false
xy: 430, 74
xy: 300, 2
size: 34, 6
split: 4, 4, 2, 2
orig: 34, 6
@@ -460,7 +474,7 @@ scroll
index: -1
scroll-horizontal
rotate: false
xy: 502, 92
xy: 316, 50
size: 6, 34
split: 2, 2, 0, 34
pad: 0, 5, 5, 4
@@ -469,7 +483,7 @@ scroll-horizontal
index: -1
scroll-knob-horizontal
rotate: false
xy: 503, 56
xy: 504, 62
size: 6, 34
split: 2, 2, 0, 34
pad: 0, 5, 13, 12
@@ -478,7 +492,7 @@ scroll-knob-horizontal
index: -1
scroll-knob-vertical
rotate: false
xy: 353, 23
xy: 264, 2
size: 34, 6
split: 12, 12, 2, 2
orig: 34, 6
@@ -486,105 +500,105 @@ scroll-knob-vertical
index: -1
select-box-list-bg
rotate: false
xy: 466, 74
xy: 414, 39
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
window-bg
rotate: false
xy: 466, 74
xy: 414, 39
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
select-down
rotate: false
xy: 58, 2
xy: 2, 2
size: 14, 8
orig: 14, 8
offset: 0, 0
index: -1
select-up
rotate: false
xy: 74, 2
xy: 18, 2
size: 14, 8
orig: 14, 8
offset: 0, 0
index: -1
selection
rotate: false
xy: 81, 56
xy: 354, 36
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
separator
rotate: false
xy: 121, 12
xy: 495, 92
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
tree-over
rotate: false
xy: 121, 12
xy: 495, 92
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
separator-menu
rotate: false
xy: 469, 74
xy: 75, 10
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
slider
rotate: false
xy: 509, 46
xy: 386, 55
size: 1, 8
orig: 1, 8
offset: 0, 0
index: -1
slider-knob
rotate: false
xy: 430, 82
xy: 447, 82
size: 22, 44
orig: 22, 44
offset: 0, 0
index: -1
slider-knob-disabled
rotate: false
xy: 454, 82
xy: 471, 82
size: 22, 44
orig: 22, 44
offset: 0, 0
index: -1
slider-knob-down
rotate: false
xy: 478, 82
xy: 58, 16
size: 22, 44
orig: 22, 44
offset: 0, 0
index: -1
slider-knob-over
rotate: false
xy: 478, 82
xy: 58, 16
size: 22, 44
orig: 22, 44
offset: 0, 0
index: -1
slider-vertical
rotate: false
xy: 421, 14
xy: 72, 13
size: 8, 1
orig: 8, 1
offset: 0, 0
index: -1
slot
rotate: false
xy: 76, 62
xy: 2, 62
size: 64, 64
split: 4, 8, 8, 4
orig: 64, 64
@@ -592,42 +606,42 @@ slot
index: -1
splitpane
rotate: false
xy: 431, 14
xy: 202, 11
size: 8, 1
orig: 8, 1
offset: 0, 0
index: -1
splitpane-over
rotate: false
xy: 343, 62
xy: 438, 32
size: 8, 1
orig: 8, 1
offset: 0, 0
index: -1
splitpane-vertical
rotate: false
xy: 509, 36
xy: 386, 45
size: 1, 8
orig: 1, 8
offset: 0, 0
index: -1
splitpane-vertical-over
rotate: false
xy: 509, 26
xy: 34, 2
size: 1, 8
orig: 1, 8
offset: 0, 0
index: -1
sub-menu
rotate: false
xy: 126, 4
xy: 202, 24
size: 8, 14
orig: 8, 14
offset: 0, 0
index: -1
textfield
rotate: false
xy: 473, 22
xy: 324, 35
size: 28, 28
split: 6, 6, 6, 6
orig: 28, 28
@@ -635,7 +649,7 @@ textfield
index: -1
textfield-over
rotate: false
xy: 443, 14
xy: 172, 10
size: 28, 28
split: 2, 2, 2, 2
orig: 28, 28
@@ -643,7 +657,7 @@ textfield-over
index: -1
tooltip-bg
rotate: false
xy: 121, 15
xy: 438, 27
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
@@ -651,28 +665,28 @@ tooltip-bg
index: -1
touchpad-knob
rotate: false
xy: 171, 82
xy: 159, 82
size: 44, 44
orig: 44, 44
offset: 0, 0
index: -1
tree-minus
rotate: false
xy: 431, 2
xy: 362, 6
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
tree-plus
rotate: false
xy: 353, 2
xy: 68, 64
size: 12, 16
orig: 12, 16
offset: 0, 0
index: -1
tree-selection
rotate: false
xy: 136, 57
xy: 443, 27
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
@@ -680,22 +694,22 @@ tree-selection
index: -1
white
rotate: false
xy: 430, 69
xy: 37, 7
size: 3, 3
orig: 3, 3
offset: 0, 0
index: -1
window
rotate: false
xy: 401, 65
xy: 418, 65
size: 27, 61
split: 8, 8, 47, 8
split: 8, 8, 44, 11
orig: 27, 61
offset: 0, 0
index: -1
window-border-bg
rotate: false
xy: 473, 17
xy: 37, 2
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
@@ -703,7 +717,7 @@ window-border-bg
index: -1
window-gray
rotate: false
xy: 343, 65
xy: 331, 65
size: 27, 61
split: 5, 4, 52, 4
orig: 27, 61
@@ -711,7 +725,7 @@ window-gray
index: -1
window-noborder
rotate: false
xy: 372, 65
xy: 360, 65
size: 27, 61
split: 5, 4, 53, 3
orig: 27, 61
@@ -719,7 +733,7 @@ window-noborder
index: -1
window-resizable
rotate: false
xy: 142, 42
xy: 389, 42
size: 27, 84
split: 3, 19, 2, 20
pad: 5, 5, 50, 7