Small fix to allow loading of @MuadDib's locale file

and included the latest menu update from @MuadDib

Projects/Android/jni/OpenJK/code/ui/ui_main.cpp

@@ -2643,6 +2643,10 @@ void _UI_Init( qboolean inGameLoad )
 		if (!ui.SP_Register(va("menus%d",i), /*SP_REGISTER_REQUIRED|*/SP_REGISTER_MENU))
 			break;
 	}
+
+	//Our special VR locale file - tanks to @MuadDib!
+	ui.SP_Register("menus_vr", /*SP_REGISTER_REQUIRED|*/SP_REGISTER_MENU);
+
 #endif
 
 	uiInfo.inGameLoad = inGameLoad;

z_vr_assets/strip/menus_vr.sp

@@ -0,0 +1,496 @@
+VERSION 1
+CONFIG W:\bin\striped.cfg
+ID 100
+REFERENCE MENUS_VR
+DESCRIPTION "VR Menu Localizations"
+COUNT 98
+INDEX 0
+{
+   REFERENCE COMMON_CONTROLS_ITEM
+   TEXT_LANGUAGE1 "Common"
+}
+INDEX 1
+{
+   REFERENCE COMMON_CONTROLS_DESC
+   TEXT_LANGUAGE1 "Common controls configuration."
+}
+INDEX 2
+{
+   REFERENCE WEAPON_CONTROLS_DESC
+   TEXT_LANGUAGE1 "Weapon specific control configuration."
+}
+INDEX 3
+{
+   REFERENCE POWER_CONTROLS_DESC
+   TEXT_LANGUAGE1 "Force Power specific control configuration."
+}
+INDEX 4
+{
+   REFERENCE INVENTORY_CONTROLS_DESC
+   TEXT_LANGUAGE1 "Inventory specific control configuration."
+}
+INDEX 5
+{
+   REFERENCE COMFORT_CONTROLS_ITEM
+   TEXT_LANGUAGE1 "Comfort"
+}
+INDEX 6
+{
+   REFERENCE COMFORT_CONTROLS_DESC
+   TEXT_LANGUAGE1 "Configure comfort options."
+}
+INDEX 7
+{
+   REFERENCE MOVEMENT_SPEED_ITEM
+   TEXT_LANGUAGE1 "Movement Speed:"
+}
+INDEX 8
+{
+   REFERENCE MOVEMENT_SPEED_DESC
+   TEXT_LANGUAGE1 "Sets player movement speed."
+}
+INDEX 9
+{
+   REFERENCE DIRECTION_MODE_ITEM
+   TEXT_LANGUAGE1 "Direction Mode:"
+}
+INDEX 10
+{
+   REFERENCE DIRECTION_MODE_DESC
+   TEXT_LANGUAGE1 "Choose movement direction mode."
+}
+INDEX 11
+{
+   REFERENCE DIRECTION_MODE_CONTROLLER
+   TEXT_LANGUAGE1 "Off-hand Controller"
+}
+INDEX 12
+{
+   REFERENCE DIRECTION_MODE_HMD
+   TEXT_LANGUAGE1 "HMD"
+}
+INDEX 13
+{
+   REFERENCE SMOOTH_TURN_ITEM
+   TEXT_LANGUAGE1 "Smooth turn:"
+}
+INDEX 14
+{
+   REFERENCE SMOOTH_TURN_DESC
+   TEXT_LANGUAGE1 "Enables or disables smooth turning."
+}
+INDEX 15
+{
+   REFERENCE SMOOTH_TURN_3RD_PERSON
+   TEXT_LANGUAGE1 "3rd Person"
+}
+INDEX 16
+{
+   REFERENCE TURN_ANGLE_ITEM
+   TEXT_LANGUAGE1 "Turn Angle:"
+}
+INDEX 17
+{
+   REFERENCE TURN_ANGLE_DESC
+   TEXT_LANGUAGE1 "Degrees to turn when using snap turn / Speed of smooth turn."
+}
+INDEX 18
+{
+   REFERENCE TURN_ANGLE_30DEGREES
+   TEXT_LANGUAGE1 "30 Degrees"
+}
+INDEX 19
+{
+   REFERENCE TURN_ANGLE_45DEGREES
+   TEXT_LANGUAGE1 "45 Degrees"
+}
+INDEX 20
+{
+   REFERENCE TURN_ANGLE_90DEGREES
+   TEXT_LANGUAGE1 "90 Degrees"
+}
+INDEX 21
+{
+   REFERENCE SWITCH_STICKS_ITEM
+   TEXT_LANGUAGE1 "Switch Sticks:"
+}
+INDEX 22
+{
+   REFERENCE SWITCH_STICKS_DESC
+   TEXT_LANGUAGE1 "Switches left/right controller thubmsticks."
+}
+INDEX 23
+{
+   REFERENCE LEFT_HANDED_ITEM
+   TEXT_LANGUAGE1 "Left-Handed Mode:"
+}
+INDEX 24
+{
+   REFERENCE LEFT_HANDED_DESC
+   TEXT_LANGUAGE1 "Enables left-handed mode."
+}
+INDEX 25
+{
+   REFERENCE WEAPON_PITCH_ITEM
+   TEXT_LANGUAGE1 "Weapon Pitch:"
+}
+INDEX 26
+{
+   REFERENCE WEAPON_PITCH_DESC
+   TEXT_LANGUAGE1 "Sets aiming pitch of held weapon."
+}
+INDEX 27
+{
+   REFERENCE TWO_HANDED_ITEM
+   TEXT_LANGUAGE1 "Two-Handed Mode:"
+}
+INDEX 28
+{
+   REFERENCE TWO_HANDED_DESC
+   TEXT_LANGUAGE1 "Enables two-handed weapon handling."
+}
+INDEX 29
+{
+   REFERENCE GUN_STOCK_ITEM
+   TEXT_LANGUAGE1 "Virtual Gun Stock:"
+}
+INDEX 30
+{
+   REFERENCE GUN_STOCK_DESC
+   TEXT_LANGUAGE1 "Enables or disables virtual gun stock. Requires two-handed mode to be enabled."
+}
+INDEX 31
+{
+   REFERENCE FORCE_POWER_DIRECTION_ITEM
+   TEXT_LANGUAGE1 "Force Power Direction Hint:"
+}
+INDEX 32
+{
+   REFERENCE FORCE_POWER_DIRECTION_DESC
+   TEXT_LANGUAGE1 "Hint as to which direction a force power was fired."
+}
+INDEX 33
+{
+   REFERENCE FORCE_SPEED_FOV_ITEM
+   TEXT_LANGUAGE1 "Force Speed FOV Change:"
+}
+INDEX 34
+{
+   REFERENCE FORCE_SPEED_FOV_DESC
+   TEXT_LANGUAGE1 "Whether the FOV will be adjusted briefly when engaging Force Speed."
+}
+INDEX 35
+{
+   REFERENCE IMMERSIVE_CINEMATICS_ITEM
+   TEXT_LANGUAGE1 "Immersive Cinematics:"
+}
+INDEX 36
+{
+   REFERENCE IMMERSIVE_CINEMATICS_DESC
+   TEXT_LANGUAGE1 "Enables or disables immersive cinematics."
+}
+INDEX 37
+{
+   REFERENCE SCREEN_DISTANCE_ITEM
+   TEXT_LANGUAGE1 "Menu Screen Distance:"
+}
+INDEX 38
+{
+   REFERENCE SCREEN_DISTANCE_DESC
+   TEXT_LANGUAGE1 "Select menu screen distance."
+}
+INDEX 39
+{
+   REFERENCE SCREEN_DISTANCE_NEAR
+   TEXT_LANGUAGE1 "Near"
+}
+INDEX 40
+{
+   REFERENCE SCREEN_DISTANCE_MEDIUM
+   TEXT_LANGUAGE1 "Medium"
+}
+INDEX 41
+{
+   REFERENCE SCREEN_DISTANCE_FAR
+   TEXT_LANGUAGE1 "Far"
+}
+INDEX 42
+{
+   REFERENCE HEIGHT_ADJUST_ITEM
+   TEXT_LANGUAGE1 "Height Adjust:"
+}
+INDEX 43
+{
+   REFERENCE HEIGHT_ADJUST_DESC
+   TEXT_LANGUAGE1 "Adjusts your in-game height."
+}
+INDEX 44
+{
+   REFERENCE DIFFICULTY_SETUP_ITEM
+   TEXT_LANGUAGE1 "Difficulty"
+}
+INDEX 45
+{
+   REFERENCE DIFFICULTY_SETUP_DESC
+   TEXT_LANGUAGE1 "Various gameplay difficulty tweaks."
+}
+INDEX 46
+{
+   REFERENCE MODEL_DISMEMBERMENT_DISABLED
+   TEXT_LANGUAGE1 "Disabled"
+}
+INDEX 47
+{
+   REFERENCE MODEL_DISMEMBERMENT_MILD
+   TEXT_LANGUAGE1 "Mild"
+}
+INDEX 48
+{
+   REFERENCE MODEL_DISMEMBERMENT_BEARABLE
+   TEXT_LANGUAGE1 "Bearable"
+}
+INDEX 49
+{
+   REFERENCE MODEL_DISMEMBERMENT_UNSETTLING
+   TEXT_LANGUAGE1 "Unsettling"
+}
+INDEX 50
+{
+   REFERENCE DISMEMBERMENT_PROBABILITY_OFTEN
+   TEXT_LANGUAGE1 "Often"
+}
+INDEX 51
+{
+   REFERENCE DISMEMBERMENT_PROBABILITY_ALWAYS
+   TEXT_LANGUAGE1 "Always"
+}
+INDEX 52
+{
+   REFERENCE LASER_AUTODEFLECTING_ITEM
+   TEXT_LANGUAGE1 "Laser Auto Deflecting:"
+}
+INDEX 53
+{
+   REFERENCE LASER_AUTODEFLECTING_DESC
+   TEXT_LANGUAGE1 "Enables or disables 1st person auto deflecting of lasers with lightsabers."
+}
+INDEX 54
+{
+   REFERENCE SABER_AUTOBLOCKING_ITEM
+   TEXT_LANGUAGE1 "Lightsaber Auto Blocking:"
+}
+INDEX 55
+{
+   REFERENCE SABER_AUTOBLOCKING_DESC
+   TEXT_LANGUAGE1 "Enables or disables auto blocking of enemy lightsaber."
+}
+INDEX 56
+{
+   REFERENCE SABER_REALISM_ITEM
+   TEXT_LANGUAGE1 "Lightsaber Realism:"
+}
+INDEX 57
+{
+   REFERENCE SABER_REALISM_DESC
+   TEXT_LANGUAGE1 "Choose effectivity of lightsaber. Affects lightsaber duels difficulty mostly."
+}
+INDEX 58
+{
+   REFERENCE SABER_REALISM_DEFAULT
+   TEXT_LANGUAGE1 "Default"
+}
+INDEX 59
+{
+   REFERENCE SABER_REALISM_INCREASED
+   TEXT_LANGUAGE1 "Increased Damage"
+}
+INDEX 60
+{
+   REFERENCE SABER_REALISM_CRITICAL
+   TEXT_LANGUAGE1 "Fatal Critical Hit"
+}
+INDEX 61
+{
+   REFERENCE SABER_REALISM_INSTANT
+   TEXT_LANGUAGE1 "Instant Kill"
+}
+INDEX 62
+{
+   REFERENCE FENCING_SPEED_ITEM
+   TEXT_LANGUAGE1 "Enemy Fencing Speed:"
+}
+INDEX 63
+{
+   REFERENCE FENCING_SPEED_DESC
+   TEXT_LANGUAGE1 "Choose fencing swiftness of enemies. Affects lightsaber duels difficulty."
+}
+INDEX 64
+{
+   REFERENCE FENCING_SPEED_SLOWER
+   TEXT_LANGUAGE1 "Slower"
+}
+INDEX 65
+{
+   REFERENCE FENCING_SPEED_DEFAULT
+   TEXT_LANGUAGE1 "Default"
+}
+INDEX 66
+{
+   REFERENCE FENCING_SPEED_FASTER
+   TEXT_LANGUAGE1 "Faster"
+}
+INDEX 67
+{
+   REFERENCE GAME_DIFFICULTY_ITEM
+   TEXT_LANGUAGE1 "Game Difficulty:"
+}
+INDEX 68
+{
+   REFERENCE GAME_DIFFICULTY_DESC
+   TEXT_LANGUAGE1 "Change game difficulty."
+}
+INDEX 69
+{
+   REFERENCE CHEATS_TITLE
+   TEXT_LANGUAGE1 "May the force be with you..."
+}
+INDEX 70
+{
+   REFERENCE CHEATS_GIVE_HEALTH_ITEM
+   TEXT_LANGUAGE1 "Replenish Health"
+}
+INDEX 71
+{
+   REFERENCE CHEATS_GIVE_HEALTH_DESC
+   TEXT_LANGUAGE1 "Replenishes health."
+}
+INDEX 72
+{
+   REFERENCE CHEATS_GIVE_ARMOR_ITEM
+   TEXT_LANGUAGE1 "Replenish Armor"
+}
+INDEX 73
+{
+   REFERENCE CHEATS_GIVE_ARMOR_DESC
+   TEXT_LANGUAGE1 "Replenishes armor."
+}
+INDEX 74
+{
+   REFERENCE CHEATS_GIVE_AMMO_ITEM
+   TEXT_LANGUAGE1 "Replenish Ammo"
+}
+INDEX 75
+{
+   REFERENCE CHEATS_GIVE_AMMO_DESC
+   TEXT_LANGUAGE1 "Replenishes ammunition."
+}
+INDEX 76
+{
+   REFERENCE CHEATS_GIVE_BATTERIES_ITEM
+   TEXT_LANGUAGE1 "Replenish Batteries"
+}
+INDEX 77
+{
+   REFERENCE CHEATS_GIVE_BATTERIES_DESC
+   TEXT_LANGUAGE1 "Replenishes batteries."
+}
+INDEX 78
+{
+   REFERENCE CHEATS_GIVE_SABER_ITEM
+   TEXT_LANGUAGE1 "Give Lightsaber"
+}
+INDEX 79
+{
+   REFERENCE CHEATS_GIVE_SABER_DESC
+   TEXT_LANGUAGE1 "Gives only lighsaber."
+}
+INDEX 80
+{
+   REFERENCE CHEATS_GIVE_WEAPONS_ITEM
+   TEXT_LANGUAGE1 "Give All Weapons"
+}
+INDEX 81
+{
+   REFERENCE CHEATS_GIVE_WEAPONS_DESC
+   TEXT_LANGUAGE1 "Gives all weapons."
+}
+INDEX 82
+{
+   REFERENCE CHEATS_GIVE_ITEMS_ITEM
+   TEXT_LANGUAGE1 "Give All Items"
+}
+INDEX 83
+{
+   REFERENCE CHEATS_GIVE_ITEMS_DESC
+   TEXT_LANGUAGE1 "Gives all inventory items."
+}
+INDEX 84
+{
+   REFERENCE CHEATS_GIVE_POWERS_ITEM
+   TEXT_LANGUAGE1 "Unlock All Powers"
+}
+INDEX 85
+{
+   REFERENCE CHEATS_GIVE_POWERS_DESC
+   TEXT_LANGUAGE1 "Unlocks all force powers."
+}
+INDEX 86
+{
+   REFERENCE CHEATS_SABER_COLOR_TITLE
+   TEXT_LANGUAGE1 "Lightsaber Color:"
+}
+INDEX 87
+{
+   REFERENCE CHEATS_SABER_COLOR_BLUE_ITEM
+   TEXT_LANGUAGE1 "Blue"
+}
+INDEX 88
+{
+   REFERENCE CHEATS_SABER_COLOR_BLUE_DESC
+   TEXT_LANGUAGE1 "Use blue lightsaber."
+}
+INDEX 89
+{
+   REFERENCE CHEATS_SABER_COLOR_GREEN_ITEM
+   TEXT_LANGUAGE1 "Green"
+}
+INDEX 90
+{
+   REFERENCE CHEATS_SABER_COLOR_GREEN_DESC
+   TEXT_LANGUAGE1 "Use green lightsaber."
+}
+INDEX 91
+{
+   REFERENCE CHEATS_SABER_COLOR_RED_ITEM
+   TEXT_LANGUAGE1 "Red"
+}
+INDEX 92
+{
+   REFERENCE CHEATS_SABER_COLOR_RED_DESC
+   TEXT_LANGUAGE1 "Use red lightsaber."
+}
+INDEX 93
+{
+   REFERENCE CHEATS_SABER_COLOR_ORANGE_ITEM
+   TEXT_LANGUAGE1 "Orange"
+}
+INDEX 94
+{
+   REFERENCE CHEATS_SABER_COLOR_ORANGE_DESC
+   TEXT_LANGUAGE1 "Use orange lightsaber."
+}
+INDEX 95
+{
+   REFERENCE CHEATS_SABER_COLOR_PURPLE_ITEM
+   TEXT_LANGUAGE1 "Purple"
+}
+INDEX 96
+{
+   REFERENCE CHEATS_SABER_COLOR_PURPLE_DESC
+   TEXT_LANGUAGE1 "Use purple lightsaber."
+}
+INDEX 97
+{
+   REFERENCE CHEATS_ITEM
+   TEXT_LANGUAGE1 "CHEATS"
+}

