Merge branch 'master' into multiview

Makefile

@@ -442,11 +442,8 @@ ifeq ($(PLATFORM),android)
     -fno-builtin-cos -fno-builtin-sin -fPIC -DARCH_STRING=\\\"$(ARCH)\\\"
   CLIENT_CFLAGS += $(SDL_CFLAGS) -DSDL_DISABLE_IMMINTRIN_H -fno-builtin-cos -fno-builtin-sin
 
-  # Flag -ffast-math replacement: https://pspdfkit.com/blog/2021/understanding-fast-math/
-  # Flags -ffp-contract=fast -fno-trapping-math are unused because they are causing lightmap issues
-  OPTIMIZEFASTMATH = -ffinite-math-only -fno-math-errno -fassociative-math -freciprocal-math -fno-signed-zeros
   OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
-  OPTIMIZE = $(OPTIMIZEVM) $(OPTIMIZEFASTMATH)
+  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 
   HAVE_VM_COMPILED = false
 

android/app/src/main/cpp/code/client/cl_main.c

@@ -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);

android/app/src/main/cpp/code/renderergl2/tr_glsl.c

@@ -336,11 +336,7 @@ static void GLSL_GetShaderHeader( GLenum shaderType, const GLchar *extra, char *
         Q_strcat(dest, size, "layout(num_views=NUM_VIEWS) in;\n");
     }
 
-    // HACK: use in main menu medium float precision (to prevent issue with missing models textures)
-    if (Cvar_Get("r_uiFullScreen", "1", 0)->integer)
-        Q_strcat(dest, size, "precision mediump float;\n");
-    else
-        Q_strcat(dest, size, "precision highp float;\n");
+	Q_strcat(dest, size, "precision mediump float;\n");
 
 	if(shaderType == GL_VERTEX_SHADER)
 	{

android/app/src/main/pakQ3Q/ui/ingame_options.menu

@@ -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

android/app/src/main/pakQ3Q/ui/options.menu

@@ -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