Skip to content

Commit 09916a5

Browse files
lodicololodicolo
committed
1 parent 7ca272b commit 09916a5

File tree

73 files changed

+12304
-15404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+12304
-15404
lines changed

‎resources/gui/background.png

13.6 KB
Loading

‎resources/gui/leftarrowclicked.png ‎resources/gui/button.arrow_left.active.png

File renamed without changes.

‎resources/gui/button.arrow_left.disabled.png

762 Bytes
Loading

‎resources/gui/leftarrowhover.png ‎resources/gui/button.arrow_left.hovered.png

File renamed without changes.

‎resources/gui/leftarrownormal.png ‎resources/gui/button.arrow_left.normal.png

File renamed without changes.

‎resources/gui/rightarrowclicked.png ‎resources/gui/button.arrow_right.active.png

File renamed without changes.

‎resources/gui/button.arrow_right.disabled.png

753 Bytes
Loading

‎resources/gui/rightarrowhover.png ‎resources/gui/button.arrow_right.hovered.png

File renamed without changes.

‎resources/gui/rightarrownormal.png ‎resources/gui/button.arrow_right.normal.png

File renamed without changes.

‎resources/gui/char_selection.png ‎resources/gui/character_preview_background.png

File renamed without changes.

‎resources/gui/icon.alert.error.png

681 Bytes
Loading

‎resources/gui/icon.alert.information.png

506 Bytes
Loading

‎resources/gui/icon.alert.warning.png

396 Bytes
Loading

‎resources/gui/layouts/debug/DebugWindow.json

+4,275-1
Large diffs are not rendered by default.

‎resources/gui/layouts/game/AdminWindow.json

+1,903-1,809
Large diffs are not rendered by default.

‎resources/gui/layouts/game/AnnouncementWindow.json

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"ClickedTextColor": null,
5151
"DisabledTextColor": "255,90,90,90",
5252
"TextAlign": "Center",
53-
"TextPadding": "0,0,0,0",
5453
"AutoSizeToContents": true,
5554
"Font": "sourcesansproblack,16",
5655
"TextScale": 1.0

‎resources/gui/layouts/game/BankContextMenu.json

