Menu changes from @MuadDib

Fix crouch toggle
This commit is contained in:
Simon 2022-11-12 09:30:41 +00:00
parent 7a921c5e38
commit 18140d2340
10 changed files with 682 additions and 696 deletions

View file

@ -652,8 +652,10 @@ void HandleInput_Default( ovrInputStateGamepad *pFootTrackingNew, ovrInputStateG
if (vr_crouch_toggle->integer)
{
vr.crouched = !vr.crouched;
sendButtonAction("+movedown", vr.crouched);
if (secondaryButtonsOld & secondaryThumb) {
vr.crouched = !vr.crouched;
sendButtonAction("+movedown", vr.crouched);
}
}
else
{

Binary file not shown.

View file

@ -3,16 +3,16 @@ CONFIG W:\bin\striped.cfg
ID 100
REFERENCE MENUS_VR
DESCRIPTION "VR Menu Localizations"
COUNT 106
COUNT 114
INDEX 0
{
REFERENCE COMMON_CONTROLS_ITEM
TEXT_LANGUAGE1 "Common"
TEXT_LANGUAGE1 "OBSOLETE Common"
}
INDEX 1
{
REFERENCE COMMON_CONTROLS_DESC
TEXT_LANGUAGE1 "Common controls configuration."
TEXT_LANGUAGE1 "OBSOLETE Common controls configuration."
}
INDEX 2
{
@ -37,7 +37,7 @@ INDEX 5
INDEX 6
{
REFERENCE COMFORT_CONTROLS_DESC
TEXT_LANGUAGE1 "Configure comfort options."
TEXT_LANGUAGE1 "Configure common controls and comfort options."
}
INDEX 7
{
@ -277,12 +277,12 @@ INDEX 53
INDEX 54
{
REFERENCE SABER_AUTOBLOCKING_ITEM
TEXT_LANGUAGE1 "Lightsaber Auto Blocking:"
TEXT_LANGUAGE1 "OBSOLETE Lightsaber Auto Blocking:"
}
INDEX 55
{
REFERENCE SABER_AUTOBLOCKING_DESC
TEXT_LANGUAGE1 "Enables or disables auto blocking of enemy lightsaber."
TEXT_LANGUAGE1 "OBSOLETE Enables or disables auto blocking of enemy lightsaber."
}
INDEX 56
{
@ -534,3 +534,43 @@ INDEX 105
REFERENCE OVERWRITE_GAME_DESC
TEXT_LANGUAGE1 "Overwrite chosen game."
}
INDEX 106
{
REFERENCE WEAPON_VELOCITY_TRIGGER_ITEM
TEXT_LANGUAGE1 "Melee Trigger Speed:"
}
INDEX 107
{
REFERENCE WEAPON_VELOCITY_TRIGGER_DESC
TEXT_LANGUAGE1 "Adjust how fast to move hand to trigger melee attack."
}
INDEX 108
{
REFERENCE FORCE_MOTION_TRIGGER_TOGGLE_ITEM
TEXT_LANGUAGE1 "Gesture Triggered Force:"
}
INDEX 109
{
REFERENCE FORCE_MOTION_TRIGGER_TOGGLE_DESC
TEXT_LANGUAGE1 "Toggles triggering of force powers by gesture."
}
INDEX 110
{
REFERENCE FORCE_VELOCITY_TRIGGER_ITEM
TEXT_LANGUAGE1 "Force Trigger Speed:"
}
INDEX 111
{
REFERENCE FORCE_VELOCITY_TRIGGER_DESC
TEXT_LANGUAGE1 "Adjust how fast to move hand to trigger force power."
}
INDEX 112
{
REFERENCE CROUCH_TOGGLE_ITEM
TEXT_LANGUAGE1 "Crouch Toggle:"
}
INDEX 113
{
REFERENCE CROUCH_TOGGLE_DESC
TEXT_LANGUAGE1 "Turn on to enable crouch toggle."
}

View file

@ -19,13 +19,15 @@
onOpen
{
uiScript loadControls
hide forcecontrols
show commoncontrols
hide invcontrols
hide comfortcontrols
show setup_background
show comfortcontrols
hide weaponcontrols
hide forcecontrols
hide invcontrols
setitemcolor comfortcontrolbutton forecolor 1 1 1 1
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
}
onClose
@ -113,9 +115,9 @@
model_angle 90
model_rotation 3.5
asset_model "models/map_objects/bespin/jk2logo.md3"
// model_fovx 37
// model_fovy 34
// model_origin 100 100 100
// model_fovx 37
// model_fovy 34
// model_origin 100 100 100
visible 1
decoration
cvarTest expanded_menu_enabled
@ -629,10 +631,10 @@
showCvar { 1 }
}
// Common button
// Comfort button
itemDef
{
name commoncontrolbutton_glow
name comfortbutton_glow
group mods
style WINDOW_STYLE_SHADER
rect 120 173 170 30
@ -644,9 +646,9 @@
itemDef
{
name commoncontrolbutton
name comfortcontrolbutton
group none
text @MENUS_VR_COMMON_CONTROLS_ITEM
text @MENUS_VR_COMFORT_CONTROLS_ITEM
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect 120 173 170 30
@ -658,30 +660,28 @@
textstyle 3
forecolor 0.65 0.65 1 1
visible 1
descText @MENUS_VR_COMMON_CONTROLS_DESC
descText @MENUS_VR_COMFORT_CONTROLS_DESC
mouseEnter
{
show commoncontrolbutton_glow
show comfortbutton_glow
}
mouseExit
{
hide commoncontrolbutton_glow
hide comfortbutton_glow
}
action
{
play sound/interface/button1
show setup_background
hide weaponcontrols
hide forcecontrols
show commoncontrols
hide invcontrols
hide comfortcontrols
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor commoncontrolbutton forecolor 1 1 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
show setup_background
show comfortcontrols
hide weaponcontrols
hide forcecontrols
hide invcontrols
setitemcolor comfortcontrolbutton forecolor 1 1 1 1
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
}
}
@ -727,17 +727,15 @@
action
{
play sound/interface/button1
show setup_background
show weaponcontrols
hide forcecontrols
hide commoncontrols
hide invcontrols
hide comfortcontrols
setitemcolor weaponscontrolbutton forecolor 1 1 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
show setup_background
hide comfortcontrols
show weaponcontrols
hide forcecontrols
hide invcontrols
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
setitemcolor weaponscontrolbutton forecolor 1 1 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
}
}
@ -783,17 +781,15 @@
action
{
play sound/interface/button1
show setup_background
show setup_background
hide comfortcontrols
hide weaponcontrols
show forcecontrols
hide commoncontrols
hide invcontrols
hide comfortcontrols
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 1 1 1 1
setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
show forcecontrols
hide invcontrols
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 1 1 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
}
}
@ -826,7 +822,7 @@
textstyle 3
forecolor 0.65 0.65 1 1
visible 1
descText @MENUS_VR_POWER_CONTROLS_DESC
descText @MENUS_VR_INVENTORY_CONTROLS_DESC
mouseEnter
{
@ -839,73 +835,15 @@
action
{
play sound/interface/button1
show setup_background
show setup_background
hide comfortcontrols
hide weaponcontrols
hide forcecontrols
hide commoncontrols
show invcontrols
hide comfortcontrols
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 1 1 1 1
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
}
}
// comfort button
itemDef
{
name comfortcontrolbutton_glow
group mods
style WINDOW_STYLE_SHADER
rect 120 293 170 30
background "gfx/menus/menu_blendbox2" // Frame around button
forecolor 1 1 1 1
visible 0
decoration
}
itemDef
{
name comfortcontrolbutton
group none
text @MENUS_VR_COMFORT_CONTROLS_ITEM
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect 120 293 170 30
font 3
textscale 0.9
textalignx 170
textaligny 5
textalign ITEM_ALIGN_RIGHT
textstyle 3
forecolor 0.65 0.65 1 1
visible 1
descText @MENUS_VR_COMFORT_CONTROLS_DESC
mouseEnter
{
show comfortcontrolbutton_glow
}
mouseExit
{
hide comfortcontrolbutton_glow
}
action
{
play sound/interface/button1
show setup_background
hide weaponcontrols
hide forcecontrols
hide commoncontrols
hide invcontrols
show comfortcontrols
show invcontrols
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
setitemcolor comfortcontrolbutton forecolor 1 1 1 1
setitemcolor inventorycontrolbutton forecolor 1 1 1 1
}
}
@ -1103,16 +1041,16 @@
//----------------------------------------------------------------------------------------------
//
// COMMON MENU
// COMFORT MENU
//
//----------------------------------------------------------------------------------------------
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_SLIDER
text @MENUS_VR_MOVEMENT_SPEED_ITEM
cvarfloat "vr_movement_multiplier" 0.1 0.4 1.2
cvarfloat "vr_movement_multiplier" 0 0.4 1.2
rect 305 191 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
@ -1142,7 +1080,7 @@
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_DIRECTION_MODE_ITEM
cvar "vr_walkdirection"
@ -1181,7 +1119,7 @@
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_SMOOTH_TURN_ITEM
cvar "vr_turn_mode"
@ -1219,7 +1157,7 @@
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_TURN_ANGLE_ITEM
cvar "vr_turn_angle"
@ -1257,7 +1195,7 @@
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_YESNO
text @MENUS_VR_SWITCH_STICKS_ITEM
cvar "vr_switch_sticks"
@ -1289,7 +1227,7 @@
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_LEFT_HANDED_ITEM
cvar "vr_control_scheme"
@ -1323,6 +1261,143 @@
}
}
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_YESNO
text @MENUS_VR_IMMERSIVE_CINEMATICS_ITEM
cvar "vr_immersive_cinematics"
rect 305 311 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_IMMERSIVE_CINEMATICS_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight8
}
mouseexit
{
hide highlight8
}
}
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_SCREEN_DISTANCE_ITEM
cvar "vr_screen_dist"
cvarFloatList
{
@MENUS_VR_SCREEN_DISTANCE_NEAR 1.5
@MENUS_VR_SCREEN_DISTANCE_MEDIUM 2.5
@MENUS_VR_SCREEN_DISTANCE_FAR 3.5
}
rect 305 331 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_SCREEN_DISTANCE_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight9
}
mouseexit
{
hide highlight9
}
}
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_SLIDER
text @MENUS_VR_HEIGHT_ADJUST_ITEM
cvarfloat "cg_heightAdjust" 0 0 1
rect 305 351 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 highlight10
}
mouseexit
{
hide highlight10
}
}
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_YESNO
text @MENUS_VR_CROUCH_TOGGLE_ITEM
cvar "vr_crouch_toggle"
rect 305 371 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_CROUCH_TOGGLE_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight11
}
mouseexit
{
hide highlight11
}
}
//----------------------------------------------------------------------------------------------
@ -1376,7 +1451,7 @@
group weaponcontrols
type ITEM_TYPE_SLIDER
text @MENUS_VR_WEAPON_PITCH_ITEM
cvarfloat "vr_weapon_pitchadjust" 5 -25 5
cvarfloat "vr_weapon_pitchadjust" 0 -25 5
rect 305 211 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
@ -1472,6 +1547,40 @@
}
itemDef
{
name none
group weaponcontrols
type ITEM_TYPE_SLIDER
text @MENUS_VR_WEAPON_VELOCITY_TRIGGER_ITEM
cvarfloat "vr_weapon_velocity_trigger" 0 1.5 2.5
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 @MENUS_VR_WEAPON_VELOCITY_TRIGGER_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight6
}
mouseexit
{
hide highlight6
}
}
//----------------------------------------------------------------------------------------------
@ -1513,6 +1622,74 @@
}
itemDef
{
name none
group forcecontrols
type ITEM_TYPE_YESNO
text @MENUS_VR_FORCE_MOTION_TRIGGER_TOGGLE_ITEM
cvar "vr_force_motion_controlled"
rect 340 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_FORCE_MOTION_TRIGGER_TOGGLE_ITEM
action
{
play sound/interface/button1
}
mouseenter
{
show highlight3
}
mouseexit
{
hide highlight3
}
}
itemDef
{
name none
group forcecontrols
type ITEM_TYPE_SLIDER
text @MENUS_VR_FORCE_VELOCITY_TRIGGER_ITEM
cvarfloat "vr_force_velocity_trigger" 0 1.5 2.5
rect 304 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 2
descText @MENUS_VR_FORCE_VELOCITY_TRIGGER_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight4
}
mouseexit
{
hide highlight4
}
}
//----------------------------------------------------------------------------------------------
@ -1551,183 +1728,5 @@
hide highlight2
}
}
//----------------------------------------------------------------------------------------------
//
// COMFORT MENU
//
//----------------------------------------------------------------------------------------------
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_YESNO
text @MENUS_VR_IMMERSIVE_CINEMATICS_ITEM
cvar "vr_immersive_cinematics"
rect 305 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 @MENUS_VR_IMMERSIVE_CINEMATICS_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight2
}
mouseexit
{
hide highlight2
}
}
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_SCREEN_DISTANCE_ITEM
cvar "vr_screen_dist"
cvarFloatList
{
@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
textalignx 151
textaligny -2
font 2
textscale 0.8
forecolor 1 1 1 1
visible 0
// appearance_slot 1
descText @MENUS_VR_SCREEN_DISTANCE_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight3
}
mouseexit
{
hide highlight3
}
}
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
}
}
//----------------------------------------------------------------------------------------------
//
// Text
//
//----------------------------------------------------------------------------------------------
itemDef
{
name keyBindStatus
group none
ownerdraw 250 // UI_KEYBINDSTATUS
text @MENUS2_BLANK_1
rect 375 425 0 0
textStyle 0
font 2
textscale .8
textalign ITEM_ALIGN_CENTER
forecolor 1 1 0 1
visible 0
decoration
}
itemDef
{
name slider_message
group none
text @MENUS0_MOVE_THE_SLIDER_TO_INCREASE
rect 375 425 0 0
textStyle 0
font 2
textscale .8
textalign ITEM_ALIGN_CENTER
visible 0
decoration
}
itemDef
{
name yesno_message
group none
text @MENUS0_CLICK_ON_FIELD_TO_TOGGLE
rect 375 425 0 0
textStyle 0
font 2
textscale .8
textalign ITEM_ALIGN_CENTER
visible 0
decoration
}
itemDef
{
name multi_message
group none
text @MENUS0_CLICK_ON_FIELD_TO_CHANGE
rect 375 425 0 0
textStyle 0
font 2
textscale .8
textalign ITEM_ALIGN_CENTER
visible 0
decoration
}
}
}

