Skip to content

Commit 2720af6

Browse files
committed
UI updates
1 parent 6b33484 commit 2720af6

23 files changed

+272
-191
lines changed

resources/gui/layouts/game/CharacterWindow.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,9 +1189,7 @@
11891189
"HoveredImage": "",
11901190
"ClickedImage": "",
11911191
"DisabledImage": "",
1192-
"HoverSound": "",
1193-
"MouseUpSound": "",
1194-
"MouseDownSound": "",
1192+
"_stateSoundNames": {},
11951193
"Children": {
11961194
"_icon": {
11971195
"Bounds": "0,4,24,24",

resources/gui/layouts/game/ChatContextMenu.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,11 @@
105105
"HoveredImage": null,
106106
"ClickedImage": null,
107107
"DisabledImage": null,
108-
"HoverSound": null,
109-
"MouseUpSound": null,
110-
"MouseDownSound": null
108+
"_stateSoundNames": {
109+
"Hover": "octave-tap-resonant.wav",
110+
"MouseDown": "octave-tap-warm.wav",
111+
"MouseUp": "octave-tap-warm.wav"
112+
}
111113
},
112114
"DownOrRightButton": {
113115
"Bounds": "0,0,15,15",
@@ -235,9 +237,11 @@
235237
"HoveredImage": null,
236238
"ClickedImage": null,
237239
"DisabledImage": null,
238-
"HoverSound": null,
239-
"MouseUpSound": null,
240-
"MouseDownSound": null
240+
"_stateSoundNames": {
241+
"Hover": "octave-tap-resonant.wav",
242+
"MouseDown": "octave-tap-warm.wav",
243+
"MouseUp": "octave-tap-warm.wav"
244+
}
241245
},
242246
"DownOrRightButton": {
243247
"Bounds": "0,0,15,15",
@@ -283,5 +287,6 @@
283287
"BackgroundTemplate": "contextmenu.png",
284288
"ItemTextColor": "255,180,180,180",
285289
"ItemHoveredTextColor": "255,255,255,255",
286-
"ItemFont": "sourcesansproblack,10"
290+
"ItemFontName": "sourcesansproblack",
291+
"ItemFontSize": 10
287292
}

resources/gui/layouts/game/ChatboxWindow.json

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,11 @@
131131
"HoveredImage": null,
132132
"ClickedImage": null,
133133
"DisabledImage": null,
134-
"HoverSound": null,
135-
"MouseUpSound": null,
136-
"MouseDownSound": null
134+
"_stateSoundNames": {
135+
"Hover": "octave-tap-resonant.wav",
136+
"MouseDown": "octave-tap-warm.wav",
137+
"MouseUp": "octave-tap-warm.wav"
138+
}
137139
},
138140
"DownOrRightButton": {
139141
"Bounds": "0,0,15,15",
@@ -261,9 +263,11 @@
261263
"HoveredImage": null,
262264
"ClickedImage": null,
263265
"DisabledImage": null,
264-
"HoverSound": null,
265-
"MouseUpSound": null,
266-
"MouseDownSound": null
266+
"_stateSoundNames": {
267+
"Hover": "octave-tap-resonant.wav",
268+
"MouseDown": "octave-tap-warm.wav",
269+
"MouseUp": "octave-tap-warm.wav"
270+
}
267271
},
268272
"DownOrRightButton": {
269273
"Bounds": "0,0,15,15",
@@ -648,7 +652,7 @@
648652
"SubmitSound": "octave-tap-warm.wav"
649653
},
650654
"ChannelLabel": {
651-
"Bounds": "164,9,54,16",
655+
"Bounds": "164,9,63,20",
652656
"Dock": "None",
653657
"Padding": "0,0,0,0",
654658
"AlignmentEdgeDistances": "0,0,0,0",
@@ -852,9 +856,11 @@
852856
"HoveredImage": "",
853857
"ClickedImage": "",
854858
"DisabledImage": "",
855-
"HoverSound": "octave-tap-resonant.wav",
856-
"MouseUpSound": "octave-tap-professional.wav",
857-
"MouseDownSound": "octave-tap-professional.wav"
859+
"_stateSoundNames": {
860+
"Hover": "octave-tap-resonant.wav",
861+
"MouseDown": "octave-tap-warm.wav",
862+
"MouseUp": "octave-tap-warm.wav"
863+
}
858864
},
859865
"DownOrRightButton": {
860866
"Bounds": "0,0,15,15",
@@ -982,9 +988,11 @@
982988
"HoveredImage": "scrollbarhover.png",
983989
"ClickedImage": "scrollbarclicked.png",
984990
"DisabledImage": "",
985-
"HoverSound": "octave-tap-resonant.wav",
986-
"MouseUpSound": "octave-tap-professional.wav",
987-
"MouseDownSound": "octave-tap-professional.wav"
991+
"_stateSoundNames": {
992+
"Hover": "octave-tap-resonant.wav",
993+
"MouseDown": "octave-tap-warm.wav",
994+
"MouseUp": "octave-tap-warm.wav"
995+
}
988996
},
989997
"DownOrRightButton": {
990998
"Bounds": "0,0,15,15",
@@ -1030,7 +1038,8 @@
10301038
"BackgroundTemplate": "contextmenu.png",
10311039
"ItemTextColor": "255,180,180,180",
10321040
"ItemHoveredTextColor": "255,255,255,255",
1033-
"ItemFont": "sourcesansproblack,10"
1041+
"ItemFontName": "sourcesansproblack",
1042+
"ItemFontSize": 10
10341043
},
10351044
"_arrowIcon": {
10361045
"Bounds": "42,0,15,15",
@@ -1087,7 +1096,7 @@
10871096
"TextScale": 1.0
10881097
},
10891098
"ChatboxSendButton": {
1090-
"Bounds": "0,0,0,0",
1099+
"Bounds": "0,0,1,1",
10911100
"Dock": "None",
10921101
"Padding": "0,0,0,0",
10931102
"AlignmentEdgeDistances": "0,0,0,0",

resources/gui/layouts/game/CraftedItem.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@
7777
"DisabledTextColor": "255,90,90,90",
7878
"TextAlign": "Left, Top",
7979
"AutoSizeToContents": true,
80-
"Font": "sourcesansproblack,8",
80+
"FontName": "sourcesansproblack",
81+
"FontSize": 8,
8182
"TextScale": 1.0
8283
}
8384
}

resources/gui/layouts/game/CraftingIngredient.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@
7777
"DisabledTextColor": "255,90,90,90",
7878
"TextAlign": "Left, Top",
7979
"AutoSizeToContents": true,
80-
"Font": "sourcesansproblack,8",
80+
"FontName": "sourcesansproblack",
81+
"FontSize": 8,
8182
"TextScale": 1.0
8283
}
8384
}

0 commit comments

Comments
 (0)