+24-24
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"TooltipTextColor": null,
4343
"BackgroundTemplate": null,
4444
"UpOrLeftButton": {
45-
"Bounds": "0,0,100,20",
45+
"Bounds": "0,0,15,15",
4646
"Dock": "None",
4747
"Padding": "0,0,0,0",
4848
"AlignmentEdgeDistances": "0,0,0,0",
@@ -66,18 +66,18 @@
6666
"ClickedTextColor": null,
6767
"DisabledTextColor": "255,90,90,90",
6868
"TextAlign": "Center",
69-
"TextPadding": "3,3,3,3",
7069
"AutoSizeToContents": false,
7170
"Font": null,
7271
"TextScale": 1.0,
7372
"NormalImage": null,
7473
"HoveredImage": null,
7574
"ClickedImage": null,
7675
"DisabledImage": null,
77-
"HoverSound": null,
78-
"MouseUpSound": null,
79-
"MouseDownSound": null,
80-
"ClickSound": null,
76+
"_stateSoundNames": {
77+
"Hover": "octave-tap-resonant.wav",
78+
"MouseDown": "octave-tap-warm.wav",
79+
"MouseUp": "octave-tap-warm.wav"
80+
},
8181
"CenterImage": false
8282
},
8383
"Bar": {
@@ -109,7 +109,7 @@
109109
"MouseDownSound": null
110110
},
111111
"DownOrRightButton": {
112-
"Bounds": "0,0,100,20",
112+
"Bounds": "0,0,15,15",
113113
"Dock": "None",
114114
"Padding": "0,0,0,0",
115115
"AlignmentEdgeDistances": "0,0,0,0",
@@ -133,18 +133,18 @@
133133
"ClickedTextColor": null,
134134
"DisabledTextColor": "255,90,90,90",
135135
"TextAlign": "Center",
136-
"TextPadding": "3,3,3,3",
137136
"AutoSizeToContents": false,
138137
"Font": null,
139138
"TextScale": 1.0,
140139
"NormalImage": null,
141140
"HoveredImage": null,
142141
"ClickedImage": null,
143142
"DisabledImage": null,
144-
"HoverSound": null,
145-
"MouseUpSound": null,
146-
"MouseDownSound": null,
147-
"ClickSound": null,
143+
"_stateSoundNames": {
144+
"Hover": "octave-tap-resonant.wav",
145+
"MouseDown": "octave-tap-warm.wav",
146+
"MouseUp": "octave-tap-warm.wav"
147+
},
148148
"CenterImage": false
149149
}
150150
},
@@ -170,7 +170,7 @@
170170
"TooltipTextColor": null,
171171
"BackgroundTemplate": null,
172172
"UpOrLeftButton": {
173-
"Bounds": "0,0,100,20",
173+
"Bounds": "0,0,15,15",
174174
"Dock": "None",
175175
"Padding": "0,0,0,0",
176176
"AlignmentEdgeDistances": "0,0,0,0",
@@ -194,18 +194,18 @@
194194
"ClickedTextColor": null,
195195
"DisabledTextColor": "255,90,90,90",
196196
"TextAlign": "Center",
197-
"TextPadding": "3,3,3,3",
198197
"AutoSizeToContents": false,
199198
"Font": null,
200199
"TextScale": 1.0,
201200
"NormalImage": null,
202201
"HoveredImage": null,
203202
"ClickedImage": null,
204203
"DisabledImage": null,
205-
"HoverSound": null,
206-
"MouseUpSound": null,
207-
"MouseDownSound": null,
208-
"ClickSound": null,
204+
"_stateSoundNames": {
205+
"Hover": "octave-tap-resonant.wav",
206+
"MouseDown": "octave-tap-warm.wav",
207+
"MouseUp": "octave-tap-warm.wav"
208+
},
209209
"CenterImage": false
210210
},
211211
"Bar": {
@@ -237,7 +237,7 @@
237237
"MouseDownSound": null
238238
},
239239
"DownOrRightButton": {
240-
"Bounds": "0,0,100,20",
240+
"Bounds": "0,0,15,15",
241241
"Dock": "None",
242242
"Padding": "0,0,0,0",
243243
"AlignmentEdgeDistances": "0,0,0,0",
@@ -261,18 +261,18 @@
261261
"ClickedTextColor": null,
262262
"DisabledTextColor": "255,90,90,90",
263263
"TextAlign": "Center",
264-
"TextPadding": "3,3,3,3",
265264
"AutoSizeToContents": false,
266265
"Font": null,
267266
"TextScale": 1.0,
268267
"NormalImage": null,
269268
"HoveredImage": null,
270269
"ClickedImage": null,
271270
"DisabledImage": null,
272-
"HoverSound": null,
273-
"MouseUpSound": null,
274-
"MouseDownSound": null,
275-
"ClickSound": null,
271+
"_stateSoundNames": {
272+
"Hover": "octave-tap-resonant.wav",
273+
"MouseDown": "octave-tap-warm.wav",
274+
"MouseUp": "octave-tap-warm.wav"
275+
},
276276
"CenterImage": false
277277
}
278278
},

‎resources/gui/layouts/game/BankItem.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"RightMouseClickSound": "octave-beep-tapped.wav"
5252
},
5353
"BankItemValue": {
54-
"Bounds": "30,24,4,11",
54+
"Bounds": "33,21,1,14",
5555
"Dock": "None",
5656
"Padding": "0,0,0,0",
5757
"AlignmentEdgeDistances": "0,0,0,0",
@@ -76,7 +76,6 @@
7676
"ClickedTextColor": null,
7777
"DisabledTextColor": "255,90,90,90",
7878
"TextAlign": "Left, Top",
79-
"TextPadding": "2,-2,2,-1",
8079
"AutoSizeToContents": true,
8180
"Font": "sourcesansproblack,8",
8281
"TextScale": 1.0

0 commit comments

Comments
 (0)