View file

@ -19,13 +19,15 @@
onOpen
{
uiScript loadControls
hide forcecontrols
show commoncontrols
hide invcontrols
hide comfortcontrols
show setup_background
show comfortcontrols
hide weaponcontrols
hide forcecontrols
hide invcontrols
setitemcolor comfortcontrolbutton forecolor 1 1 1 1
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
}
onClose
@ -113,9 +115,9 @@
model_angle 90
model_rotation 3.5
asset_model "models/map_objects/bespin/jk2logo.md3"
// model_fovx 37
// model_fovy 34
// model_origin 100 100 100
// model_fovx 37
// model_fovy 34
// model_origin 100 100 100
visible 1
decoration
cvarTest expanded_menu_enabled
@ -629,10 +631,10 @@
showCvar { 1 }
}
// Common button
// Comfort button
itemDef
{
name commoncontrolbutton_glow
name comfortbutton_glow
group mods
style WINDOW_STYLE_SHADER
rect 120 173 170 30
@ -644,9 +646,9 @@
itemDef
{
name commoncontrolbutton
name comfortcontrolbutton
group none
text @MENUS_VR_COMMON_CONTROLS_ITEM
text @MENUS_VR_COMFORT_CONTROLS_ITEM
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect 120 173 170 30
@ -658,30 +660,28 @@
textstyle 3
forecolor 0.65 0.65 1 1
visible 1
descText @MENUS_VR_COMMON_CONTROLS_DESC
descText @MENUS_VR_COMFORT_CONTROLS_DESC
mouseEnter
{
show commoncontrolbutton_glow
show comfortbutton_glow
}
mouseExit
{
hide commoncontrolbutton_glow
hide comfortbutton_glow
}
action
{
play sound/interface/button1
show setup_background
hide weaponcontrols
hide forcecontrols
show commoncontrols
hide invcontrols
hide comfortcontrols
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor commoncontrolbutton forecolor 1 1 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
show setup_background
show comfortcontrols
hide weaponcontrols
hide forcecontrols
hide invcontrols
setitemcolor comfortcontrolbutton forecolor 1 1 1 1
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
}
}
@ -727,17 +727,15 @@
action
{
play sound/interface/button1
show setup_background
show weaponcontrols
hide forcecontrols
hide commoncontrols
hide invcontrols
hide comfortcontrols
setitemcolor weaponscontrolbutton forecolor 1 1 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
show setup_background
hide comfortcontrols
show weaponcontrols
hide forcecontrols
hide invcontrols
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
setitemcolor weaponscontrolbutton forecolor 1 1 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
}
}
@ -783,17 +781,15 @@
action
{
play sound/interface/button1
show setup_background
show setup_background
hide comfortcontrols
hide weaponcontrols
show forcecontrols
hide commoncontrols
hide invcontrols
hide comfortcontrols
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 1 1 1 1
setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
show forcecontrols
hide invcontrols
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 1 1 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
}
}
@ -826,7 +822,7 @@
textstyle 3
forecolor 0.65 0.65 1 1
visible 1
descText @MENUS_VR_POWER_CONTROLS_DESC
descText @MENUS_VR_INVENTORY_CONTROLS_DESC
mouseEnter
{
@ -839,73 +835,15 @@
action
{
play sound/interface/button1
show setup_background
show setup_background
hide comfortcontrols
hide weaponcontrols
hide forcecontrols
hide commoncontrols
show invcontrols
hide comfortcontrols
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 1 1 1 1
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
}
}
// comfort button
itemDef
{
name comfortcontrolbutton_glow
group mods
style WINDOW_STYLE_SHADER
rect 120 293 170 30
background "gfx/menus/menu_blendbox2" // Frame around button
forecolor 1 1 1 1
visible 0
decoration
}
itemDef
{
name comfortcontrolbutton
group none
text @MENUS_VR_COMFORT_CONTROLS_ITEM
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect 120 293 170 30
font 3
textscale 0.9
textalignx 170
textaligny 5
textalign ITEM_ALIGN_RIGHT
textstyle 3
forecolor 0.65 0.65 1 1
visible 1
descText @MENUS_VR_COMFORT_CONTROLS_DESC
mouseEnter
{
show comfortcontrolbutton_glow
}
mouseExit
{
hide comfortcontrolbutton_glow
}
action
{
play sound/interface/button1
show setup_background
hide weaponcontrols
hide forcecontrols
hide commoncontrols
hide invcontrols
show comfortcontrols
show invcontrols
setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1
setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1
setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1
setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1
setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1
setitemcolor comfortcontrolbutton forecolor 1 1 1 1
setitemcolor inventorycontrolbutton forecolor 1 1 1 1
}
}
@ -1103,16 +1041,16 @@
//----------------------------------------------------------------------------------------------
//
// COMMON MENU
// COMFORT MENU
//
//----------------------------------------------------------------------------------------------
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_SLIDER
text @MENUS_VR_MOVEMENT_SPEED_ITEM
cvarfloat "vr_movement_multiplier" 0.1 0.4 1.2
cvarfloat "vr_movement_multiplier" 0 0.4 1.2
rect 305 191 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
@ -1142,7 +1080,7 @@
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_DIRECTION_MODE_ITEM
cvar "vr_walkdirection"
@ -1181,7 +1119,7 @@
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_SMOOTH_TURN_ITEM
cvar "vr_turn_mode"
@ -1219,7 +1157,7 @@
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_TURN_ANGLE_ITEM
cvar "vr_turn_angle"
@ -1257,7 +1195,7 @@
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_YESNO
text @MENUS_VR_SWITCH_STICKS_ITEM
cvar "vr_switch_sticks"
@ -1289,7 +1227,7 @@
itemDef
{
name none
group commoncontrols
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_LEFT_HANDED_ITEM
cvar "vr_control_scheme"
@ -1323,6 +1261,144 @@
}
}
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_YESNO
text @MENUS_VR_IMMERSIVE_CINEMATICS_ITEM
cvar "vr_immersive_cinematics"
rect 305 311 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_IMMERSIVE_CINEMATICS_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight8
}
mouseexit
{
hide highlight8
}
}
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_SCREEN_DISTANCE_ITEM
cvar "vr_screen_dist"
cvarFloatList
{
@MENUS_VR_SCREEN_DISTANCE_NEAR 1.5
@MENUS_VR_SCREEN_DISTANCE_MEDIUM 2.5
@MENUS_VR_SCREEN_DISTANCE_FAR 3.5
}
rect 305 331 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_SCREEN_DISTANCE_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight9
}
mouseexit
{
hide highlight9
}
}
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_SLIDER
text @MENUS_VR_HEIGHT_ADJUST_ITEM
cvarfloat "cg_heightAdjust" 0 0 1
rect 305 351 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 highlight10
}
mouseexit
{
hide highlight10
}
}
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_YESNO
text @MENUS_VR_CROUCH_TOGGLE_ITEM
cvar "vr_crouch_toggle"
rect 305 371 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_CROUCH_TOGGLE_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight11
}
mouseexit
{
hide highlight11
}
}
//----------------------------------------------------------------------------------------------
//
@ -1375,7 +1451,7 @@
group weaponcontrols
type ITEM_TYPE_SLIDER
text @MENUS_VR_WEAPON_PITCH_ITEM
cvarfloat "vr_weapon_pitchadjust" 5 -25 5
cvarfloat "vr_weapon_pitchadjust" 0 -25 5
rect 305 211 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
@ -1471,6 +1547,40 @@
}
itemDef
{
name none
group weaponcontrols
type ITEM_TYPE_SLIDER
text @MENUS_VR_WEAPON_VELOCITY_TRIGGER_ITEM
cvarfloat "vr_weapon_velocity_trigger" 0 1.5 2.5
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 @MENUS_VR_WEAPON_VELOCITY_TRIGGER_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight6
}
mouseexit
{
hide highlight6
}
}
//----------------------------------------------------------------------------------------------
@ -1512,6 +1622,74 @@
}
itemDef
{
name none
group forcecontrols
type ITEM_TYPE_YESNO
text @MENUS_VR_FORCE_MOTION_TRIGGER_TOGGLE_ITEM
cvar "vr_force_motion_controlled"
rect 340 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_FORCE_MOTION_TRIGGER_TOGGLE_ITEM
action
{
play sound/interface/button1
}
mouseenter
{
show highlight3
}
mouseexit
{
hide highlight3
}
}
itemDef
{
name none
group forcecontrols
type ITEM_TYPE_SLIDER
text @MENUS_VR_FORCE_VELOCITY_TRIGGER_ITEM
cvarfloat "vr_force_velocity_trigger" 0 1.5 2.5
rect 304 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 2
descText @MENUS_VR_FORCE_VELOCITY_TRIGGER_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight4
}
mouseexit
{
hide highlight4
}
}
//----------------------------------------------------------------------------------------------
@ -1550,183 +1728,5 @@
hide highlight2
}
}
//----------------------------------------------------------------------------------------------
//
// COMFORT MENU
//
//----------------------------------------------------------------------------------------------
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_YESNO
text @MENUS_VR_IMMERSIVE_CINEMATICS_ITEM
cvar "vr_immersive_cinematics"
rect 305 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 @MENUS_VR_IMMERSIVE_CINEMATICS_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight2
}
mouseexit
{
hide highlight2
}
}
itemDef
{
name none
group comfortcontrols
type ITEM_TYPE_MULTI
text @MENUS_VR_SCREEN_DISTANCE_ITEM
cvar "vr_screen_dist"
cvarFloatList
{
@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
textalignx 151
textaligny -2
font 2
textscale 0.8
forecolor 1 1 1 1
visible 0
// appearance_slot 1
descText @MENUS_VR_SCREEN_DISTANCE_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight3
}
mouseexit
{
hide highlight3
}
}
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
}
}
//----------------------------------------------------------------------------------------------
//
// Text
//
//----------------------------------------------------------------------------------------------
itemDef
{
name keyBindStatus
group none
ownerdraw 250 // UI_KEYBINDSTATUS
text @MENUS2_BLANK_1
rect 320 425 0 0
textStyle 0
font 2
textscale .8
textalign ITEM_ALIGN_CENTER
forecolor .235 .882 .847 1
visible 0
decoration
}
itemDef
{
name slider_message
group none
text @MENUS0_MOVE_THE_SLIDER_TO_INCREASE
rect 320 425 0 0
textStyle 0
font 2
textscale .8
textalign ITEM_ALIGN_CENTER
visible 0
decoration
}
itemDef
{
name yesno_message
group none
text @MENUS0_CLICK_ON_FIELD_TO_TOGGLE
rect 320 425 0 0
textStyle 0
font 2
textscale .8
textalign ITEM_ALIGN_CENTER
visible 0
decoration
}
itemDef
{
name multi_message
group none
text @MENUS0_CLICK_ON_FIELD_TO_CHANGE
rect 320 425 0 0
textStyle 0
font 2
textscale .8
textalign ITEM_ALIGN_CENTER
visible 0
decoration
}
}
}