z_vr_assets/ui/controls.menu

@@ -69,6 +69,8 @@
 			forecolor			0.8 0.8 0.8 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 
@@ -83,6 +85,8 @@
 			forecolor			1 1 1 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		// The saber halo on the left
@@ -96,6 +100,8 @@
 			forecolor			0.5 0.5 0.5 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef
@@ -112,6 +118,8 @@
 //			model_origin		100 100 100
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		// The saber halo on the left
@@ -125,6 +133,82 @@
 			forecolor			0.25 0.25 0.25 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+
+		// Expanded menu shaders
+		// Sun red
+		itemDef
+		{
+			name				sun
+			group				none
+			rect				-40 145 300 300
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2r"
+			forecolor			0.7 0.7 0.7 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		// Sun halo
+		itemDef
+		{
+			name				sun_halo
+			group				none
+			rect				-95 100 400 400
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2br"
+			forecolor			0.3 0.3 0.3 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		// Long sunflare
+		itemDef
+		{
+			name				sunflares
+			group				none
+			rect				-235 -60 700 700
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2br"
+			forecolor			0.3 0.3 0.3 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+
+		// Expanded Menu Background Video
+		itemDef
+		{
+			name				background_video
+			group				none
+			rect				0 -100 640 680
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/expanded_menu_video_2"
+			forecolor			1 1 1 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_video
+			showCvar			{ 1 }
+		}
+
+		// Expanded Menu Starwars Logo
+		itemDef
+		{
+			name				star_wars
+			group				none
+			rect				272 10 365 95
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/expanded_menu_logo"
+			forecolor			1 1 1 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 		//----------------------------------------------------------------------------------------------
@@ -144,6 +228,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -163,6 +249,8 @@
 			textalignx			65
 			forecolor			0.64 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter 
 			{ 
@@ -191,6 +279,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -210,6 +300,8 @@
 			textalignx			65
 			forecolor			0.64 0.65 1 1
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter 
 			{ 
@@ -238,6 +330,8 @@
 			forecolor			1 1 1 1
 			visible				0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef {
@@ -258,6 +352,9 @@
 			forecolor			1 1 1 1
 			visible				1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+			
 			action 
 			{ 
 				play			sound/interface/button1 
@@ -284,6 +381,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef {
@@ -303,6 +402,8 @@
 			backcolor			0 0 0 0
 			forecolor			0.64 0.65 1 1
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 			 
 			mouseEnter 
 			{ 
@@ -330,6 +431,8 @@
 			forecolor			1 1 1 1
 			visible				1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 
@@ -385,6 +488,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -404,6 +509,8 @@
 			textaligny			-1
 			forecolor			0.65 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter 
 			{ 
@@ -421,6 +528,62 @@
 			}
 		}
 
+		// Expanded Menu Back Button
+		itemDef
+		{
+			name				back_menu_button_hover
+			group				highlights
+			rect				585 445 50 15
+			style				WINDOW_STYLE_SHADER
+			textalign			ITEM_ALIGN_RIGHT
+			background			"gfx/menus/expanded_menu_buttonback"
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+
+		itemDef
+		{
+			name				back_menu_button
+			group				none
+			rect				585 445 50 15
+			text				@MENUS0_BACK
+			descText			@MENUS0_BACKUP_ONE_MENU
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			49
+			textaligny			0
+			textscale			0.53
+			textstyle			3
+			font				3
+			forecolor			0.65 0.65 1 1
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+
+				hide			highlights
+
+				close			all
+				open			mainbackMenu
+			}
+
+			mouseEnter
+			{
+				show			back_menu_button_hover
+			}
+			mouseExit
+			{
+				hide			back_menu_button_hover
+			}
+		}
+
 		//----------------------------------------------------------------------------------------------
 		//
 		//	SECOND ROW MENU BUTTONS
@@ -434,15 +597,36 @@
 			style				WINDOW_STYLE_SHADER
 			background			"gfx/menus/menu_blendbox"
 			text				@MENUS1_CONFIGURE_CONTROLS
-      			rect				150 145 450 16
+			rect				150 145 450 16
 			font				3
 			textscale			0.7
 			textalign			ITEM_ALIGN_CENTER		
 			textalignx			225
 			textaligny			-2
 			forecolor			1 1 1 1
-      			visible			1 
-  	    		decoration 
+			visible			1 
+			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+		itemDef 
+		{
+			name				control_title
+			group				none
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/expanded_menu_box"
+			text				@MENUS1_CONFIGURE_CONTROLS
+			rect				120 145 486 16
+			font				3
+			textscale			0.7
+			textalign			ITEM_ALIGN_CENTER		
+			textalignx			241
+			textaligny			-1
+			forecolor			1 1 1 1
+			visible			1 
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 		// Common  button
@@ -462,7 +646,7 @@
 		{
 			name				commoncontrolbutton
 			group				none
-			text				"Common"
+			text				@MENUS_VR_COMMON_CONTROLS_ITEM
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
 			rect				120 173 170 30
@@ -474,7 +658,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Common controls configuration."
+			descText			@MENUS_VR_COMMON_CONTROLS_DESC
 
 			mouseEnter 
 			{ 
@@ -530,7 +714,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Weapon specific control configuration."
+			descText			@MENUS_VR_WEAPON_CONTROLS_DESC
 
 			mouseEnter 
 			{ 
@@ -586,7 +770,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Force Power specific control configuration."
+			descText			@MENUS_VR_POWER_CONTROLS_DESC
 
 			mouseEnter 
 			{ 
@@ -642,7 +826,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Inventory specific control configuration."
+			descText			@MENUS_VR_POWER_CONTROLS_DESC
 
 			mouseEnter 
 			{ 
@@ -686,7 +870,7 @@
 		{
 			name				comfortcontrolbutton
 			group				none
-			text				"Comfort"
+			text				@MENUS_VR_COMFORT_CONTROLS_ITEM
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
 			rect				120 293 170 30
@@ -698,7 +882,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Configure comfort options."
+			descText			@MENUS_VR_COMFORT_CONTROLS_DESC
 
 			mouseEnter 
 			{ 
@@ -735,6 +919,35 @@
 			forecolor			1 1 1 1
 			visible				0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+
+		itemDef 
+		{
+			name				setup_background
+			group				none
+			style				WINDOW_STYLE_SHADER
+			rect				300 166 306 250	
+			background			"gfx/menus/expanded_menu_box"					// Frame
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		itemDef 
+		{
+			name				setup_background
+			group				none
+			style				WINDOW_STYLE_SHADER
+			rect				120 166 175 250	
+			background			"gfx/menus/expanded_menu_box"					// Frame
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 		//----------------------------------------------------------------------------------------------
@@ -898,7 +1111,7 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_SLIDER
-			text				"Movement Speed:"
+			text				@MENUS_VR_MOVEMENT_SPEED_ITEM
 			cvarfloat		"vr_movement_multiplier" 0.1 0.4 1.2
 			rect				305 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -909,7 +1122,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"Sets player movement speed."
+			descText			@MENUS_VR_MOVEMENT_SPEED_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -931,12 +1144,12 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_MULTI
-			text				"Direction Mode:"
+			text				@MENUS_VR_DIRECTION_MODE_ITEM
 			cvar				"vr_walkdirection"
 			cvarFloatList		
 			{ 
-				"Off-hand Controller" 0  
-				"HMD" 1 
+				@MENUS_VR_DIRECTION_MODE_CONTROLLER 0  
+				@MENUS_VR_DIRECTION_MODE_HMD 1 
 			}
 			rect				305 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -947,7 +1160,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"Choose movement direction mode."
+			descText			@MENUS_VR_DIRECTION_MODE_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -969,9 +1182,15 @@
 		{
 			name				none
 			group				commoncontrols
-			type				ITEM_TYPE_YESNO
-			text				"Smooth turn:"
+			type				ITEM_TYPE_MULTI
+			text				@MENUS_VR_SMOOTH_TURN_ITEM
 			cvar				"vr_turn_mode"
+			cvarFloatList		
+			{ 
+				@MENUS0_NO 0
+				@MENUS_VR_SMOOTH_TURN_3RD_PERSON 1
+				@MENUS0_YES 2
+			}
 			rect				305 231 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151 
@@ -981,7 +1200,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		3
-			descText			"Enables or disables smooth turning."
+			descText			@MENUS_VR_SMOOTH_TURN_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1002,13 +1221,13 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_MULTI
-			text				"Turn Angle:"
+			text				@MENUS_VR_TURN_ANGLE_ITEM
 			cvar				"vr_turn_angle"
 			cvarFloatList		
 			{ 
-				"30 Degrees" 30  
-				"45 Degrees" 45
-				"90 Degrees" 90
+				@MENUS_VR_TURN_ANGLE_30DEGREES 30  
+				@MENUS_VR_TURN_ANGLE_45DEGREES 45
+				@MENUS_VR_TURN_ANGLE_90DEGREES 90
 			}
 			rect				305 251 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1019,7 +1238,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		4
-			descText			"Degrees to turn when using snap turn / Speed of smooth turn"
+			descText			@MENUS_VR_TURN_ANGLE_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1040,7 +1259,7 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_YESNO
-			text				"Switch Sticks:"
+			text				@MENUS_VR_SWITCH_STICKS_ITEM
 			cvar				"vr_switch_sticks"
 			rect				305 271 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1051,7 +1270,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		5
-			descText			"Switches left/gight controller thubmsticks."
+			descText			@MENUS_VR_SWITCH_STICKS_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1072,12 +1291,12 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_MULTI
-			text				"Left-Handed Mode:"
+			text				@MENUS_VR_LEFT_HANDED_ITEM
 			cvar				"vr_control_scheme"
 			cvarFloatList		
 			{ 
-				"No" 0
-				"Yes" 10
+				@MENUS0_NO 0
+				@MENUS0_YES 10
 			}
 			rect				305 291 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1088,7 +1307,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		5
-			descText			"Enables left-handed mode."
+			descText			@MENUS_VR_LEFT_HANDED_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1156,7 +1375,7 @@
 			name				none
 			group				weaponcontrols
 			type				ITEM_TYPE_SLIDER
-			text				"Weapon Pitch:"
+			text				@MENUS_VR_WEAPON_PITCH_ITEM
 			cvarfloat			"vr_weapon_pitchadjust" 5 -25 5
 			rect				305 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1167,7 +1386,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
-			descText			"Sets aiming pitch of held weapon."
+			descText			@MENUS_VR_WEAPON_PITCH_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1190,7 +1409,7 @@
 			name				none
 			group				weaponcontrols
 			type				ITEM_TYPE_YESNO
-			text				"Two-Handed Mode:"
+			text				@MENUS_VR_TWO_HANDED_ITEM
 			cvar			"vr_two_handed_weapons"
 			rect				305 231 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1201,7 +1420,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
-			descText			"Enables two-handed weapon handling."
+			descText			@MENUS_VR_TWO_HANDED_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1224,7 +1443,7 @@
 			name				none
 			group				weaponcontrols
 			type				ITEM_TYPE_YESNO
-			text				"Virtual Gun Stock:"
+			text				@MENUS_VR_GUN_STOCK_ITEM
 			cvar			"vr_virtual_stock"
 			rect				305 251 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1235,7 +1454,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
-			descText			"Enables or disables virtual gun stock. Requires two-handed mode to be enabled."
+			descText			@MENUS_VR_GUN_STOCK_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1253,40 +1472,6 @@
 
 		}
 
-		itemDef 
-		{
-			name				none
-			group				weaponcontrols
-			type				ITEM_TYPE_YESNO
-			text				"Saber Auto Blocking:"
-			cvar			"g_saberAutoblocking"
-			rect				305 271 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0 
-			// appearance_slot		2
-			descText			"Enables or disables auto blocking with saber."
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-
-			mouseenter 
-			{ 
-				show			highlight6
-			}
-
-			mouseexit 
-			{ 
-				hide			highlight6
-			}			
-
-		}
-
 
 
 		//----------------------------------------------------------------------------------------------
@@ -1294,14 +1479,12 @@
 		//	FORCE MENU
 		//
 		//----------------------------------------------------------------------------------------------
-		
-
 		itemDef 
 		{
 			name				none
 			group				forcecontrols
 			type				ITEM_TYPE_YESNO
-			text				"Force Power Direction Hint:"
+			text				@MENUS_VR_FORCE_POWER_DIRECTION_ITEM
 			cvar				"cg_showForcePowerDirection"
 			rect				340 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1312,7 +1495,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
-			descText			"Hint as to which direction a force power was fired."
+			descText			@MENUS_VR_FORCE_POWER_DIRECTION_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1335,7 +1518,7 @@
 			name				none
 			group				forcecontrols
 			type				ITEM_TYPE_YESNO
-			text				"Force Speed FOV Change:"
+			text				@MENUS_VR_FORCE_SPEED_FOV_ITEM
 			cvar				"cg_forceSpeedFOVAdjust"
 			rect				340 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1346,7 +1529,7 @@
 			forecolor			1 1 1 1
 			visible				0 
 			// appearance_slot		2
-			descText			"Whether the FOV will be adjusted briefly when engaging Force Speed."
+			descText			@MENUS_VR_FORCE_SPEED_FOV_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1415,7 +1598,7 @@
 			name				none
 			group				comfortcontrols
 			type				ITEM_TYPE_YESNO
-			text				"Immersive Cinematics:"
+			text				@MENUS_VR_IMMERSIVE_CINEMATICS_ITEM
 			cvar				"vr_immersive_cinematics"
 			rect				305 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1426,7 +1609,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"Enables or disables immersive cinematics."
+			descText			@MENUS_VR_IMMERSIVE_CINEMATICS_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1448,13 +1631,13 @@
 			name				none
 			group				comfortcontrols
 			type				ITEM_TYPE_MULTI
-			text				"Menu Screen Distance:"
+			text				@MENUS_VR_SCREEN_DISTANCE_ITEM
 			cvar				"vr_screen_dist"
 			cvarFloatList		
 			{ 
-				"Near" 1.5  
-				"Medium" 2.5
-				"Far" 3.5
+				@MENUS_VR_SCREEN_DISTANCE_NEAR 1.5  
+				@MENUS_VR_SCREEN_DISTANCE_MEDIUM 2.5
+				@MENUS_VR_SCREEN_DISTANCE_FAR 3.5
 			}
 			rect				305 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1465,7 +1648,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"Select menu screen distance."
+			descText			@MENUS_VR_SCREEN_DISTANCE_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1482,6 +1665,39 @@
 			}			
 		}
 
+		itemDef 
+		{
+			name				none
+			group				comfortcontrols
+			type				ITEM_TYPE_SLIDER
+			text				@MENUS_VR_HEIGHT_ADJUST_ITEM
+			cvarfloat 	"cg_heightAdjust" 0.2 0 1
+			rect				305 231 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS_VR_HEIGHT_ADJUST_DESC
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+		
+			mouseenter 
+			{ 
+				show			highlight4
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight4
+			}			
+		}
+
 
 
 		//----------------------------------------------------------------------------------------------

z_vr_assets/ui/datapadcheats.menu

@@ -74,7 +74,7 @@
 			rect				0 0 640 480
 			forecolor			1 1 1 1
 			visible				1
-			decoration		1
+			decoration
 			background		"gfx/hud/datapad2"
 		}
 
@@ -90,7 +90,7 @@
 			group				none
 			style				WINDOW_STYLE_EMPTY
 			rect				0 30 640 25
-			text				"May the force be with you..."
+			text				@MENUS_VR_CHEATS_TITLE
 			font				2
 			textscale			1
 			textalignx			320
@@ -98,7 +98,7 @@
 			forecolor			.509 .609 .847 1
 			appearance_slot		1		
 			visible				1
-			decoration 		1
+			decoration
 		}
 
 		itemDef 
@@ -108,8 +108,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				100 80 200 20
-			text				"Replenish Health"
-			descText		"Replenishes health."
+			text				@MENUS_VR_CHEATS_GIVE_HEALTH_ITEM
+			descText		@MENUS_VR_CHEATS_GIVE_HEALTH_DESC
 			font				2
 			textscale			1
 			textalignx			100
@@ -132,8 +132,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				100 105 200 20
-			text				"Replenish Armor"
-			descText		"Replenishes armor."
+			text				@MENUS_VR_CHEATS_GIVE_ARMOR_ITEM
+			descText		@MENUS_VR_CHEATS_GIVE_ARMOR_DESC
 			font				2
 			textscale			1
 			textalignx			100
@@ -156,8 +156,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				100 130 200 20
-			text				"Replenish Ammo"
-			descText		"Replenishes ammunition."
+			text				@MENUS_VR_CHEATS_GIVE_AMMO_ITEM
+			descText		@MENUS_VR_CHEATS_GIVE_AMMO_DESC
 			font				2
 			textscale			1
 			textalignx			100
@@ -180,8 +180,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				100 155 200 20
-			text				"Replenish Batteries"
-			descText		"Replenishes batteries."
+			text				@MENUS_VR_CHEATS_GIVE_BATTERIES_ITEM
+			descText		@MENUS_VR_CHEATS_GIVE_BATTERIES_DESC
 			font				2
 			textscale			1
 			textalignx			100
@@ -204,8 +204,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				340 80 200 20
-			text				"Give Lightsaber"
-			descText		"Gives only lighsaber."
+			text				@MENUS_VR_CHEATS_GIVE_SABER_ITEM
+			descText		@MENUS_VR_CHEATS_GIVE_SABER_DESC
 			font				2
 			textscale			1
 			textalignx			100
@@ -228,8 +228,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				340 105 200 20
-			text				"Give All Weapons"
-			descText		"Gives all weapons."
+			text				@MENUS_VR_CHEATS_GIVE_WEAPONS_ITEM
+			descText		@MENUS_VR_CHEATS_GIVE_WEAPONS_DESC
 			font				2
 			textscale			1
 			textalignx			100
@@ -252,8 +252,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				340 130 200 20
-			text				"Give All Items"
-			descText		"Gives all inventory items."
+			text				@MENUS_VR_CHEATS_GIVE_ITEMS_ITEM
+			descText		@MENUS_VR_CHEATS_GIVE_ITEMS_DESC
 			font				2
 			textscale			1
 			textalignx			100
@@ -276,8 +276,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				340 155 200 20
-			text				"Unlock All Powers"
-			descText		"Unlocks all force powers."
+			text				@MENUS_VR_CHEATS_GIVE_POWERS_ITEM
+			descText		@MENUS_VR_CHEATS_GIVE_POWERS_DESC
 			font				2
 			textscale			1
 			textalignx			100
@@ -299,7 +299,7 @@
 			group				none
 			style				WINDOW_STYLE_EMPTY
 			rect				220 210 200 20
-			text				"Lightsaber Color:"
+			text				@MENUS_VR_CHEATS_SABER_COLOR_TITLE
 			font				2
 			textscale			1
 			textalignx			100
@@ -307,7 +307,7 @@
 			forecolor			.509 .609 .847 1
 			appearance_slot		1		
 			visible				1
-			decoration		1
+			decoration
 		}
 
 		itemDef 
@@ -317,8 +317,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				190 235 50 20
-			text				"Blue"
-			descText		"Use blue lightsaber."
+			text				@MENUS_VR_CHEATS_SABER_COLOR_BLUE_ITEM
+			descText		@MENUS_VR_CHEATS_SABER_COLOR_BLUE_DESC
 			font				2
 			textscale			1
 			textalignx			25
@@ -341,8 +341,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				240 235 48 20
-			text				"Green"
-			descText		"Use green lightsaber."
+			text				@MENUS_VR_CHEATS_SABER_COLOR_GREEN_ITEM
+			descText		@MENUS_VR_CHEATS_SABER_COLOR_GREEN_DESC
 			font				2
 			textscale			1
 			textalignx			25
@@ -365,8 +365,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				288 235 50 20
-			text				"Red"
-			descText		"Use red lightsaber."
+			text				@MENUS_VR_CHEATS_SABER_COLOR_RED_ITEM
+			descText		@MENUS_VR_CHEATS_SABER_COLOR_RED_DESC
 			font				2
 			textscale			1
 			textalignx			25
@@ -389,8 +389,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				340 235 50 20
-			text				"Orange"
-			descText		"Use orange lightsaber."
+			text				@MENUS_VR_CHEATS_SABER_COLOR_ORANGE_ITEM
+			descText		@MENUS_VR_CHEATS_SABER_COLOR_ORANGE_DESC
 			font				2
 			textscale			1
 			textalignx			25
@@ -413,8 +413,8 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				400 235 50 20
-			text				"Purple"
-			descText		"Use purple lightsaber."
+			text				@MENUS_VR_CHEATS_SABER_COLOR_PURPLE_ITEM
+			descText		@MENUS_VR_CHEATS_SABER_COLOR_PURPLE_DESC
 			font				2
 			textscale			1
 			textalignx			25
@@ -567,7 +567,7 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				274 382 95 25
-			text				"CHEATS"
+			text				@MENUS_VR_CHEATS_ITEM
 			font				2
 			textscale			1
 			textalignx			48
@@ -575,7 +575,7 @@
 			forecolor			.509 .609 .847 1
 			appearance_slot		1		
 			visible				1
-			decoration	1
+			decoration
 		}
 
 	}

z_vr_assets/ui/datapadmission.menu

@@ -58,7 +58,7 @@
 
 		//----------------------------------------------------------------------------------------------
 		//
-		//	LOWER MENU BUTTONS
+		//	LOWER MENU BUTTONS FOR STANDARD MENU
 		//
 		//----------------------------------------------------------------------------------------------
 
@@ -78,6 +78,8 @@
 			forecolor			.509 .609 .847 1
 			appearance_slot		1		
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			action 
 			{ 
@@ -101,6 +103,8 @@
 			forecolor			.509 .609 .847 1
 			appearance_slot		1		
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			action 
 			{ 
@@ -125,6 +129,8 @@
 			forecolor			.509 .609 .847 1
 			appearance_slot		1		
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			action 
 			{ 
@@ -151,6 +157,8 @@
 			forecolor			.509 .609 .847 1
 			appearance_slot		1		
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			action 
 			{ 
@@ -176,6 +184,8 @@
 			forecolor			.509 .609 .847 1
 			appearance_slot		1		
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			action 
 			{ 
@@ -192,8 +202,6 @@
 			style				WINDOW_STYLE_EMPTY
 			type				ITEM_TYPE_BUTTON
 			rect				274 382 95 25
-			//text				"CHEATS"
-			//descText			"Bla Bla"
 			font				2
 			textscale			1
 			textalignx			48
@@ -201,6 +209,8 @@
 			forecolor			.509 .609 .847 1
 			appearance_slot		1		
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			action
 			{
@@ -209,6 +219,266 @@
 			}
 		}
 
+		//----------------------------------------------------------------------------------------------
+		//
+		//	LOWER MENU BUTTONS FOR EXTENDED MENU
+		//
+		//----------------------------------------------------------------------------------------------
+
+		itemDef 
+		{
+			name				mission
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				130 379 0 0
+			text				@MENUS1_DP_MISSION
+			descText			@MENUS1_AN_OVERVIEW_OF_MISSION
+			font				2
+			textscale			0.8
+			textalignx			48
+			textaligny			5
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+			}
+		}
+
+		itemDef 
+		{
+			name				exit
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				274 416 95 25
+			text				@MENUS1_RESUME
+			descText			@MENUS1_RETURN_TO_GAME
+			font				2
+			textscale			0.8
+			textalignx			48
+			textaligny			5
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				uiScript		closedatapad			// Close menu				
+			}
+		}
+
+		itemDef 
+		{
+			name				weapons
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				130 416 95 25
+			text				@MENUS0_WEAPONS
+			descText			@MENUS1_VIEW_CURRENTLY_OWNED
+			font				2
+			textscale			0.8
+			textalignx			48
+			textaligny			5
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				close			all ; 
+				open			datapadWeaponsMenu 
+			}
+		}
+
+
+		itemDef 
+		{
+			name				inventory
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				417 379 95 25
+			text				@MENUS1_INVENTORY
+			descText			@MENUS1_VIEW_CURRENT_INVENTORY
+			font				2
+			textscale			0.8
+			textalignx			48
+			textaligny			5
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				close			all ; 
+				open			datapadInventoryMenu 
+			}
+		}
+
+		itemDef 
+		{
+			name				force
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				417 416 95 25
+			text				@MENUS1_DP_FORCE
+			descText			@MENUS1_VIEW_CURRENT_FORCE_POWERS
+			font				2
+			textscale			0.8
+			textalignx			48
+			textaligny			5
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				close			all ; 
+				open			datapadForcePowersMenu 
+			}
+		}
+
+		itemDef
+		{
+			name				camera_menu
+			group				none
+			rect				20 388 95 25
+			text				@MENUS4_CAMERA
+			descText			@MENUS4_CAMERA_DESC
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			textalign			ITEM_ALIGN_CENTER
+			textalignx			48
+			textaligny			0
+			textscale			0.7
+			textstyle			3
+			font				3
+			forecolor			.509 .609 .847 1
+			appearance_slot		1
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+				close			all
+				open			cameraMenu
+			}
+		}
+
+		itemDef
+		{
+			name				music_menu
+			group				none
+			rect				20 425 95 25
+			text				@MENUS4_MUSIC
+			descText			@MENUS4_MUSIC_DESC
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			textalign			ITEM_ALIGN_CENTER
+			textalignx			48
+			textaligny			0
+			textscale			0.7
+			textstyle			3
+			font				3
+			forecolor			.509 .609 .847 1
+			appearance_slot		1
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+				close			all
+				open			musicMenu
+			}
+		}
+
+		itemDef
+		{
+			name				spawner_menu
+			group				none
+			rect				520 388 95 25
+			text				@MENUS4_NPC_SPAWNER
+			descText			@MENUS4_NPC_SPAWNER_DESC
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			textalign			ITEM_ALIGN_CENTER
+			textalignx			48
+			textaligny			0
+			textscale			0.7
+			textstyle			3
+			font				3
+			forecolor			.509 .609 .847 1
+			appearance_slot		1
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+				close			all
+				open			spawnerMenu
+			}
+		}
+
+		itemDef
+		{
+			name				cheats_menu
+			group				none
+			rect				520 425 95 25
+			text				@MENUS4_CHEATS
+			descText			@MENUS4_CHEATS_DESC
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			textalign			ITEM_ALIGN_CENTER
+			textalignx			48
+			textaligny			0
+			textscale			0.7
+			textstyle			3
+			font				3
+			forecolor			.509 .609 .847 1
+			appearance_slot		1
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+				close			all
+				open			cheatsForcePowersMenu
+			}
+		}
+
 	}
 }
 

z_vr_assets/ui/ingamecontrols.menu

@@ -69,6 +69,8 @@
 			forecolor			0.8 0.8 0.8 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 
@@ -83,6 +85,8 @@
 			forecolor			1 1 1 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		// The saber halo on the left
@@ -96,6 +100,8 @@
 			forecolor			0.5 0.5 0.5 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef
@@ -112,6 +118,8 @@
 //			model_origin		100 100 100
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		// The saber halo on the left
@@ -125,6 +133,67 @@
 			forecolor			0.25 0.25 0.25 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+
+		// Expanded menu shaders
+		// Sun red
+		itemDef
+		{
+			name				sun
+			group				none
+			rect				-40 145 300 300
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2r"
+			forecolor			0.7 0.7 0.7 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		// Sun halo
+		itemDef
+		{
+			name				sun_halo
+			group				none
+			rect				-95 100 400 400
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2br"
+			forecolor			0.3 0.3 0.3 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		// Long sunflare
+		itemDef
+		{
+			name				sunflares
+			group				none
+			rect				-235 -60 700 700
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2br"
+			forecolor			0.3 0.3 0.3 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+
+		// Expanded Menu Starwars Logo
+		itemDef
+		{
+			name				star_wars
+			group				none
+			rect				272 10 365 95
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/expanded_menu_logo"
+			forecolor			1 1 1 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 		//----------------------------------------------------------------------------------------------
@@ -145,6 +214,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -164,6 +235,8 @@
 			textalignx			65
 			forecolor			0.65 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter 
 			{ 
@@ -192,6 +265,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -211,6 +286,8 @@
 			textalignx			65
 			forecolor			0.65 0.65 1 1
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter 
 			{ 
@@ -239,6 +316,8 @@
 			forecolor			1 1 1 1
 			visible				0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef {
@@ -259,6 +338,9 @@
 			forecolor			1 1 1 1
 			visible				1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+			
 			action 
 			{ 
 				play			sound/interface/button1 
@@ -285,6 +367,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef {
@@ -304,6 +388,8 @@
 			backcolor			0 0 0 0
 			forecolor			0.65 0.65 1 1
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 			 
 			mouseEnter 
 			{ 
@@ -331,6 +417,8 @@
 			forecolor			1 1 1 1
 			visible				1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 
@@ -350,6 +438,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -369,6 +459,8 @@
 			textaligny			-1
 			forecolor			0.65 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter
 			{
@@ -397,6 +489,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -416,6 +510,9 @@
 			textaligny			-1
 			forecolor			0.65 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+
 			mouseEnter 
 			{ 
 				show			resumebutton_glow 
@@ -431,6 +528,62 @@
 			}
 		}
 
+		// Expanded Menu Back Button
+		itemDef
+		{
+			name				back_menu_button_hover
+			group				highlights
+			rect				585 445 50 15
+			style				WINDOW_STYLE_SHADER
+			textalign			ITEM_ALIGN_RIGHT
+			background			"gfx/menus/expanded_menu_buttonback"
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+
+		itemDef
+		{
+			name				back_menu_button
+			group				none
+			rect				585 445 50 15
+			text				@MENUS0_BACK
+			descText			@MENUS0_BACKUP_ONE_MENU
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			49
+			textaligny			0
+			textscale			0.53
+			textstyle			3
+			font				3
+			forecolor			0.65 0.65 1 1
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+
+				hide			highlights
+
+				close			all
+				open			ingameMainMenu
+			}
+
+			mouseEnter
+			{
+				show			back_menu_button_hover
+			}
+			mouseExit
+			{
+				hide			back_menu_button_hover
+			}
+		}
+
 		//----------------------------------------------------------------------------------------------
 		//
 		//	SECOND ROW MENU BUTTONS
@@ -444,15 +597,36 @@
 			style				WINDOW_STYLE_SHADER
 			background			"gfx/menus/menu_blendbox"
 			text				@MENUS1_CONFIGURE_CONTROLS
-      			rect				150 145 450 16
+			rect				150 145 450 16
 			font				3
 			textscale			0.7
 			textalign			ITEM_ALIGN_CENTER		
 			textalignx			225
 			textaligny			-2
 			forecolor			1 1 1 1
-      			visible			1 
-  	    		decoration 
+			visible			1 
+			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+		itemDef 
+		{
+			name				control_title
+			group				none
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/expanded_menu_box"
+			text				@MENUS1_CONFIGURE_CONTROLS
+			rect				120 145 486 16
+			font				3
+			textscale			0.7
+			textalign			ITEM_ALIGN_CENTER		
+			textalignx			241
+			textaligny			-1
+			forecolor			1 1 1 1
+			visible			1 
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 		// Common  button
@@ -472,7 +646,7 @@
 		{
 			name				commoncontrolbutton
 			group				none
-			text				"Common"
+			text				@MENUS_VR_COMMON_CONTROLS_ITEM
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
 			rect				120 173 170 30
@@ -484,7 +658,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Common controls configuration."
+			descText			@MENUS_VR_COMMON_CONTROLS_DESC
 
 			mouseEnter 
 			{ 
@@ -540,7 +714,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Weapon specific control configuration."
+			descText			@MENUS_VR_WEAPON_CONTROLS_DESC
 
 			mouseEnter 
 			{ 
@@ -596,7 +770,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Force Power specific control configuration."
+			descText			@MENUS_VR_POWER_CONTROLS_DESC
 
 			mouseEnter 
 			{ 
@@ -652,7 +826,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Inventory specific control configuration."
+			descText			@MENUS_VR_POWER_CONTROLS_DESC
 
 			mouseEnter 
 			{ 
@@ -696,7 +870,7 @@
 		{
 			name				comfortcontrolbutton
 			group				none
-			text				"Comfort"
+			text				@MENUS_VR_COMFORT_CONTROLS_ITEM
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
 			rect				120 293 170 30
@@ -708,7 +882,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Configure comfort options."
+			descText			@MENUS_VR_COMFORT_CONTROLS_DESC
 
 			mouseEnter 
 			{ 
@@ -745,6 +919,35 @@
 			forecolor			1 1 1 1
 			visible				0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+
+		itemDef 
+		{
+			name				setup_background
+			group				none
+			style				WINDOW_STYLE_SHADER
+			rect				300 166 306 250	
+			background			"gfx/menus/expanded_menu_box"					// Frame
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		itemDef 
+		{
+			name				setup_background
+			group				none
+			style				WINDOW_STYLE_SHADER
+			rect				120 166 175 250	
+			background			"gfx/menus/expanded_menu_box"					// Frame
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 		//----------------------------------------------------------------------------------------------
@@ -908,7 +1111,7 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_SLIDER
-			text				"Movement Speed:"
+			text				@MENUS_VR_MOVEMENT_SPEED_ITEM
 			cvarfloat		"vr_movement_multiplier" 0.1 0.4 1.2
 			rect				305 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -919,7 +1122,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"Sets player movement speed."
+			descText			@MENUS_VR_MOVEMENT_SPEED_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -941,12 +1144,12 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_MULTI
-			text				"Direction Mode:"
+			text				@MENUS_VR_DIRECTION_MODE_ITEM
 			cvar				"vr_walkdirection"
 			cvarFloatList		
 			{ 
-				"Off-hand Controller" 0  
-				"HMD" 1 
+				@MENUS_VR_DIRECTION_MODE_CONTROLLER 0  
+				@MENUS_VR_DIRECTION_MODE_HMD 1 
 			}
 			rect				305 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -957,7 +1160,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"Choose movement direction mode."
+			descText			@MENUS_VR_DIRECTION_MODE_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -979,9 +1182,15 @@
 		{
 			name				none
 			group				commoncontrols
-			type				ITEM_TYPE_YESNO
-			text				"Smooth turn:"
+			type				ITEM_TYPE_MULTI
+			text				@MENUS_VR_SMOOTH_TURN_ITEM
 			cvar				"vr_turn_mode"
+			cvarFloatList		
+			{ 
+				@MENUS0_NO 0
+				@MENUS_VR_SMOOTH_TURN_3RD_PERSON 1
+				@MENUS0_YES 2
+			}
 			rect				305 231 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151 
@@ -991,7 +1200,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		3
-			descText			"Enables or disables smooth turning."
+			descText			@MENUS_VR_SMOOTH_TURN_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1012,13 +1221,13 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_MULTI
-			text				"Turn Angle:"
+			text				@MENUS_VR_TURN_ANGLE_ITEM
 			cvar				"vr_turn_angle"
 			cvarFloatList		
 			{ 
-				"30 Degrees" 30  
-				"45 Degrees" 45
-				"90 Degrees" 90
+				@MENUS_VR_TURN_ANGLE_30DEGREES 30  
+				@MENUS_VR_TURN_ANGLE_45DEGREES 45
+				@MENUS_VR_TURN_ANGLE_90DEGREES 90
 			}
 			rect				305 251 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1029,7 +1238,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		4
-			descText			"Degrees to turn when using snap turn / Speed of smooth turn"
+			descText			@MENUS_VR_TURN_ANGLE_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1050,7 +1259,7 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_YESNO
-			text				"Switch Sticks:"
+			text				@MENUS_VR_SWITCH_STICKS_ITEM
 			cvar				"vr_switch_sticks"
 			rect				305 271 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1061,7 +1270,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		5
-			descText			"Switches left/gight controller thubmsticks."
+			descText			@MENUS_VR_SWITCH_STICKS_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1082,12 +1291,12 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_MULTI
-			text				"Left-Handed Mode:"
+			text				@MENUS_VR_LEFT_HANDED_ITEM
 			cvar				"vr_control_scheme"
 			cvarFloatList		
 			{ 
-				"No" 0
-				"Yes" 10
+				@MENUS0_NO 0
+				@MENUS0_YES 10
 			}
 			rect				305 291 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1098,7 +1307,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		5
-			descText			"Enables left-handed mode."
+			descText			@MENUS_VR_LEFT_HANDED_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1165,7 +1374,7 @@
 			name				none
 			group				weaponcontrols
 			type				ITEM_TYPE_SLIDER
-			text				"Weapon Pitch:"
+			text				@MENUS_VR_WEAPON_PITCH_ITEM
 			cvarfloat			"vr_weapon_pitchadjust" 5 -25 5
 			rect				305 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1176,7 +1385,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
-			descText			"Sets aiming pitch of held weapon."
+			descText			@MENUS_VR_WEAPON_PITCH_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1199,7 +1408,7 @@
 			name				none
 			group				weaponcontrols
 			type				ITEM_TYPE_YESNO
-			text				"Two-Handed Mode:"
+			text				@MENUS_VR_TWO_HANDED_ITEM
 			cvar			"vr_two_handed_weapons"
 			rect				305 231 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1210,7 +1419,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
-			descText			"Enables two-handed weapon handling."
+			descText			@MENUS_VR_TWO_HANDED_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1233,7 +1442,7 @@
 			name				none
 			group				weaponcontrols
 			type				ITEM_TYPE_YESNO
-			text				"Virtual Gun Stock:"
+			text				@MENUS_VR_GUN_STOCK_ITEM
 			cvar			"vr_virtual_stock"
 			rect				305 251 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1244,7 +1453,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
-			descText			"Enables or disables virtual gun stock."
+			descText			@MENUS_VR_GUN_STOCK_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1262,40 +1471,6 @@
 
 		}
 
-		itemDef 
-		{
-			name				none
-			group				weaponcontrols
-			type				ITEM_TYPE_YESNO
-			text				"Saber Auto Blocking:"
-			cvar			"g_saberAutoblocking"
-			rect				305 271 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0 
-			// appearance_slot		2
-			descText			"Enables or disables auto blocking with saber."
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-
-			mouseenter 
-			{ 
-				show			highlight6
-			}
-
-			mouseexit 
-			{ 
-				hide			highlight6
-			}			
-
-		}
-
 
 
 		//----------------------------------------------------------------------------------------------
@@ -1308,7 +1483,7 @@
 			name				none
 			group				forcecontrols
 			type				ITEM_TYPE_YESNO
-			text				"Force Power Direction Hint:"
+			text				@MENUS_VR_FORCE_POWER_DIRECTION_ITEM
 			cvar				"cg_showForcePowerDirection"
 			rect				340 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1319,7 +1494,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
-			descText			"Hint as to which direction a force power was fired."
+			descText			@MENUS_VR_FORCE_POWER_DIRECTION_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1342,7 +1517,7 @@
 			name				none
 			group				forcecontrols
 			type				ITEM_TYPE_YESNO
-			text				"Force Speed FOV Change:"
+			text				@MENUS_VR_FORCE_SPEED_FOV_ITEM
 			cvar				"cg_forceSpeedFOVAdjust"
 			rect				340 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1353,7 +1528,7 @@
 			forecolor			1 1 1 1
 			visible				0 
 			// appearance_slot		2
-			descText			"Whether the FOV will be adjusted briefly when engaging Force Speed."
+			descText			@MENUS_VR_FORCE_SPEED_FOV_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1422,7 +1597,7 @@
 			name				none
 			group				comfortcontrols
 			type				ITEM_TYPE_YESNO
-			text				"Immersive Cinematics:"
+			text				@MENUS_VR_IMMERSIVE_CINEMATICS_ITEM
 			cvar				"vr_immersive_cinematics"
 			rect				305 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1433,7 +1608,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"Enables or disables immersive cinematics."
+			descText			@MENUS_VR_IMMERSIVE_CINEMATICS_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1455,13 +1630,13 @@
 			name				none
 			group				comfortcontrols
 			type				ITEM_TYPE_MULTI
-			text				"Menu Screen Distance:"
+			text				@MENUS_VR_SCREEN_DISTANCE_ITEM
 			cvar				"vr_screen_dist"
 			cvarFloatList		
 			{ 
-				"Near" 1.5  
-				"Medium" 2.5
-				"Far" 3.5
+				@MENUS_VR_SCREEN_DISTANCE_NEAR 1.5  
+				@MENUS_VR_SCREEN_DISTANCE_MEDIUM 2.5
+				@MENUS_VR_SCREEN_DISTANCE_FAR 3.5
 			}
 			rect				305 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
@@ -1472,7 +1647,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"Select menu screen distance."
+			descText			@MENUS_VR_SCREEN_DISTANCE_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1489,6 +1664,39 @@
 			}			
 		}
 
+		itemDef 
+		{
+			name				none
+			group				comfortcontrols
+			type				ITEM_TYPE_SLIDER
+			text				@MENUS_VR_HEIGHT_ADJUST_ITEM
+			cvarfloat 	"cg_heightAdjust" 0.2 0 1
+			rect				305 231 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS_VR_HEIGHT_ADJUST_DESC
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+		
+			mouseenter 
+			{ 
+				show			highlight4
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight4
+			}			
+		}
+
 
 
 		//----------------------------------------------------------------------------------------------

z_vr_assets/ui/ingamesetup.menu

@@ -67,6 +67,8 @@
 			forecolor			0.8 0.8 0.8 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 
@@ -81,6 +83,8 @@
 			forecolor			1 1 1 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		// The saber halo on the left
@@ -94,6 +98,8 @@
 			forecolor			0.5 0.5 0.5 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef
@@ -110,6 +116,8 @@
 //			model_origin		100 100 100
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		// The saber halo on the left
@@ -123,6 +131,67 @@
 			forecolor			0.25 0.25 0.25 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+
+		// Expanded menu shaders
+		// Sun red
+		itemDef
+		{
+			name				sun
+			group				none
+			rect				-40 145 300 300
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2r"
+			forecolor			0.7 0.7 0.7 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		// Sun halo
+		itemDef
+		{
+			name				sun_halo
+			group				none
+			rect				-95 100 400 400
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2br"
+			forecolor			0.3 0.3 0.3 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		// Long sunflare
+		itemDef
+		{
+			name				sunflares
+			group				none
+			rect				-235 -60 700 700
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2br"
+			forecolor			0.3 0.3 0.3 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+
+		// Expanded Menu Starwars Logo
+		itemDef
+		{
+			name				star_wars
+			group				none
+			rect				272 10 365 95
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/expanded_menu_logo"
+			forecolor			1 1 1 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 		//----------------------------------------------------------------------------------------------
@@ -143,6 +212,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -162,6 +233,8 @@
 			textalignx			65
 			forecolor			0.65 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter 
 			{ 
@@ -194,6 +267,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -213,6 +288,8 @@
 			textalignx			65
 			forecolor			0.65 0.65 1 1
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter 
 			{ 
@@ -245,6 +322,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef {
@@ -264,6 +343,8 @@
 			backcolor			0 0 0 0
 			forecolor			0.65 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 			 
 			mouseEnter 
 			{ 
@@ -295,6 +376,8 @@
 			forecolor			1 1 1 1
 			visible				0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef {
@@ -315,6 +398,9 @@
 			forecolor			1 1 1 1
 			visible				1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+			
 			action 
 			{ 
 				play			"sound/interface/button1.wav" ;
@@ -340,6 +426,8 @@
 			forecolor			1 1 1 1
 			visible				1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		//----------------------------------------------------------------------------------------------
@@ -358,6 +446,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -377,6 +467,8 @@
 			textaligny			-1
 			forecolor			0.65 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter
 			{
@@ -408,6 +500,8 @@
 			forecolor			1 1 1 1
 			visible			0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -427,6 +521,9 @@
 			textaligny			-1
 			forecolor			0.65 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+
 			mouseEnter 
 			{ 
 				show			resumebutton_glow 
@@ -445,6 +542,62 @@
 			}
 		}
 
+		// Expanded Menu Back Button
+		itemDef
+		{
+			name				back_menu_button_hover
+			group				highlights
+			rect				585 445 50 15
+			style				WINDOW_STYLE_SHADER
+			textalign			ITEM_ALIGN_RIGHT
+			background			"gfx/menus/expanded_menu_buttonback"
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+
+		itemDef
+		{
+			name				back_menu_button
+			group				none
+			rect				585 445 50 15
+			text				@MENUS0_BACK
+			descText			@MENUS0_BACKUP_ONE_MENU
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			49
+			textaligny			0
+			textscale			0.53
+			textstyle			3
+			font				3
+			forecolor			0.65 0.65 1 1
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+
+				hide			highlights
+
+				close			all
+				open			ingameMainMenu
+			}
+
+			mouseEnter
+			{
+				show			back_menu_button_hover
+			}
+			mouseExit
+			{
+				hide			back_menu_button_hover
+			}
+		}
+
 		//----------------------------------------------------------------------------------------------
 		//
 		//	SECOND ROW MENU BUTTONS
@@ -458,16 +611,36 @@
 			style				WINDOW_STYLE_SHADER
 			background			"gfx/menus/menu_blendbox"
 			text				@MENUS2_SETUP_OPTIONS
-      		rect				150 145 450 16
+			rect				150 145 450 16
 			font				3
 			textscale			0.7
 			textalign			ITEM_ALIGN_CENTER		
 			textalignx			225
 			textaligny			-2	
 			forecolor			1 1 1 1
-      		visible			1 
-			// appearance_slot		2
-      		decoration 
+			visible			1 
+			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+		itemDef 
+		{
+			name				setup_title
+			group				none
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/expanded_menu_box"
+			text				@MENUS2_SETUP_OPTIONS
+			rect				120 145 486 16
+			font				3
+			textscale			0.7
+			textalign			ITEM_ALIGN_CENTER		
+			textalignx			241
+			textaligny			-1
+			forecolor			1 1 1 1
+			visible			1 
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 
@@ -744,7 +917,7 @@
 		{
 			name				difficultymenubutton
 			group				none
-			text				"Difficulty"
+			text				@MENUS_VR_DIFFICULTY_SETUP_ITEM
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
 			rect				120 293 170 30
@@ -756,7 +929,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Various gameplay difficulty tweaks."
+			descText			@MENUS_VR_DIFFICULTY_SETUP_DESC
 
 			mouseEnter 
 			{ 
@@ -863,6 +1036,35 @@
 			forecolor			1 1 1 1
 			visible				0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+
+		itemDef 
+		{
+			name				setup_background
+			group				none
+			style				WINDOW_STYLE_SHADER
+			rect				300 166 306 250	
+			background			"gfx/menus/expanded_menu_box"					// Frame
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		itemDef 
+		{
+			name				setup_background
+			group				none
+			style				WINDOW_STYLE_SHADER
+			rect				120 166 175 250	
+			background			"gfx/menus/expanded_menu_box"					// Frame
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 		//----------------------------------------------------------------------------------------------
@@ -1020,7 +1222,7 @@
 		//
 		//----------------------------------------------------------------------------------------------
 		itemDef 
-		{	
+		{
 			name				geometric_detail
 			group				video
 			type				ITEM_TYPE_MULTI
@@ -1486,9 +1688,9 @@
 			cvar				"cg_shadows"
 			cvarFloatList		
 			{  
-				"None"		0 
-				"Low"		1 
-				"High"	3
+				@MENUS3_NONE		0 
+				@MENUS0_LOW		1 
+				@MENUS0_HIGH	3
 			}
 			rect				305 271 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
@@ -1821,11 +2023,11 @@
 
 			mouseenter 
 			{ 
-				show			highlight1
+				show			highlight2
 			}
 			mouseexit 
 			{ 
-				hide			highlight1
+				hide			highlight2
 			} 
 		}
 
@@ -1859,11 +2061,11 @@
 
 			mouseenter 
 			{ 
-				show			highlight2
+				show			highlight3
 			}
 			mouseexit 
 			{ 
-				hide			highlight2
+				hide			highlight3
 			} 
 		}
 
@@ -1902,11 +2104,11 @@
 
 			mouseenter 
 			{ 
-				show			highlight3
+				show			highlight4
 			}
 			mouseexit 
 			{ 
-				hide			highlight3
+				hide			highlight4
 			} 
 		}
 
@@ -1920,10 +2122,10 @@
 			cvar				"g_dismemberment"
 			cvarFloatList		
 			{ 
-				"Disabled"	0
-				"Mild"			1
-				"Bearable"	2
-				"Unsettling"	3
+				@MENUS_VR_MODEL_DISMEMBERMENT_DISABLED	0
+				@MENUS_VR_MODEL_DISMEMBERMENT_MILD			1
+				@MENUS_VR_MODEL_DISMEMBERMENT_BEARABLE	2
+				@MENUS_VR_MODEL_DISMEMBERMENT_UNSETTLING	3
 			}
 			cvarTest			ui_iscensored
 			hideCvar			{ 1 }
@@ -1956,14 +2158,14 @@
 		{	
 			name				dismemberment_probability
 			group				options
-      		type				ITEM_TYPE_MULTI
-			text				"Dismemberment Probability:"
+			type				ITEM_TYPE_MULTI
+			text				@MENUS2_DISMEMBER_PROBABILITY
 			cvar				"g_dismemberprobabilities"
 			cvarFloatList		
 			{ 
-				"Rarely"	30
-				"Often"			50
-				"Always"	100
+				@MENUS2_RARE	30
+				@MENUS_VR_DISMEMBERMENT_PROBABILITY_OFTEN			50
+				@MENUS_VR_DISMEMBERMENT_PROBABILITY_ALWAYS	100
 			}
 			cvarTest			ui_iscensored
 			hideCvar			{ 1 }
@@ -1976,7 +2178,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"How often do model dismemberments happen."
+			descText			@MENUS2_SELECT_FREQUENCY_OF_DISMEMBERMENT
 			action
 			{
 				play			"sound/interface/button1.wav" ;
@@ -1992,47 +2194,6 @@
 		}
 
 
-
-/*
-		itemDef 
-		{	
-			name				dismembermentprob
-			group				options_obsolete
-      		type				ITEM_TYPE_MULTI
-			text				@MENUS2_DISMEMBER_PROBABILITY
-			cvar				"g_dismemberProbabilities"
-			cvarFloatList		
-			{ 
-				@MENUS2_RARE 		2
-				@MENUS1_NORMAL 		1
-				@MENUS2_EXCESSIVE		0
-			}
-			rect				305 311 300 20
-	   		textalign			ITEM_ALIGN_RIGHT
-			textalignx			165
-			textaligny			-2
-			font 				2
-			textscale 			0.8
-			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		1
-			descText			@MENUS2_SELECT_FREQUENCY_OF_DISMEMBERMENT
-			action
-			{
-				play			"sound/interface/button1.wav" ;
-			}
-
-			mouseenter 
-			{ 
-				show			highlight8
-			}
-			mouseexit 
-			{ 
-				hide			highlight8
-			} 
-		}
-*/
-
 		itemDef 
 		{	
 			name				text
@@ -2045,6 +2206,7 @@
 				"English"	0  
 				"Francais" 	1
 				"Deutsch" 	2
+				"Español"	7
 			}
 			rect				305 351 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
@@ -2083,6 +2245,7 @@
 				"English",	"english"
 				"Francais" 	"francais"
 				"Deutsch"	"deutsch"
+				"Español"   "espanol"
 			}
 			rect				305 371 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
@@ -2192,31 +2355,24 @@
 		{
 			name				none
 			group				difficulty
-			type				ITEM_TYPE_MULTI
-			text				"Lightsaber Realism:"
-			cvar				"g_saberRealisticCombat"
-			cvarFloatList		
-			{ 
-				"Default" 0 
-				"Increased Damage" 1
-				"Fatal Critical Hit" 2
-				"Instant Kill" 3
-			}
-			rect				305 191 300 20
+			type				ITEM_TYPE_YESNO
+			text				@MENUS_VR_LASER_AUTODEFLECTING_ITEM
+			cvar			"g_saberAutoDeflect1stPerson"
+			rect				315 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
 			font				2
 			textscale			0.8
 			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		1
-			descText			"Choose effectivity of lightsaber, affects lightsaber duels difficulty mostly."
+			visible			0 
+			// appearance_slot		2
+			descText			@MENUS_VR_LASER_AUTODEFLECTING_DESC
 			action 
 			{ 
 				play			sound/interface/button1
 			}
-		
+
 			mouseenter 
 			{ 
 				show			highlight2
@@ -2226,22 +2382,58 @@
 			{ 
 				hide			highlight2
 			}			
+
 		}
 
 		itemDef 
+		{
+			name				none
+			group				difficulty
+			type				ITEM_TYPE_YESNO
+			text				@MENUS_VR_SABER_AUTOBLOCKING_ITEM
+			cvar			"g_saberAutoblocking"
+			rect				315 211 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0 
+			// appearance_slot		2
+			descText			@MENUS_VR_SABER_AUTOBLOCKING_DESC
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{ 
+				show			highlight3
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight3
+			}			
+
+		}
+
+		itemDef
 		{
 			name				none
 			group				difficulty
 			type				ITEM_TYPE_MULTI
-			text				"Enemy Fencing Speed:"
-			cvar				"g_saberAnimSpeed"
+			text				@MENUS_VR_SABER_REALISM_ITEM
+			cvar				"g_saberRealisticCombat"
 			cvarFloatList		
 			{ 
-				"Slower" 1.0 
-				"Default" 1.2
-				"Faster" 1.3
+				@MENUS_VR_SABER_REALISM_DEFAULT 0 
+				@MENUS_VR_SABER_REALISM_INCREASED 1
+				@MENUS_VR_SABER_REALISM_CRITICAL 2
+				@MENUS_VR_SABER_REALISM_INSTANT 3
 			}
-			rect				305 211 300 20
+			rect				315 231 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
@@ -2250,19 +2442,20 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"Choose fencing swiftness of enemies, affects lightsaber duels difficulty."
+			descText			@MENUS_VR_SABER_REALISM_DESC
 			action 
 			{ 
-				play			"sound/interface/button1.wav" ;
+				play			sound/interface/button1
 			}
 		
 			mouseenter 
 			{ 
-				show			highlight3
+				show			highlight4
 			}
+
 			mouseexit 
 			{ 
-				hide			highlight3
+				hide			highlight4
 			}			
 		}
 
@@ -2271,16 +2464,15 @@
 			name				none
 			group				difficulty
 			type				ITEM_TYPE_MULTI
-			text				"Game Difficulty:"
-			cvar				"g_spskill"
+			text				@MENUS_VR_FENCING_SPEED_ITEM
+			cvar				"g_saberAnimSpeed"
 			cvarFloatList		
-		{
-				"Padawan" 0 
-				"Jedi" 1
-				"Jedi Knight" 2
-				"Jedi Master" 3
-		}
-			rect				305 231 300 20
+			{ 
+				@MENUS_VR_FENCING_SPEED_SLOWER 1.0 
+				@MENUS_VR_FENCING_SPEED_DEFAULT 1.2
+				@MENUS_VR_FENCING_SPEED_FASTER 1.3
+			}
+			rect				315 251 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
@@ -2289,7 +2481,46 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"Change game difficulty."
+			descText			@MENUS_VR_FENCING_SPEED_DESC
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+			}
+		
+			mouseenter 
+			{ 
+				show			highlight5
+			}
+			mouseexit 
+			{ 
+				hide			highlight5
+			}			
+		}
+
+		itemDef 
+		{
+			name				none
+			group				difficulty
+			type				ITEM_TYPE_MULTI
+			text				@MENUS_VR_GAME_DIFFICULTY_ITEM
+			cvar				"g_spskill"
+			cvarFloatList		
+		{
+				@MENUS1_APPRENTICE 0 
+				@MENUS1_JEDI 1
+				@MENUS2_JEDI_KNIGHT 2
+				@MENUS1_JEDI_MASTER 3
+		}
+			rect				315 291 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS_VR_GAME_DIFFICULTY_DESC
 			action 
 			{ 
 				play			"sound/interface/button1.wav" ;
@@ -2297,11 +2528,11 @@
 
 			mouseenter 
 			{ 
-				show			highlight4
+				show			highlight7
 			}
 			mouseexit 
 			{ 
-				hide			highlight4
+				hide			highlight7
 			}
 		}
 
@@ -2317,7 +2548,7 @@
 			name				vidrestart_background
 			group				defaults
 			style				WINDOW_STYLE_SHADER
-			rect				300 171 300 250	
+			rect				304 168 300 247
 			background			"gfx/menus/menu_boxred"					// Frame
 			forecolor			1 1 1 0.5
 			visible			0

z_vr_assets/ui/menus.txt

@@ -27,4 +27,13 @@
 	loadMenu { "ui/ingamevid_warning.menu"				}
 	loadMenu { "ui/videodriver.menu"					}
 
+	// expanded menu mod support
+	loadMenu { "ui/selectmission.menu"	}
+	loadMenu { "ui/selectmap.menu"		}
+	loadMenu { "ui/camera.menu"		}
+	loadMenu { "ui/music.menu"		}
+	loadMenu { "ui/spawner.menu"		}
+	loadMenu { "ui/cheatsforcepowers.menu"	}
+	loadMenu { "ui/cheatsinventory.menu"	}
+
 }

z_vr_assets/ui/setup.menu

@@ -73,6 +73,8 @@
 			forecolor			0.8 0.8 0.8 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 
@@ -87,6 +89,8 @@
 			forecolor			1 1 1 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		// The saber halo on the left
@@ -100,6 +104,8 @@
 			forecolor			0.5 0.5 0.5 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef
@@ -116,6 +122,8 @@
 //			model_origin		100 100 100
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		// The saber halo on the left
@@ -129,6 +137,82 @@
 			forecolor			0.25 0.25 0.25 1
 			visible			1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+
+		// Expanded menu shaders
+		// Sun red
+		itemDef
+		{
+			name				sun
+			group				none
+			rect				-40 145 300 300
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2r"
+			forecolor			0.7 0.7 0.7 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		// Sun halo
+		itemDef
+		{
+			name				sun_halo
+			group				none
+			rect				-95 100 400 400
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2br"
+			forecolor			0.3 0.3 0.3 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		// Long sunflare
+		itemDef
+		{
+			name				sunflares
+			group				none
+			rect				-235 -60 700 700
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/menu2br"
+			forecolor			0.3 0.3 0.3 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+
+		// Expanded Menu Background Video
+		itemDef
+		{
+			name				background_video
+			group				none
+			rect				0 -100 640 680
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/expanded_menu_video_3"
+			forecolor			1 1 1 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_video
+			showCvar			{ 1 }
+		}
+
+		// Expanded Menu Starwars Logo
+		itemDef
+		{
+			name				star_wars
+			group				none
+			rect				272 10 365 95
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/expanded_menu_logo"
+			forecolor			1 1 1 1
+			visible				1
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 		//----------------------------------------------------------------------------------------------
@@ -149,6 +233,8 @@
 			visible			0
 			// appearance_slot		1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -168,6 +254,8 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter 
 			{ 
@@ -200,6 +288,8 @@
 			visible			0
 			// appearance_slot		1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -219,6 +309,8 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible				1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter 
 			{ 
@@ -251,6 +343,8 @@
 			visible			0
 			// appearance_slot		1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef {
@@ -270,6 +364,8 @@
 			backcolor			0 0 0 0
 			forecolor			0.65 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 			 
 			mouseEnter 
 			{ 
@@ -302,6 +398,8 @@
 			forecolor			1 1 1 1
 			visible				0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef {
@@ -322,12 +420,13 @@
 			forecolor			1 1 1 1
 			visible				1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+			
 			action 
 			{ 
 				play			"sound/interface/button1.wav" ;
 			}
-
-
 			mouseEnter 
 			{ 
 				show			setupbutton_glow 
@@ -348,6 +447,8 @@
 			forecolor			1 1 1 1
 			visible				1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 
@@ -407,6 +508,8 @@
 			visible			0
 			// appearance_slot		1
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 		}
 
 		itemDef 
@@ -426,6 +529,8 @@
 			textaligny			-1
 			forecolor			0.65 0.65 1 1
 			visible			1
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
 
 			mouseEnter 
 			{ 
@@ -446,6 +551,62 @@
 			}
 		}
 
+		// Expanded Menu Back Button
+		itemDef
+		{
+			name				back_menu_button_hover
+			group				highlights
+			rect				585 445 50 15
+			style				WINDOW_STYLE_SHADER
+			textalign			ITEM_ALIGN_RIGHT
+			background			"gfx/menus/expanded_menu_buttonback"
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+
+		itemDef
+		{
+			name				back_menu_button
+			group				none
+			rect				585 445 50 15
+			text				@MENUS0_BACK
+			descText			@MENUS0_BACKUP_ONE_MENU
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			49
+			textaligny			0
+			textscale			0.53
+			textstyle			3
+			font				3
+			forecolor			0.65 0.65 1 1
+			visible				1
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+
+				hide			highlights
+
+				close			all
+				open			mainbackMenu
+			}
+
+			mouseEnter
+			{
+				show			back_menu_button_hover
+			}
+			mouseExit
+			{
+				hide			back_menu_button_hover
+			}
+		}
+
 		//----------------------------------------------------------------------------------------------
 		//
 		//	SECOND ROW MENU BUTTONS
@@ -459,16 +620,36 @@
 			style				WINDOW_STYLE_SHADER
 			background			"gfx/menus/menu_blendbox"
 			text				@MENUS2_SETUP_OPTIONS
-      		rect				150 145 450 16
+			rect				150 145 450 16
 			font				3
 			textscale			0.7
 			textalign			ITEM_ALIGN_CENTER		
 			textalignx			225
 			textaligny			-2	
 			forecolor			1 1 1 1
-      		visible			1 
-			// appearance_slot		2
-      		decoration 
+			visible			1 
+			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+		itemDef 
+		{
+			name				setup_title
+			group				none
+			style				WINDOW_STYLE_SHADER
+			background			"gfx/menus/expanded_menu_box"
+			text				@MENUS2_SETUP_OPTIONS
+			rect				120 145 486 16
+			font				3
+			textscale			0.7
+			textalign			ITEM_ALIGN_CENTER		
+			textalignx			241
+			textaligny			-1
+			forecolor			1 1 1 1
+			visible			1 
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 
@@ -756,7 +937,7 @@
 		{
 			name				difficultymenubutton
 			group				none
-			text				"Difficulty"
+			text				@MENUS_VR_DIFFICULTY_SETUP_ITEM
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
 			rect				120 293 170 30
@@ -768,7 +949,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Various gameplay difficulty tweaks."
+			descText			@MENUS_VR_DIFFICULTY_SETUP_DESC
 
 			mouseEnter 
 			{ 
@@ -946,6 +1127,35 @@
 			forecolor			1 1 1 1
 			visible				0
 			decoration
+			cvarTest			expanded_menu_enabled
+			hideCvar			{ 1 }
+		}
+
+		itemDef 
+		{
+			name				setup_background
+			group				none
+			style				WINDOW_STYLE_SHADER
+			rect				300 166 306 250	
+			background			"gfx/menus/expanded_menu_box"					// Frame
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
+		}
+		itemDef 
+		{
+			name				setup_background
+			group				none
+			style				WINDOW_STYLE_SHADER
+			rect				120 166 175 250	
+			background			"gfx/menus/expanded_menu_box"					// Frame
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+			cvarTest			expanded_menu_enabled
+			showCvar			{ 1 }
 		}
 
 		//----------------------------------------------------------------------------------------------
@@ -1571,9 +1781,9 @@
 			cvar				"cg_shadows"
 			cvarFloatList		
 			{  
-				"None"		0 
-				"Low"		1 
-				"High"	3
+				@MENUS3_NONE		0 
+				@MENUS0_LOW		1 
+				@MENUS0_HIGH	3
 			}
 			rect				305 271 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
@@ -1994,10 +2204,10 @@
 			cvar				"g_dismemberment"
 			cvarFloatList		
 			{ 
-				"Disabled"	0
-				"Mild"			1
-				"Bearable"	2
-				"Unsettling"	3
+				@MENUS_VR_MODEL_DISMEMBERMENT_DISABLED	0
+				@MENUS_VR_MODEL_DISMEMBERMENT_MILD			1
+				@MENUS_VR_MODEL_DISMEMBERMENT_BEARABLE	2
+				@MENUS_VR_MODEL_DISMEMBERMENT_UNSETTLING	3
 			}
 			cvarTest			ui_iscensored
 			hideCvar			{ 1 }
@@ -2030,14 +2240,14 @@
 		{	
 			name				dismemberment_probability
 			group				options
-      		type				ITEM_TYPE_MULTI
-			text				"Dismemberment Probability:"
+			type				ITEM_TYPE_MULTI
+			text				@MENUS2_DISMEMBER_PROBABILITY
 			cvar				"g_dismemberprobabilities"
 			cvarFloatList		
 			{ 
-				"Rarely"	30
-				"Often"			50
-				"Always"	100
+				@MENUS2_RARE	30
+				@MENUS_VR_DISMEMBERMENT_PROBABILITY_OFTEN			50
+				@MENUS_VR_DISMEMBERMENT_PROBABILITY_ALWAYS	100
 			}
 			cvarTest			ui_iscensored
 			hideCvar			{ 1 }
@@ -2050,7 +2260,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"How often do model dismemberments happen."
+			descText			@MENUS2_SELECT_FREQUENCY_OF_DISMEMBERMENT
 
 			action
 			{
@@ -2066,47 +2276,6 @@
 			} 
 		}
 
-
-
-/*
-		itemDef 
-		{	
-			name				dismembermentprob
-			group				options_obsolete
-      		type				ITEM_TYPE_MULTI
-			text				@MENUS2_DISMEMBER_PROBABILITY
-			cvar				"g_dismemberProbabilities"
-			cvarFloatList		
-			{ 
-				@MENUS2_RARE 		2
-				@MENUS1_NORMAL 		1
-				@MENUS2_EXCESSIVE		0
-			}
-			rect				305 311 300 20
-	   		textalign			ITEM_ALIGN_RIGHT
-			textalignx			165
-			textaligny			-2
-			font 				2
-			textscale 			0.8
-			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		1
-			descText			@MENUS2_SELECT_FREQUENCY_OF_DISMEMBERMENT
-			action
-			{
-				play			"sound/interface/button1.wav"
-			}
-			mouseenter 
-			{ 
-				show			highlight8
-			}
-			mouseexit 
-			{ 
-				hide			highlight8
-			} 
-		}
-*/
-
 		itemDef 
 		{	
 			name				text
@@ -2119,6 +2288,7 @@
 				"English"	0  
 				"Francais" 	1
 				"Deutsch" 	2
+				"Español"	7
 			}
 			rect				305 351 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
@@ -2157,6 +2327,7 @@
 				"English",	"english"
 				"Francais" 	"francais"
 				"Deutsch"	"deutsch"
+				"Español"   "espanol"
 			}
 			rect				305 371 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
@@ -2266,31 +2437,24 @@
 		{
 			name				none
 			group				difficulty
-			type				ITEM_TYPE_MULTI
-			text				"Lightsaber Realism:"
-			cvar				"g_saberRealisticCombat"
-			cvarFloatList		
-			{ 
-				"Default" 0 
-				"Increased Damage" 1
-				"Fatal Critical Hit" 2
-				"Instant Kill" 3
-			}
-			rect				305 191 300 20
+			type				ITEM_TYPE_YESNO
+			text				@MENUS_VR_LASER_AUTODEFLECTING_ITEM
+			cvar			"g_saberAutoDeflect1stPerson"
+			rect				315 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
 			font				2
 			textscale			0.8
 			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		1
-			descText			"Choose effectivity of lightsaber, affects lightsaber duels difficulty mostly."
+			visible			0 
+			// appearance_slot		2
+			descText			@MENUS_VR_LASER_AUTODEFLECTING_DESC
 			action 
 			{ 
 				play			sound/interface/button1
 			}
-		
+
 			mouseenter 
 			{ 
 				show			highlight2
@@ -2300,22 +2464,58 @@
 			{ 
 				hide			highlight2
 			}			
+
 		}
 
 		itemDef 
+		{
+			name				none
+			group				difficulty
+			type				ITEM_TYPE_YESNO
+			text				@MENUS_VR_SABER_AUTOBLOCKING_ITEM
+			cvar			"g_saberAutoblocking"
+			rect				315 211 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0 
+			// appearance_slot		2
+			descText			@MENUS_VR_SABER_AUTOBLOCKING_DESC
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{ 
+				show			highlight3
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight3
+			}			
+
+		}
+
+		itemDef
 		{
 			name				none
 			group				difficulty
 			type				ITEM_TYPE_MULTI
-			text				"Enemy Fencing Speed:"
-			cvar				"g_saberAnimSpeed"
+			text				@MENUS_VR_SABER_REALISM_ITEM
+			cvar				"g_saberRealisticCombat"
 			cvarFloatList		
 			{ 
-				"Slower" 1.0 
-				"Default" 1.2
-				"Faster" 1.3
+				@MENUS_VR_SABER_REALISM_DEFAULT 0 
+				@MENUS_VR_SABER_REALISM_INCREASED 1
+				@MENUS_VR_SABER_REALISM_CRITICAL 2
+				@MENUS_VR_SABER_REALISM_INSTANT 3
 			}
-			rect				305 211 300 20
+			rect				315 231 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
@@ -2324,7 +2524,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"Choose fencing swiftness of enemies, affects lightsaber duels difficulty."
+			descText			@MENUS_VR_SABER_REALISM_DESC
 			action 
 			{ 
 				play			sound/interface/button1
@@ -2332,12 +2532,51 @@
 		
 			mouseenter 
 			{ 
-				show			highlight3
+				show			highlight4
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight4
+			}			
+		}
+
+		itemDef 
+		{
+			name				none
+			group				difficulty
+			type				ITEM_TYPE_MULTI
+			text				@MENUS_VR_FENCING_SPEED_ITEM
+			cvar				"g_saberAnimSpeed"
+			cvarFloatList		
+			{ 
+				@MENUS_VR_FENCING_SPEED_SLOWER 1.0 
+				@MENUS_VR_FENCING_SPEED_DEFAULT 1.2
+				@MENUS_VR_FENCING_SPEED_FASTER 1.3
+			}
+			rect				315 251 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS_VR_FENCING_SPEED_DESC
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+		
+			mouseenter 
+			{ 
+				show			highlight5
 			}
 		
 			mouseexit 
 			{ 
-				hide			highlight3
+				hide			highlight5
 			}			
 		}
 
@@ -2426,7 +2665,7 @@
 			name				vidrestart_background
 			group				defaults
 			style				WINDOW_STYLE_SHADER
-			rect				300 171 300 250	
+			rect				304 168 300 247
 			background			"gfx/menus/menu_boxred"					// Frame
 			forecolor			1 1 1 0.5
 			visible			0