teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41 from petr666/feature/menu-update 

Fix setting of HUD on initial startup, add HUD toggle to team arena
This commit is contained in:
Simon 2022-03-30 18:53:45 +01:00 committed by GitHub
parent bcf9287a85 4a5cdc47f6
commit 8c9b797a67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/app/src/main/assets/pakQ3Q.pk3
View File

Binary file not shown.

3
android/app/src/main/cpp/code/client/cl_main.c
View File

@ -3577,9 +3577,10 @@ void CL_Init( void ) {
cl_serverStatusResendTime = Cvar_Get ("cl_serverStatusResendTime", "750", 0);
// init autoswitch so the ui will have it correctly even
// init autoswitch and hud toggle so the ui will have it correctly even
// if the cgame hasn't been started
Cvar_Get ("cg_autoswitch", "1", CVAR_ARCHIVE);
Cvar_Get ("cg_drawStatus", "1", CVAR_ARCHIVE);
m_pitch = Cvar_Get ("m_pitch", "0.022", CVAR_ARCHIVE);
m_yaw = Cvar_Get ("m_yaw", "0.022", CVAR_ARCHIVE);

23
android/app/src/main/pakQ3Q/ui/ingame_options.menu
View File

@ -382,7 +382,7 @@ itemDef {
name options
group grpOptions
type ITEM_TYPE_MULTI
text "Statusbar:"
text "HUD Type:"
cvar "cg_hudfiles"
cvarStrList { Normal "ui/hud.txt" Small "ui/hud2.txt" }
rect 50 275 200 20
@ -398,8 +398,8 @@ itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Statusbar On Weapon Wheel:"
cvar "vr_weaponSelectorWithHud"
text "Draw HUD:"
cvar "cg_drawStatus"
rect 50 292 200 20
textalign ITEM_ALIGN_RIGHT
textalignx 143
@ -409,6 +409,21 @@ itemDef {
visible 1
}
itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Draw HUD On Weapon Wheel:"
cvar "vr_weaponSelectorWithHud"
rect 50 309 200 20
textalign ITEM_ALIGN_RIGHT
textalignx 143
textaligny 17
textscale .25
forecolor 1 1 1 1
visible 1
}
itemDef {
name options
group grpOptions
@ -416,7 +431,7 @@ itemDef {
type ITEM_TYPE_MULTI
cvar "vr_goreLevel"
cvarFloatList { "None" 0 "Blood Only" 1 "Blood & Gibs (Default)" 2 "Extra Gore (Performance Hit)" 3 }
rect 50 329 200 20
rect 50 339 200 20
textalign ITEM_ALIGN_RIGHT
textalignx 80
textaligny 17

23
android/app/src/main/pakQ3Q/ui/options.menu
View File

@ -263,7 +263,7 @@ itemDef {
name options
group grpOptions
type ITEM_TYPE_MULTI
text "Statusbar:"
text "HUD Type:"
cvar "cg_hudfiles"
cvarStrList { Normal "ui/hud.txt" Small "ui/hud2.txt" }
rect 99 315 256 20
@ -279,8 +279,8 @@ itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Statusbar On Weapon Wheel:"
cvar "vr_weaponSelectorWithHud"
text "Draw HUD:"
cvar "cg_drawStatus"
rect 99 335 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128
@ -290,6 +290,21 @@ itemDef {
visible 1
}
itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Draw HUD On Weapon Wheel:"
cvar "vr_weaponSelectorWithHud"
rect 99 355 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128
textaligny 20
textscale .3
forecolor 1 1 1 1
visible 1
}
itemDef {
name options
group grpOptions
@ -297,7 +312,7 @@ itemDef {
type ITEM_TYPE_MULTI
cvar "vr_goreLevel"
cvarFloatList { "None" 0 "Blood Only" 1 "Blood & Gibs (Default)" 2 "Extra Gore (Performance Hit)" 3 }
rect 99 375 256 20
rect 99 385 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 70
textaligny 20