teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-10 14:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #50 from petr666/feature/various-fixes

Browse source 
Spectator mode fix and menu update
This commit is contained in:
Simon 2022-04-06 18:56:45 +01:00 committed by GitHub
commit edf4d37fe0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 131 additions and 101 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.

2
android/app/src/main/cpp/code/cgame/cg_view.c
View file

@ -672,7 +672,7 @@ static int CG_CalcViewValues( ) {
// intermission view // intermission view
static float hmdYaw = 0; static float hmdYaw = 0;
if ( (ps->pm_type == PM_INTERMISSION || ps->pm_type == PM_SPECTATOR) && !vr->virtual_screen ) { if ( ps->pm_type == PM_INTERMISSION ) {
VectorCopy( ps->origin, cg.refdef.vieworg ); VectorCopy( ps->origin, cg.refdef.vieworg );
static vec3_t mins = { -1, -1, -1 }; static vec3_t mins = { -1, -1, -1 };

2
android/app/src/main/cpp/code/q3_ui/ui_preferences.c
View file

@ -308,7 +308,7 @@ static void Preferences_MenuInit( void ) {
s_preferences.framer.width = 256; s_preferences.framer.width = 256;
s_preferences.framer.height = 334; s_preferences.framer.height = 334;
y = 110; y = 100;
s_preferences.crosshair.generic.type = MTYPE_SPINCONTROL; s_preferences.crosshair.generic.type = MTYPE_SPINCONTROL;
s_preferences.crosshair.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT|QMF_NODEFAULTINIT|QMF_OWNERDRAW; s_preferences.crosshair.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT|QMF_NODEFAULTINIT|QMF_OWNERDRAW;
s_preferences.crosshair.generic.x = PREFERENCES_X_POS; s_preferences.crosshair.generic.x = PREFERENCES_X_POS;

51
android/app/src/main/pakQ3Q/ui/ingame_options.menu
View file

@ -164,7 +164,7 @@ itemDef {
group grpOptions group grpOptions
text "Crosshair:" text "Crosshair:"
ownerdraw UI_CROSSHAIR ownerdraw UI_CROSSHAIR
rect 193 32 20 17 rect 193 20 20 17
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 0 textalignx 0
textaligny 17 textaligny 17
@ -179,7 +179,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Laser Sight:" text "Laser Sight:"
cvar "vr_lasersight" cvar "vr_lasersight"
rect 50 49 200 20 rect 50 37 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -193,7 +193,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Simple Items (World):" text "Simple Items (World):"
cvar "cg_simpleItems" cvar "cg_simpleItems"
rect 50 66 200 20 rect 50 54 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -208,7 +208,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Simple Items (Weapon Wheel):" text "Simple Items (Weapon Wheel):"
cvar "cg_weaponSelectorSimple2DIcons" cvar "cg_weaponSelectorSimple2DIcons"
rect 50 83 200 20 rect 50 71 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -223,7 +223,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Show Item In Hand:" text "Show Item In Hand:"
cvar "vr_showItemInHand" cvar "vr_showItemInHand"
rect 50 100 200 20 rect 50 88 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -238,7 +238,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Marks On Walls:" text "Marks On Walls:"
cvar "cg_marks" cvar "cg_marks"
rect 50 117 200 20 rect 50 105 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -253,7 +253,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Show Floating Scores:" text "Show Floating Scores:"
cvar "cg_scorePlums" cvar "cg_scorePlums"
rect 50 134 200 20 rect 50 122 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -269,7 +269,7 @@ itemDef {
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
cvar "cg_brassTime" cvar "cg_brassTime"
cvarFloatList { "High" 2500 "Med" 1250 "Off" 0 } cvarFloatList { "High" 2500 "Med" 1250 "Off" 0 }
rect 50 151 200 20 rect 50 139 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -284,7 +284,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Identify Target:" text "Identify Target:"
cvar "cg_drawCrosshairNames" cvar "cg_drawCrosshairNames"
rect 50 168 200 20 rect 50 156 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -299,7 +299,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Force Player Models:" text "Force Player Models:"
cvar "cg_forceModel" cvar "cg_forceModel"
rect 50 185 200 20 rect 50 173 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -313,7 +313,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Draw Team Overlay:" text "Draw Team Overlay:"
cvar "cg_drawTeamOverlay" cvar "cg_drawTeamOverlay"
rect 50 202 200 20 rect 50 190 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -327,7 +327,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Show Time:" text "Show Time:"
cvar "cg_drawTimer" cvar "cg_drawTimer"
rect 50 219 200 20 rect 50 207 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -341,7 +341,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Taunts Off:" text "Taunts Off:"
cvar "cg_noTaunt" cvar "cg_noTaunt"
rect 50 236 200 20 rect 50 224 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -355,7 +355,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "In Game Video:" text "In Game Video:"
cvar "r_inGameVideo" cvar "r_inGameVideo"
rect 50 253 200 20 rect 50 241 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -370,7 +370,7 @@ itemDef {
text "HUD Type:" text "HUD Type:"
cvar "cg_hudfiles" cvar "cg_hudfiles"
cvarStrList { Normal "ui/hud.txt" Small "ui/hud2.txt" } cvarStrList { Normal "ui/hud.txt" Small "ui/hud2.txt" }
rect 50 270 200 20 rect 50 258 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -386,7 +386,7 @@ itemDef {
text "HUD Mode:" text "HUD Mode:"
cvar "vr_hudDrawStatus" cvar "vr_hudDrawStatus"
cvarFloatList { "Off" 0 "Floating" 1 "Simple" 2 } cvarFloatList { "Off" 0 "Floating" 1 "Simple" 2 }
rect 50 287 200 20 rect 50 275 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -402,7 +402,22 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Draw HUD On Weapon Wheel:" text "Draw HUD On Weapon Wheel:"
cvar "vr_weaponSelectorWithHud" cvar "vr_weaponSelectorWithHud"
rect 50 304 200 20 rect 50 292 200 20
textalign ITEM_ALIGN_RIGHT
textalignx 143
textaligny 17
textscale .25
forecolor 1 1 1 1
visible 1
}
itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Show Console Messages:"
cvar "vr_showConsoleMessages"
rect 50 309 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 143 textalignx 143
textaligny 17 textaligny 17
@ -418,7 +433,7 @@ itemDef {
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
cvar "vr_goreLevel" cvar "vr_goreLevel"
cvarFloatList { "None" 0 "Blood Only" 1 "Blood & Gibs (Default)" 2 "Extra Gore (Performance Hit)" 3 } cvarFloatList { "None" 0 "Blood Only" 1 "Blood & Gibs (Default)" 2 "Extra Gore (Performance Hit)" 3 }
rect 50 334 200 20 rect 50 339 200 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 80 textalignx 80
textaligny 17 textaligny 17

47
android/app/src/main/pakQ3Q/ui/options.menu
View file

@ -38,7 +38,7 @@ itemDef {
name options name options
group grpOptions group grpOptions
text "Crosshair:" text "Crosshair:"
rect 227 35 20 20 rect 227 15 20 20
ownerdraw UI_CROSSHAIR ownerdraw UI_CROSSHAIR
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 0 textalignx 0
@ -54,7 +54,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Laser Sight:" text "Laser Sight:"
cvar "vr_lasersight" cvar "vr_lasersight"
rect 99 55 256 20 rect 99 35 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -69,7 +69,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Simple Items (World):" text "Simple Items (World):"
cvar "cg_simpleItems" cvar "cg_simpleItems"
rect 99 75 256 20 rect 99 55 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -84,7 +84,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Simple Items (Weapon Wheel):" text "Simple Items (Weapon Wheel):"
cvar "cg_weaponSelectorSimple2DIcons" cvar "cg_weaponSelectorSimple2DIcons"
rect 99 95 256 20 rect 99 75 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -99,7 +99,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Show Item In Hand:" text "Show Item In Hand:"
cvar "vr_showItemInHand" cvar "vr_showItemInHand"
rect 99 115 256 20 rect 99 95 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -114,7 +114,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Marks On Walls:" text "Marks On Walls:"
cvar "cg_marks" cvar "cg_marks"
rect 99 135 256 20 rect 99 115 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -129,7 +129,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Show Floating Scores:" text "Show Floating Scores:"
cvar "cg_scorePlums" cvar "cg_scorePlums"
rect 99 155 256 20 rect 99 135 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -145,7 +145,7 @@ itemDef {
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
cvar "cg_brassTime" cvar "cg_brassTime"
cvarFloatList { "High" 2500 "Med" 1250 "Off" 0 } cvarFloatList { "High" 2500 "Med" 1250 "Off" 0 }
rect 99 175 256 20 rect 99 155 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -160,7 +160,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Identify Target:" text "Identify Target:"
cvar "cg_drawCrosshairNames" cvar "cg_drawCrosshairNames"
rect 99 195 256 20 rect 99 175 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -175,7 +175,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Force Player Models:" text "Force Player Models:"
cvar "cg_forceModel" cvar "cg_forceModel"
rect 99 215 256 20 rect 99 195 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -190,7 +190,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Draw Team Overlay:" text "Draw Team Overlay:"
cvar "cg_drawTeamOverlay" cvar "cg_drawTeamOverlay"
rect 99 235 256 20 rect 99 215 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -205,7 +205,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Show Time:" text "Show Time:"
cvar "cg_drawTimer" cvar "cg_drawTimer"
rect 99 255 256 20 rect 99 235 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -220,7 +220,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Taunts Off:" text "Taunts Off:"
cvar "cg_noTaunt" cvar "cg_noTaunt"
rect 99 275 256 20 rect 99 255 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -235,7 +235,7 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "In Game Video:" text "In Game Video:"
cvar "r_inGameVideo" cvar "r_inGameVideo"
rect 99 295 256 20 rect 99 275 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -251,7 +251,7 @@ itemDef {
text "HUD Type:" text "HUD Type:"
cvar "cg_hudfiles" cvar "cg_hudfiles"
cvarStrList { Normal "ui/hud.txt" Small "ui/hud2.txt" } cvarStrList { Normal "ui/hud.txt" Small "ui/hud2.txt" }
rect 99 315 256 20 rect 99 295 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -267,7 +267,7 @@ itemDef {
text "HUD Mode:" text "HUD Mode:"
cvar "vr_hudDrawStatus" cvar "vr_hudDrawStatus"
cvarFloatList { "Off" 0 "Floating" 1 "Simple" 2 } cvarFloatList { "Off" 0 "Floating" 1 "Simple" 2 }
rect 99 335 256 20 rect 99 315 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128
textaligny 20 textaligny 20
@ -283,6 +283,21 @@ itemDef {
type ITEM_TYPE_YESNO type ITEM_TYPE_YESNO
text "Draw HUD On Weapon Wheel:" text "Draw HUD On Weapon Wheel:"
cvar "vr_weaponSelectorWithHud" cvar "vr_weaponSelectorWithHud"
rect 99 335 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128
textaligny 20
textscale .3
forecolor 1 1 1 1
visible 1
}
itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Show Console Messages:"
cvar "vr_showConsoleMessages"
rect 99 355 256 20 rect 99 355 256 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 128 textalignx 128