View file

@ -644,7 +644,7 @@
feeder FEEDER_SAVEGAMES
notselectable
visible 1
columns 2 0 35 155 160 25 102
columns 2 0 35 168 173 25 102
mouseEnter
{
setitemcolor loadgamelist bordercolor .265 .824 .886 1

View file

@ -644,7 +644,7 @@
feeder FEEDER_SAVEGAMES
notselectable
visible 1
columns 2 0 35 155 160 25 102
columns 2 0 35 168 173 25 102
mouseEnter
{
setitemcolor savegamelist bordercolor .265 .824 .886 1

View file

@ -26,6 +26,12 @@
hide defaults
show setup_background ;
show video ;
setitemcolor video1menubutton forecolor 1 1 1 1 ;
setitemcolor video2menubutton forecolor 0.65 0.65 1 1 ;
setitemcolor soundmenubutton forecolor 0.65 0.65 1 1;
setitemcolor gameoptionmenubutton forecolor 0.65 0.65 1 1;
setitemcolor difficultymenubutton forecolor 0.65 0.65 1 1;
setitemcolor gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
}
onESC
@ -111,9 +117,9 @@
model_angle 90
model_rotation 3.5
asset_model "models/map_objects/bespin/jk2logo.md3"
// model_fovx 37
// model_fovy 34
// model_origin 100 100 100
// model_fovx 37
// model_fovy 34
// model_origin 100 100 100
visible 1
decoration
cvarTest expanded_menu_enabled
@ -1652,7 +1658,7 @@
group video2
type ITEM_TYPE_SLIDER
text @MENUS0_VIDEO_BRIGHTNESS
cvarfloat "r_gamma" 0.05 0.8 1.2
cvarfloat "r_gamma" 0 0.8 1.2
rect 305 251 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 120
@ -2694,40 +2700,6 @@
}
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
@ -2742,7 +2714,7 @@
@MENUS_VR_SABER_REALISM_CRITICAL 2
@MENUS_VR_SABER_REALISM_INSTANT 3
}
rect 315 231 300 20
rect 315 211 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2759,12 +2731,12 @@
mouseenter
{
show highlight4
show highlight3
}
mouseexit
{
hide highlight4
hide highlight3
}
}
@ -2781,7 +2753,7 @@
@MENUS_VR_FENCING_SPEED_DEFAULT 1.2
@MENUS_VR_FENCING_SPEED_FASTER 1.3
}
rect 315 251 300 20
rect 315 231 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2798,11 +2770,11 @@
mouseenter
{
show highlight5
show highlight4
}
mouseexit
{
hide highlight5
hide highlight4
}
}
@ -2820,7 +2792,7 @@
@MENUS2_JEDI_KNIGHT 2
@MENUS1_JEDI_MASTER 3
}
rect 315 291 300 20
rect 315 271 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2837,11 +2809,11 @@
mouseenter
{
show highlight7
show highlight6
}
mouseexit
{
hide highlight7
hide highlight6
}
}

