Skip to content

Commit 4be33de

Browse files
NachosChipeadosNachosChipeados
authored
Merge branch 'main' into material_reload
2 parents 5fb072f + d36e56c commit 4be33de

File tree

19 files changed

+1451
-836
lines changed

19 files changed

+1451
-836
lines changed

‎Northstar.Client/mod/resource/northstar_client_localisation_english.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
237237
"player_bleedout_firstAidTimeSelf" "Self-res time"
238238
"player_bleedout_firstAidHealPercent" "First aid health percentage"
239239
"player_bleedout_aiBleedingPlayerMissChance" "Downed AI miss chance"
240+
"BLEEDOUT_CALL_HELP" "You're bleeding out!"
240241

241242
// coop stuff
242243
"PL_sp_coop" "(UNFINISHED) Singleplayer Coop"

‎Northstar.Client/mod/resource/northstar_client_localisation_french.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
236236
"player_bleedout_firstAidTimeSelf" "Temps d'auto-réanimation"
237237
"player_bleedout_firstAidHealPercent" "Soins (%) des prem. secours"
238238
"player_bleedout_aiBleedingPlayerMissChance" "Ratage (%) des IA à terre"
239+
"BLEEDOUT_CALL_HELP" "Vous êtes à terre !"
239240

240241
// coop stuff
241242
"PL_sp_coop" "(ALPHA) Campagne (coop)"

‎Northstar.Client/mod/resource/northstar_client_localisation_russian.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,5 +381,6 @@
381381
"MODE_MENU_PVP" "Против игроков"
382382
"MODE_MENU_PVPVE" "Против людей и окружения"
383383
"MODE_MENU_PVE" "Против окружения"
384+
"BLEEDOUT_CALL_HELP" "Кровотечение!"
384385
}
385386
}

‎Northstar.Client/mod/resource/ui/hudvoice.res‎