View file

@ -651,7 +651,7 @@
feeder FEEDER_SAVEGAMES
notselectable
visible 1
columns 2 0 35 155 160 25 102
columns 2 0 35 168 173 25 102
mouseEnter
{
setitemcolor loadgamelist bordercolor .265 .824 .886 1

View file

@ -33,6 +33,13 @@
show video ;
show setup_background ;
hide highlights ;
setitemcolor video1menubutton forecolor 1 1 1 1 ;
setitemcolor video2menubutton forecolor 0.65 0.65 1 1 ;
setitemcolor soundmenubutton forecolor 0.65 0.65 1 1;
setitemcolor gameoptionmenubutton forecolor 0.65 0.65 1 1;
setitemcolor difficultymenubutton forecolor 0.65 0.65 1 1;
setitemcolor modsmenubutton forecolor 0.65 0.65 1 1;
setitemcolor gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
}
onESC
@ -117,9 +124,9 @@
model_angle 90
model_rotation 3.5
asset_model "models/map_objects/bespin/jk2logo.md3"
// model_fovx 37
// model_fovy 34
// model_origin 100 100 100
// model_fovx 37
// model_fovy 34
// model_origin 100 100 100
visible 1
decoration
cvarTest expanded_menu_enabled
@ -1745,7 +1752,7 @@
group video2
type ITEM_TYPE_SLIDER
text @MENUS0_VIDEO_BRIGHTNESS
cvarfloat "r_gamma" 0.05 0.8 1.2
cvarfloat "r_gamma" 0 0.8 1.2
rect 305 251 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 120
@ -2782,40 +2789,6 @@
}
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
@ -2830,7 +2803,7 @@
@MENUS_VR_SABER_REALISM_CRITICAL 2
@MENUS_VR_SABER_REALISM_INSTANT 3
}
rect 315 231 300 20
rect 315 211 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2847,12 +2820,12 @@
mouseenter
{
show highlight4
show highlight3
}
mouseexit
{
hide highlight4
hide highlight3
}
}
@ -2869,7 +2842,7 @@
@MENUS_VR_FENCING_SPEED_DEFAULT 1.2
@MENUS_VR_FENCING_SPEED_FASTER 1.3
}
rect 315 251 300 20
rect 315 231 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2886,12 +2859,12 @@
mouseenter
{
show highlight5
show highlight4
}
mouseexit
{
hide highlight5
hide highlight4
}
}