Lines changed: 317 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,317 @@
1+
"Resource/UI/HudVoice.res"
2+
{
3+
VoiceSafeArea // Normal SafeArea couldn't be found
4+
{
5+
ControlName ImagePanel
6+
wide %90
7+
tall %90
8+
visible 1
9+
scaleImage 1
10+
fillColor "0 0 0 0"
11+
drawColor "0 0 0 0"
12+
13+
pin_to_sibling Screen
14+
pin_corner_to_sibling CENTER
15+
pin_to_sibling_corner CENTER
16+
}
17+
18+
voiceMic0
19+
{
20+
ControlName ImagePanel
21+
wide 36
22+
tall 36
23+
visible 0
24+
image "ui/icon_mic_active"
25+
scaleImage 1
26+
zpos 900
27+
28+
pin_to_sibling VoiceSafeArea
29+
pin_corner_to_sibling TOP_RIGHT
30+
pin_to_sibling_corner TOP_RIGHT
31+
}
32+
voiceName0
33+
{
34+
ControlName Label
35+
wide 450
36+
tall 36
37+
visible 0
38+
font Default_21_ShadowGlow
39+
textAlignment east
40+
textinsetx 13
41+
zpos 900
42+
43+
pin_to_sibling voiceMic0
44+
pin_corner_to_sibling TOP_RIGHT
45+
pin_to_sibling_corner TOP_LEFT
46+
}
47+
48+
voiceMic1
49+
{
50+
ControlName ImagePanel
51+
wide 36
52+
tall 36
53+
visible 0
54+
image "ui/icon_mic_active"
55+
scaleImage 1
56+
zpos 900
57+
58+
pin_to_sibling voiceMic0
59+
pin_corner_to_sibling TOP_RIGHT
60+
pin_to_sibling_corner BOTTOM_RIGHT
61+
}
62+
voiceName1
63+
{
64+
ControlName Label
65+
wide 450
66+
tall 36
67+
visible 0
68+
font Default_21_ShadowGlow
69+
textAlignment east
70+
textinsetx 13
71+
zpos 900
72+
73+
pin_to_sibling voiceMic1
74+
pin_corner_to_sibling TOP_RIGHT
75+
pin_to_sibling_corner TOP_LEFT
76+
}
77+
78+
voiceMic2
79+
{
80+
ControlName ImagePanel
81+
wide 36
82+
tall 36
83+
visible 0
84+
image "ui/icon_mic_active"
85+
scaleImage 1
86+
zpos 900
87+
88+
pin_to_sibling voiceMic1
89+
pin_corner_to_sibling TOP_RIGHT
90+
pin_to_sibling_corner BOTTOM_RIGHT
91+
}
92+
voiceName2
93+
{
94+
ControlName Label
95+
wide 450
96+
tall 36
97+
visible 0
98+
font Default_21_ShadowGlow
99+
textAlignment east
100+
textinsetx 13
101+
zpos 900
102+
103+
pin_to_sibling voiceMic2
104+
pin_corner_to_sibling TOP_RIGHT
105+
pin_to_sibling_corner TOP_LEFT
106+
}
107+
108+
voiceMic3
109+
{
110+
ControlName ImagePanel
111+
wide 36
112+
tall 36
113+
visible 0
114+
image "ui/icon_mic_active"
115+
scaleImage 1
116+
zpos 900
117+
118+
pin_to_sibling voiceMic2
119+
pin_corner_to_sibling TOP_RIGHT
120+
pin_to_sibling_corner BOTTOM_RIGHT
121+
}
122+
voiceName3
123+
{
124+
ControlName Label
125+
wide 450
126+
tall 36
127+
visible 0
128+
font Default_21_ShadowGlow
129+
textAlignment east
130+
textinsetx 13
131+
zpos 900
132+
133+
pin_to_sibling voiceMic3
134+
pin_corner_to_sibling TOP_RIGHT
135+
pin_to_sibling_corner TOP_LEFT
136+
}
137+
138+
voiceMic4
139+
{
140+
ControlName ImagePanel
141+
wide 36
142+
tall 36
143+
visible 0
144+
image "ui/icon_mic_active"
145+
scaleImage 1
146+
zpos 900
147+
148+
pin_to_sibling voiceMic3
149+
pin_corner_to_sibling TOP_RIGHT
150+
pin_to_sibling_corner BOTTOM_RIGHT
151+
}
152+
voiceName4
153+
{
154+
ControlName Label
155+
wide 450
156+
tall 36
157+
visible 0
158+
font Default_21_ShadowGlow
159+
textAlignment east
160+
textinsetx 13
161+
zpos 900
162+
163+
pin_to_sibling voiceMic4
164+
pin_corner_to_sibling TOP_RIGHT
165+
pin_to_sibling_corner TOP_LEFT
166+
}
167+
168+
voiceMic5
169+
{
170+
ControlName ImagePanel
171+
wide 36
172+
tall 36
173+
visible 0
174+
image "ui/icon_mic_active"
175+
scaleImage 1
176+
zpos 900
177+
178+
pin_to_sibling voiceMic4
179+
pin_corner_to_sibling TOP_RIGHT
180+
pin_to_sibling_corner BOTTOM_RIGHT
181+
}
182+
voiceName5
183+
{
184+
ControlName Label
185+
wide 450
186+
tall 36
187+
visible 0
188+
font Default_21_ShadowGlow
189+
textAlignment east
190+
textinsetx 13
191+
zpos 900
192+
193+
pin_to_sibling voiceMic5
194+
pin_corner_to_sibling TOP_RIGHT
195+
pin_to_sibling_corner TOP_LEFT
196+
}
197+
198+
voiceMic6
199+
{
200+
ControlName ImagePanel
201+
wide 36
202+
tall 36
203+
visible 0
204+
image "ui/icon_mic_active"
205+
scaleImage 1
206+
zpos 900
207+
208+
pin_to_sibling voiceMic5
209+
pin_corner_to_sibling TOP_RIGHT
210+
pin_to_sibling_corner BOTTOM_RIGHT
211+
}
212+
voiceName6
213+
{
214+
ControlName Label
215+
wide 450
216+
tall 36
217+
visible 0
218+
font Default_21_ShadowGlow
219+
textAlignment east
220+
textinsetx 13
221+
zpos 900
222+
223+
pin_to_sibling voiceMic6
224+
pin_corner_to_sibling TOP_RIGHT
225+
pin_to_sibling_corner TOP_LEFT
226+
}
227+
228+
voiceMic7
229+
{
230+
ControlName ImagePanel
231+
wide 36
232+
tall 36
233+
visible 0
234+
image "ui/icon_mic_active"
235+
scaleImage 1
236+
zpos 900
237+
238+
pin_to_sibling voiceMic6
239+
pin_corner_to_sibling TOP_RIGHT
240+
pin_to_sibling_corner BOTTOM_RIGHT
241+
}
242+
voiceName7
243+
{
244+
ControlName Label
245+
wide 450
246+
tall 36
247+
visible 0
248+
font Default_21_ShadowGlow
249+
textAlignment east
250+
textinsetx 13
251+
zpos 900
252+
253+
pin_to_sibling voiceMic7
254+
pin_corner_to_sibling TOP_RIGHT
255+
pin_to_sibling_corner TOP_LEFT
256+
}
257+
258+
voiceMic8
259+
{
260+
ControlName ImagePanel
261+
wide 36
262+
tall 36
263+
visible 0
264+
image "ui/icon_mic_active"
265+
scaleImage 1
266+
zpos 900
267+
268+
pin_to_sibling voiceMic7
269+
pin_corner_to_sibling TOP_RIGHT
270+
pin_to_sibling_corner BOTTOM_RIGHT
271+
}
272+
voiceName8
273+
{
274+
ControlName Label
275+
wide 450
276+
tall 36
277+
visible 0
278+
font Default_21_ShadowGlow
279+
textAlignment east
280+
textinsetx 13
281+
zpos 900
282+
283+
pin_to_sibling voiceMic8
284+
pin_corner_to_sibling TOP_RIGHT
285+
pin_to_sibling_corner TOP_LEFT
286+
}
287+
288+
voiceMic9
289+
{
290+
ControlName ImagePanel
291+
wide 36
292+
tall 36
293+
visible 0
294+
image "ui/icon_mic_active"
295+
scaleImage 1
296+
zpos 900
297+
298+
pin_to_sibling voiceMic8
299+
pin_corner_to_sibling TOP_RIGHT
300+
pin_to_sibling_corner BOTTOM_RIGHT
301+
}
302+
voiceName9
303+
{
304+
ControlName Label
305+
wide 450
306+
tall 36
307+
visible 0
308+
font Default_21_ShadowGlow
309+
textAlignment east
310+
textinsetx 13
311+
zpos 900
312+
313+
pin_to_sibling voiceMic9
314+
pin_corner_to_sibling TOP_RIGHT
315+
pin_to_sibling_corner TOP_LEFT
316+
}
317+
}

‎Northstar.Client/mod/resource/ui/menus/colorsliders.menu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ resource/ui/menus/colorsliders.menu
2222
{
2323
ControlName RuiButton
2424
rui "ui/basic_image.rpak"
25-
25+
labelText ""
2626
wide %100
2727
tall %100
2828
bgcolor_override "0 0 0 255"
@@ -577,4 +577,4 @@ resource/ui/menus/colorsliders.menu
577577
pin_to_sibling_corner BOTTOM
578578
} -->
579579
}
580-
}
580+
}

0 commit comments

Comments
 (0)