From 84f1ab62e0123ee87a0cc636aa3bb81304416a14 Mon Sep 17 00:00:00 2001 From: eternalcodes Date: Thu, 29 Sep 2016 23:57:42 -0500 Subject: [PATCH] Remove japro support --- assets/ui/jamp/controls.menu | 403 ---------- assets/ui/jamp/ingame.menu | 184 +---- assets/ui/jamp/ingame_callvote.menu | 139 ---- assets/ui/jamp/ingame_camera.menu | 209 +----- assets/ui/jamp/ingame_controls.menu | 519 +------------ assets/ui/jamp/ingame_player.menu | 149 +--- assets/ui/jamp/ingame_race.menu | 419 ----------- assets/ui/jamp/ingame_setup.menu | 954 ++---------------------- assets/ui/jamp/ingame_spectator.menu | 127 ---- assets/ui/jamp/ingame_strafehelper.menu | 690 ----------------- assets/ui/jampingame.txt | 3 - codemp/ui/ui_cvar.c | 3 - codemp/ui/ui_main.c | 8 - codemp/ui/ui_xcvar.h | 5 - tools/travis-build.sh | 15 +- 15 files changed, 87 insertions(+), 3740 deletions(-) delete mode 100644 assets/ui/jamp/ingame_race.menu delete mode 100644 assets/ui/jamp/ingame_spectator.menu delete mode 100644 assets/ui/jamp/ingame_strafehelper.menu diff --git a/assets/ui/jamp/controls.menu b/assets/ui/jamp/controls.menu index af20410adc..fccb6e9f7e 100644 --- a/assets/ui/jamp/controls.menu +++ b/assets/ui/jamp/controls.menu @@ -30,7 +30,6 @@ hide quickcontrols ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 1 1 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -39,7 +38,6 @@ setitemcolor quickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } onClose @@ -492,7 +490,6 @@ hide forcecontrols2 ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 1 1 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -500,7 +497,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -555,7 +551,6 @@ hide forcecontrols2 ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 1 1 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -563,7 +558,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -617,7 +611,6 @@ hide forcecontrols2 ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 1 1 1 ; @@ -625,7 +618,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -679,7 +671,6 @@ hide forcecontrols2 ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -687,7 +678,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -740,7 +730,6 @@ show forcecontrols2 ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -748,7 +737,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 1 1 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -802,7 +790,6 @@ hide forcecontrols2 ; show joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -810,7 +797,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 1 1 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -864,7 +850,6 @@ hide forcecontrols2 ; hide joycontrols ; show othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -872,69 +857,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 1 1 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; - } - } - - // japro button - itemDef - { - name japrocontrolbutton_glow - group mods - style WINDOW_STYLE_SHADER - rect 80 353 180 24 - background "gfx/menus/menu_blendbox2" // Frame around button - forecolor 1 1 1 1 - visible 0 - decoration - } - - itemDef - { - name japrocontrolbutton - group none - text japro - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_EMPTY - rect 80 353 170 24 - font 3 - textscale 0.9 - textalignx 160 - textaligny 2 - textalign ITEM_ALIGN_RIGHT - textstyle 0 - forecolor 1 .682 0 1 - visible 1 - descText "Configure your jaPRO controls." - - mouseEnter - { - show japrocontrolbutton_glow - } - mouseExit - { - hide japrocontrolbutton_glow - } - action - { - play "sound/interface/button1.wav" ; - show setup_background ; - hide movecontrols ; - hide attackcontrols ; - hide weaponcontrols ; - hide forcecontrols ; - hide forcecontrols2 ; - hide joycontrols ; - hide othercontrols ; - show japrocontrols ; - setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; - setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; - setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; - setitemcolor forcecontrolbutton forecolor 1 .682 0 1 ; - setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; - setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; - setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 1 1 1 ; } } @@ -3593,331 +3515,6 @@ play "sound/interface/button1.wav" ; } } - -//---------------------------------------------------------------------------------------------- -// -// JAPRO BINDING -// -//---------------------------------------------------------------------------------------------- - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Jetpack:" - cvar "+button12" - rect 260 188 340 14 - textalign ITEM_ALIGN_RIGHT - textalignx 174 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Gives Jetpack" - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight1 - show keybindstatus - } - mouseexit - { - hide highlight1 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Dash:" - cvar "+button13" - rect 260 202 340 14 - textalign ITEM_ALIGN_RIGHT - textalignx 174 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Dash in any direction with the Warsow movement style." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight2 - show keybindstatus - } - mouseexit - { - hide highlight2 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Throw Flag:" - cvar "throwflag" - rect 260 216 340 14 - textalign ITEM_ALIGN_RIGHT - textalignx 174 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Throw your team's flag in CTF mode." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight3 - show keybindstatus - } - mouseexit - { - hide highlight3 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Zoom:" - cvar "+zoom" - rect 260 230 340 14 - textalign ITEM_ALIGN_RIGHT - textalignx 174 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "If held, allows player to zoom in." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight4 - show keybindstatus - } - mouseexit - { - hide highlight4 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Full Force Challenge:" - cvar "engage_fullforceduel" - rect 260 244 340 14 - textalign ITEM_ALIGN_RIGHT - textalignx 174 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Challenge an enemy to a private full force duel, or accept another's challenge." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight5 - show keybindstatus - } - mouseexit - { - hide highlight5 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Gun Challenge:" - cvar "engage_gunduel" - rect 260 259 340 14 - textalign ITEM_ALIGN_RIGHT - textalignx 174 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Challenge an enemy to a private gun duel, or accept another's challenge." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight6 - show keybindstatus - } - mouseexit - { - hide highlight6 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Teleport Mark:" - cvar "amTeleMark" - rect 260 274 340 14 - textalign ITEM_ALIGN_RIGHT - textalignx 174 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Mark a position to teleport back to." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight7 - show keybindstatus - } - mouseexit - { - hide highlight7 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Teleport:" - cvar "amTele" - rect 260 289 340 14 - textalign ITEM_ALIGN_RIGHT - textalignx 174 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Teleport to a teleport mark." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight8 - show keybindstatus - } - mouseexit - { - hide highlight8 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Noclip:" - cvar "noclip" - rect 260 304 340 14 - textalign ITEM_ALIGN_RIGHT - textalignx 174 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Freely fly around the map in race mode. Use left-click and right-click to move faster." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight9 - show keybindstatus - } - mouseexit - { - hide highlight9 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "FlipKick:" - cvar "flipkick" - rect 260 319 340 14 - textalign ITEM_ALIGN_RIGHT - textalignx 174 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Move forward and tap to flip kick your enemies." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight10 - show keybindstatus - } - mouseexit - { - hide highlight10 - hide keybindstatus - } - } //---------------------------------------------------------------------------------------------- // diff --git a/assets/ui/jamp/ingame.menu b/assets/ui/jamp/ingame.menu index 22a01491a9..ddf6558520 100644 --- a/assets/ui/jamp/ingame.menu +++ b/assets/ui/jamp/ingame.menu @@ -613,48 +613,6 @@ //------------------------------------------- // Bottom Bar //------------------------------------------- - itemDef - { - name spectatorButton - group none - style WINDOW_STYLE_SHADER - rect 295 464 50 16 - background "gfx/menus/menu_buttonback" // Frame around button - forecolor 1 1 1 1 - decoration - visible 0 - } - - itemDef - { - name spectator - text "Spec" - type 1 - style WINDOW_STYLE_FILLED - rect 295 464 50 16 - font 2 - textscale .7 - textstyle 3 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny -2 - forecolor 1 .682 0 1 - backcolor 0 0 0 0 - visible 1 - action - { - play "sound/interface/button1.wav" ; - open spectatormenu - } - mouseenter - { - show spectatorButton - } - mouseexit - { - hide spectatorButton - } - } itemDef { @@ -698,102 +656,13 @@ hide browserButton } } - - itemDef - { - name raceButton - //group none - style WINDOW_STYLE_SHADER - rect 345 464 50 16 - background "gfx/menus/menu_buttonback" // Frame around button - forecolor 1 1 1 1 - decoration - visible 0 - } - - itemDef - { - name race - text "Race" - type 1 - style WINDOW_STYLE_FILLED - rect 345 464 50 16 - font 2 - textscale .7 - textstyle 3 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny -2 - forecolor 1 .682 0 1 - backcolor 0 0 0 0 - visible 1 - action - { - play "sound/interface/button1.wav" ; - open racemenu - } - mouseenter - { - show raceButton - } - mouseexit - { - hide raceButton - } - } -/* - itemDef - { - name printstatsButton - group none - style WINDOW_STYLE_SHADER - rect 295 464 50 16 - background "gfx/menus/menu_buttonback" // Frame around button - forecolor 1 1 1 1 - decoration - visible 0 - } - - itemDef - { - name printstats - text "Printstats" - type 1 - style WINDOW_STYLE_FILLED - rect 295 464 50 16 - font 2 - textscale .7 - textstyle 3 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny -2 - forecolor 1 .682 0 1 - backcolor 0 0 0 0 - visible 1 - cvartest "g_gametype" - showcvar { "6", "8" } - action - { - play "sound/interface/button1.wav" ; - exec "cmd printstats" ; - uiScript closeingame - } - mouseenter - { - show printstatsButton - } - mouseexit - { - hide printstatsButton - } - } -*/ + itemDef { name cameraButton group none style WINDOW_STYLE_SHADER - rect 245 464 50 46 + rect 195 464 50 46 background "gfx/menus/menu_buttonback" // Frame around button forecolor 1 1 1 1 decoration @@ -806,7 +675,7 @@ text "Camera" type 1 style WINDOW_STYLE_FILLED - rect 245 464 50 16 + rect 195 464 50 16 font 2 textscale .7 textstyle 3 @@ -831,55 +700,12 @@ } } - itemDef - { - name strafeHelperButton - group none - style WINDOW_STYLE_SHADER - rect 195 464 50 16 - background "gfx/menus/menu_buttonback" // Frame around button - forecolor 1 1 1 1 - decoration - visible 0 - } - - itemDef - { - name strafeHelper - text "Strafe H." - type 1 - style WINDOW_STYLE_FILLED - rect 195 464 50 16 - font 2 - textscale .7 - textstyle 3 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny -2 - forecolor 1 .682 0 1 - backcolor 0 0 0 0 - visible 1 - action - { - play "sound/interface/button1.wav" ; - open strafehelpermenu - } - mouseenter - { - show strafeHelperButton - } - mouseexit - { - hide strafeHelperButton - } - } - itemDef { name accountButton group none style WINDOW_STYLE_SHADER - rect 295 448 50 16 + rect 295 464 50 16 background "gfx/menus/menu_buttonback" // Frame around button forecolor 1 1 1 1 decoration @@ -892,7 +718,7 @@ text "Account" type 1 style WINDOW_STYLE_FILLED - rect 295 448 50 16 + rect 295 464 50 16 font 2 textscale .7 textstyle 3 diff --git a/assets/ui/jamp/ingame_callvote.menu b/assets/ui/jamp/ingame_callvote.menu index a42ae3d2a7..916ad9c58a 100644 --- a/assets/ui/jamp/ingame_callvote.menu +++ b/assets/ui/jamp/ingame_callvote.menu @@ -299,53 +299,6 @@ hide kick_glow } } - - itemDef - { - name forcespec_glow - group glows - style WINDOW_STYLE_SHADER - rect 0 155 120 30 - background "gfx/menus/menu_blendbox2" // Frame around button - forecolor 1 1 1 1 - visible 0 - decoration - } - - itemDef - { - name forcespecbutton - group grpbutton - text forcespec - descText "Force a player to spectator." - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_EMPTY - rect 10 155 103 30 - font 3 - textscale 0.9 - textalignx 100 - textaligny 5 - textstyle 3 - textalign ITEM_ALIGN_RIGHT - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - hide grpCallVote ; - show forcespec ; - setitemcolor grpbutton forecolor 1 .682 0 1 ; - setitemcolor forcespecbutton forecolor 1 1 1 1 ; - } - mouseEnter - { - show forcespec_glow - } - mouseExit - { - hide forcespec_glow - } - } //---------------------------------- // MISC VOTE PANEL @@ -1112,98 +1065,6 @@ } } - //---------------------------------- - // KICK VOTE PANEL - //---------------------------------- - itemDef - { - name forcespec - group grpCallVote - text "Forcespec Player:" - rect 120 35 230 20 - textalign 0 - textalignx 5 - textaligny -2 - font 2 - textscale .8 - forecolor .549 .854 1 1 - visible 0 - decoration - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name forcespec - group grpCallVote - descText "Select player to force to spec." - rect 120 55 230 138 - style WINDOW_STYLE_FILLED - type ITEM_TYPE_LISTBOX - elementwidth 120 - elementheight 15 - elementtype LISTBOX_TEXT - feeder FEEDER_PLAYER_LIST - border 1 - bordercolor 1 .682 0 .8 - backcolor 0 0 .5 .25 - outlinecolor .1 .1 .7 .5 - font 2 - textaligny 12 - textscale .8 - forecolor .615 .615 .956 1 - visible 0 - mouseEnter - { - fadein message_arena ; - setitemcolor forcespec bordercolor .7 0 0 1 - } - mouseExit - { - fadeout message_arena ; - setitemcolor forcespec bordercolor .5 .5 .5 1 - } - action - { - play "sound/interface/button1.wav" ; - } - - } - - itemDef - { - name forcespec - text @MENUS_OKAY - descText "Begin vote to force spec this player." - type 1 - group grpCallVote - style WINDOW_STYLE_FILLED - rect 140 216 80 30 - textalign ITEM_ALIGN_CENTER - textalignx 40 - textaligny 0 - font 3 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - uiScript voteForceSpec ; - uiScript closeingame - } - mouseEnter - { - show doneButton - } - mouseExit - { - hide doneButton - } - } } } diff --git a/assets/ui/jamp/ingame_camera.menu b/assets/ui/jamp/ingame_camera.menu index 76ad871a03..fc08044342 100644 --- a/assets/ui/jamp/ingame_camera.menu +++ b/assets/ui/jamp/ingame_camera.menu @@ -26,43 +26,17 @@ itemDef { - name hud - group camera - type ITEM_TYPE_MULTI - text "HUD:" - cvar cg_draw2d - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 6 4 54 20 - textalign ITEM_ALIGN_LEFT - textalignx 0 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name fpls + name gunThirdPerson group camera type ITEM_TYPE_MULTI - text "FPLS:" - cvar cg_fpls + text "Gun 3rd Person:" + cvar cg_thirdPerson cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 } - rect 67 4 59 20 + rect 12 4 88 20 textalign ITEM_ALIGN_LEFT textalignx 0 textaligny 0 @@ -78,17 +52,17 @@ itemDef { - name gunThirdPerson + name hud group camera type ITEM_TYPE_MULTI - text "Gun 3rd Person:" - cvar cg_thirdPerson + text "HUD:" + cvar cg_draw2d cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 } - rect 136 4 88 20 + rect 196 4 54 20 textalign ITEM_ALIGN_LEFT textalignx 0 textaligny 0 @@ -128,67 +102,6 @@ } } - itemDef - { - name zoomText - group camera - type ITEM_TYPE_TEXT - text "Zoom:" - cvar cg_draw2d - rect 136 24 34 20 - textalign ITEM_ALIGN_LEFT - textalignx 0 - textaligny 0 - font 4 - textscale 1 - forecolor 1 1 1 1 - visible 1 - } - - itemDef - { - name zoomEnable - group camera - type ITEM_TYPE_BUTTON - text "Enable" - cvar cg_draw2d - rect 180 24 36 20 - textalign ITEM_ALIGN_LEFT - textalignx 0 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "+zoom" - } - } - - itemDef - { - name zoomDisable - group camera - type ITEM_TYPE_BUTTON - text "Disable" - cvar cg_draw2d - rect 226 24 34 20 - textalign ITEM_ALIGN_LEFT - textalignx 0 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "-zoom" - } - } - itemDef { name fovSlider @@ -241,112 +154,6 @@ setcvar cg_fov "80.0000" } } - - itemDef - { - name gunFovSlider - group camera - type ITEM_TYPE_SLIDER - text "Gun FOV:" - cvarfloat "cg_gunfov" 0 0 140 - rect 10 64 156 20 - textalign ITEM_ALIGN_RIGHT - textalignx 52 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name gunFovField - group camera - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "cg_gunfov" - rect 176 64 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name gunFovReset - group camera - type ITEM_TYPE_BUTTON - text "Reset" - rect 226 64 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar cg_gunfov "0.00000" - } - } - - itemDef - { - name zoomFovSlider - group camera - type ITEM_TYPE_SLIDER - text "Zoom FOV:" - cvarfloat "cg_zoomfov" 40 0 176 - rect 10 84 156 20 - textalign ITEM_ALIGN_RIGHT - textalignx 52 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name zoomFovField - group camera - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "cg_zoomfov" - rect 176 84 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name zoomFovReset - group camera - type ITEM_TYPE_BUTTON - text "Reset" - rect 226 84 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar cg_zoomfov "40.0000" - } - } itemDef { diff --git a/assets/ui/jamp/ingame_controls.menu b/assets/ui/jamp/ingame_controls.menu index 09fd52c472..87b83e6121 100644 --- a/assets/ui/jamp/ingame_controls.menu +++ b/assets/ui/jamp/ingame_controls.menu @@ -44,7 +44,6 @@ hide forcecontrols2 ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 1 1 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -52,7 +51,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } // Overall window backdrop @@ -138,7 +136,6 @@ hide forcecontrols2 ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 1 1 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -146,7 +143,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -200,7 +196,6 @@ hide forcecontrols2 ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 1 1 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -208,7 +203,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -262,7 +256,6 @@ hide forcecontrols2 ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 1 1 1 ; @@ -270,7 +263,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -324,7 +316,6 @@ hide forcecontrols2 ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -332,7 +323,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -385,7 +375,6 @@ show forcecontrols2 ; hide joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -393,7 +382,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 1 1 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -447,7 +435,6 @@ hide forcecontrols2 ; show joycontrols ; hide othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -455,7 +442,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 1 1 1 ; setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; } } @@ -509,7 +495,6 @@ hide forcecontrols2 ; hide joycontrols ; show othercontrols ; - hide japrocontrols ; setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; @@ -517,69 +502,6 @@ setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; setitemcolor othercontrolbutton forecolor 1 1 1 1 ; - setitemcolor japrocontrolbutton forecolor 1 .682 0 1 ; - } - } - - // japro button - itemDef - { - name japrocontrolbutton_glow - group mods - style WINDOW_STYLE_SHADER - rect 20 253 185 30 - background "gfx/menus/menu_blendbox2" // Frame around button - forecolor 1 1 1 1 - visible 0 - decoration - } - - itemDef - { - name japrocontrolbutton - group none - text japro - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_EMPTY - rect 20 253 170 30 - font 3 - textscale 0.8 - textalignx 170 - textaligny 5 - textalign ITEM_ALIGN_RIGHT - textstyle 3 - forecolor 0.65 0.65 1 1 - visible 1 - descText "Configure your jaPRO controls." - - mouseEnter - { - show japrocontrolbutton_glow - } - mouseExit - { - hide japrocontrolbutton_glow - } - action - { - play "sound/interface/button1.wav" ; - show setup_background ; - hide movecontrols ; - hide attackcontrols ; - hide weaponcontrols ; - hide forcecontrols ; - hide forcecontrols2 ; - hide joycontrols ; - hide othercontrols ; - show japrocontrols ; - setitemcolor movementcontrolbutton forecolor 1 .682 0 1 ; - setitemcolor attackcontrolbutton forecolor 1 .682 0 1 ; - setitemcolor weaponscontrolbutton forecolor 1 .682 0 1 ; - setitemcolor forcecontrolbutton forecolor 1 .682 0 1 ; - setitemcolor forcecontrolbutton2 forecolor 1 .682 0 1 ; - setitemcolor mousejoystickcontrolbutton forecolor 1 .682 0 1 ; - setitemcolor othercontrolbutton forecolor 1 .682 0 1 ; - setitemcolor japrocontrolbutton forecolor 1 1 1 1 ; } } @@ -2508,7 +2430,7 @@ type ITEM_TYPE_YESNO text @MENUS_FREE_LOOK cvar "cl_freelook" - rect 220 61 300 20 + rect 220 81 300 20 textalign ITEM_ALIGN_RIGHT textalignx 151 textaligny 0 @@ -2541,7 +2463,7 @@ type ITEM_TYPE_SLIDER text @MENUS_SENSITIVITY cvarfloat "sensitivity" 5 2 30 - rect 220 81 300 20 + rect 220 101 300 20 textalign ITEM_ALIGN_RIGHT textalignx 151 textaligny 0 @@ -2565,37 +2487,6 @@ hide highlight3 } } - - itemDef - { - name mousejoystick - group joycontrols - type ITEM_TYPE_SLIDER - text "Scope Sensitivity:" - cvarfloat "cg_scopeSensitivity" 1 0 1 - rect 220 101 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Manually scale the sensitivity of Disruptor scope." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight4 - } - mouseexit - { - hide highlight4 - } - } itemDef { @@ -2663,69 +2554,6 @@ } } - itemDef - { - name mousejoystick - group joycontrols - type ITEM_TYPE_BIND - text "Zoom:" - cvar "+zoom" - rect 220 161 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "If held, allows player to zoom in." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight7 - } - - mouseexit - { - hide highlight7 - } - } - - itemDef - { - name mousejoystick - group joycontrols - type ITEM_TYPE_SLIDER - text "Zoom Sensitivity:" - cvarfloat "cg_zoomSensitivity" 0 0 30 - rect 220 181 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Adjust sensitivity when holding down the zoom button. If 0, it will be automatically scaled." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight8 - } - mouseexit - { - hide highlight8 - } - } - itemDef { name mousejoystick @@ -2733,7 +2561,7 @@ type ITEM_TYPE_YESNO text @MENUS_ENABLE_JOYSTICK cvar "in_joystick" - rect 220 221 300 20 + rect 220 201 300 20 textalign ITEM_ALIGN_RIGHT textalignx 151 textaligny 0 @@ -2767,7 +2595,7 @@ type ITEM_TYPE_SLIDER text @MENUS_JOYSTICK_THRESHOLD cvarfloat "joy_threshold" .15 .05 .75 - rect 220 241 300 20 + rect 220 221 300 20 textalign ITEM_ALIGN_RIGHT textalignx 151 textaligny 0 @@ -2799,7 +2627,7 @@ type ITEM_TYPE_YESNO text @MENUS_X_AXIS_AS_BUTTONS cvar "joy_xbutton" - rect 220 261 300 20 + rect 220 241 300 20 textalign ITEM_ALIGN_RIGHT textalignx 151 textaligny 0 @@ -2832,7 +2660,7 @@ type ITEM_TYPE_YESNO text @MENUS_Y_AXIS_AS_BUTTONS cvar "joy_ybutton" - rect 220 281 300 20 + rect 220 261 300 20 textalign ITEM_ALIGN_RIGHT textalignx 151 textaligny 0 @@ -3320,341 +3148,6 @@ } } -//---------------------------------------------------------------------------------------------- -// -// JAPRO BINDING -// -//---------------------------------------------------------------------------------------------- - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Jetpack:" - cvar "+button12" - rect 220 61 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - // appearance_slot 1 - descText "Gives Jetpack" - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight2 - show keybindstatus - } - mouseexit - { - hide highlight2 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Dash:" - cvar "+button13" - rect 220 81 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - // appearance_slot 2 - descText "Dash in any direction with the Warsow movement style." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight3 - show keybindstatus - } - mouseexit - { - hide highlight3 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Throw Flag:" - cvar "throwflag" - rect 220 101 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - // appearance_slot 3 - descText "Throw your team's flag in CTF mode." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight4 - show keybindstatus - } - mouseexit - { - hide highlight4 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Full Force Challenge:" - cvar "engage_fullforceduel" - rect 220 141 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - // appearance_slot 4 - descText "Challenge an enemy to a private full force duel, or accept another's challenge." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight6 - show keybindstatus - } - mouseexit - { - hide highlight6 - hide keybindstatus - } - } - - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Gun Challenge:" - cvar "engage_gunduel" - rect 220 161 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - // appearance_slot 4 - descText "Challenge an enemy to a private gun duel, or accept another's challenge." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight7 - show keybindstatus - } - mouseexit - { - hide highlight7 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Teleport Mark:" - cvar "amTeleMark" - rect 220 181 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - // appearance_slot 4 - descText "Mark a position to teleport back to." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight8 - show keybindstatus - } - mouseexit - { - hide highlight8 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Teleport:" - cvar "amTele" - rect 220 201 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - // appearance_slot 4 - descText "Teleport to a teleport mark." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight9 - show keybindstatus - } - mouseexit - { - hide highlight9 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Noclip:" - cvar "noclip" - rect 220 221 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - // appearance_slot 4 - descText "Freely fly around the map in race mode. Use left-click and right-click to move faster." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight10 - show keybindstatus - } - mouseexit - { - hide highlight10 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "FlipKick:" - cvar "flipkick" - rect 220 241 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - // appearance_slot 4 - descText "Move forward and tap to flip kick your enemies." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight11 - show keybindstatus - } - mouseexit - { - hide highlight11 - hide keybindstatus - } - } - - itemDef - { - group japrocontrols - type ITEM_TYPE_BIND - text "Spot:" - cvar "spot" - rect 220 261 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 151 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Place a marker on spotted enemies." - action - { - play "sound/interface/button1.wav" ; - } - - mouseenter - { - show highlight12 - show keybindstatus - } - mouseexit - { - hide highlight12 - hide keybindstatus - } - } - //---------------------------------------------------------------------------------------------- // // Text diff --git a/assets/ui/jamp/ingame_player.menu b/assets/ui/jamp/ingame_player.menu index 6e76928daa..ab6e5c068b 100644 --- a/assets/ui/jamp/ingame_player.menu +++ b/assets/ui/jamp/ingame_player.menu @@ -300,9 +300,9 @@ name customtitle style 0 text @MENUS_CUSTOM - rect 425 50 160 26 + rect 425 102 150 26 textalign ITEM_ALIGN_CENTER - textalignx 80 + textalignx 75 textaligny -3 outlinecolor 1 .5 .5 .5 backcolor 0 0 0 0 @@ -321,7 +321,7 @@ descText @MENUS_CUSTOMPLAYER_DESC type ITEM_TYPE_BUTTON style WINDOW_STYLE_SHADER - rect 470 76 75 75 + rect 465 132 75 75 font 3 textscale 1 textaligny -1 @@ -345,149 +345,6 @@ open ingame_player2 } } - -//------------------------------------------------------------------------------------------------ -// Custom Models -//------------------------------------------------------------------------------------------------ - itemDef - { - name defaultMale - type ITEM_TYPE_EDITFIELD - text "Default Male Model:" - cvar cg_defaultModel - rect 425 151 160 20 - textalign ITEM_ALIGN_RIGHT - textalignx 118 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - descText "Lets you specify the default male playermodel." - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name defaultFemale - type ITEM_TYPE_EDITFIELD - text "Default Female Model:" - cvar cg_defaultFemaleModel - rect 425 171 160 20 - textalign ITEM_ALIGN_RIGHT - textalignx 118 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - descText "Lets you specify the default female playermodel." - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name deferModels - type ITEM_TYPE_MULTI - text @MENUS_DEFER_PLAYER_MODELS - cvar cg_deferPlayers - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 425 191 160 20 - textalign ITEM_ALIGN_RIGHT - textalignx 118 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - descText @MENUS_DEFERS_LOADING_OF_NEW - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name forceModels - type ITEM_TYPE_MULTI - text @MENUS_FORCE_PLAYER_MODELS - cvar cg_forceModel - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 425 211 160 20 - textalign ITEM_ALIGN_RIGHT - textalignx 118 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - descText @MENUS_FORCE_ALL_PLAYER_MODELS - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name forceAlly - type ITEM_TYPE_EDITFIELD - text "Force Ally Model:" - cvar cg_forceAllyModel - rect 425 231 160 20 - textalign ITEM_ALIGN_RIGHT - textalignx 118 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - descText "Lets you force playermodel for allies." - cvarTest cg_forceModel - hideCvar { 1 } - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name forceEnemy - type ITEM_TYPE_EDITFIELD - text "Force Enemy Model:" - cvar cg_forceEnemyModel - rect 425 251 160 20 - textalign ITEM_ALIGN_RIGHT - textalignx 118 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - descText "Lets you force playermodel for enemies." - cvarTest cg_forceModel - hideCvar { 1 } - action - { - play "sound/interface/button1.wav" ; - } - } //------------------------------------------------------------------------------------------------ // Saber Setup diff --git a/assets/ui/jamp/ingame_race.menu b/assets/ui/jamp/ingame_race.menu deleted file mode 100644 index a021b17339..0000000000 --- a/assets/ui/jamp/ingame_race.menu +++ /dev/null @@ -1,419 +0,0 @@ -//----------------------------------------- -// MOVE MENU -//----------------------------------------- -{ - menuDef - { - name racemenu - visible 0 - fullScreen 0 - outOfBoundsClick - rect 262 352 238 88 - focusColor 1 1 1 1 - - - // Overall window backdrop - itemDef - { - name setup_background - group none - style WINDOW_STYLE_FILLED - rect 0 0 238 88 - backcolor 0 0 .35 .9 - forecolor 1 1 1 1 - border 1 - bordercolor 0 0 .8 1 - visible 1 - decoration - } - - itemDef - { - text JKA - type 1 - rect 2 4 50 20 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny 1 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd move jka" ; - uiScript closeingame - } - } - - itemDef - { - text PJK - type 1 - - rect 2 24 50 20 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny 1 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd move pjk" ; - uiScript closeingame - } - } - - itemDef - { - text QW - type 1 - rect 2 44 50 20 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny 1 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd move qw" ; - uiScript closeingame - } - } - - itemDef - { - text WSW - type 1 - rect 2 64 50 20 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny 1 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd move wsw" ; - uiScript closeingame - } - } - - itemDef - { - text Q3 - type 1 - rect 52 4 50 20 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny 1 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd move q3" ; - uiScript closeingame - } - } - - itemDef - { - text CPM - type 1 - rect 52 24 50 20 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny 1 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd move cpm" ; - uiScript closeingame - } - } - - itemDef - { - text RJQ3 - type 1 - rect 52 44 50 20 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny 1 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd move rjq3" ; - uiScript closeingame - } - } - - itemDef - { - text RJCPM - type 1 - rect 52 64 50 20 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny 1 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd move rjcpm" ; - uiScript closeingame - } - } - - itemDef - { - text Siege - type 1 - rect 102 4 50 20 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny 1 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd move siege" ; - uiScript closeingame - } - } - - itemDef - { - text Swoop - type 1 - rect 102 24 50 20 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny 1 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd move swoop" ; - uiScript closeingame - } - } - - itemDef - { - text JetPack - type 1 - rect 102 44 50 20 - textalign ITEM_ALIGN_CENTER - textalignx 25 - textaligny 1 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd move jetpack" ; - uiScript closeingame - } - } - - itemDef - { - text Jump - type 0 - rect 152 4 28 20 - textalign ITEM_ALIGN_LEFT - textalignx 0 - textaligny 1 - font 4 - textscale 1 - forecolor .6 .6 .6 1 - visible 1 - } - - itemDef - { - text 1 - type 1 - rect 182 4 14 20 - textalign ITEM_ALIGN_CENTER - textalignx 7 - textaligny -1 - font 3 - textscale .82 - forecolor .75 .75 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd jump 1" ; - uiScript closeingame - } - } - - itemDef - { - text 2 - type 1 - rect 196 4 14 20 - textalign ITEM_ALIGN_CENTER - textalignx 7 - textaligny -1 - font 3 - textscale .82 - forecolor .75 .75 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd jump 2" ; - uiScript closeingame - } - } - - itemDef - { - text 3 - type 1 - rect 210 4 14 20 - textalign ITEM_ALIGN_CENTER - textalignx 7 - textaligny -1 - font 3 - textscale .82 - forecolor .75 .75 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd jump 3" ; - uiScript closeingame - } - } - - itemDef - { - text RocketChange - type 1 - rect 152 24 78 20 - textalign ITEM_ALIGN_LEFT - textalignx 0 - textaligny 1 - font 4 - textscale 1 - forecolor .9 0 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd rocketChange" ; - uiScript closeingame - } - } - - itemDef - { - text Practice - type 1 - rect 152 44 42 20 - textalign ITEM_ALIGN_LEFT - textalignx 0 - textaligny 1 - font 4 - textscale 1 - forecolor .8 0 .8 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd practice" ; - uiScript closeingame - } - } - - itemDef - { - text / - type 0 - rect 196 44 4 20 - textalign ITEM_ALIGN_LEFT - textalignx 0 - textaligny 1 - font 4 - textscale 1 - forecolor 1 1 1 1 - visible 1 - } - - itemDef - { - text Hide - type 1 - rect 202 44 24 20 - textalign ITEM_ALIGN_LEFT - textalignx 0 - textaligny 1 - font 4 - textscale 1 - forecolor 0 .7 .7 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd hide" ; - uiScript closeingame - } - } - - itemDef - { - text "RACE!" - type 1 - rect 121 64 62 20 - textalign ITEM_ALIGN_CENTER - textalignx 31 - textaligny -4 - font 2 - textscale .95 - forecolor 0 1 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd race" ; - uiScript closeingame - } - } - } -} \ No newline at end of file diff --git a/assets/ui/jamp/ingame_setup.menu b/assets/ui/jamp/ingame_setup.menu index a738b460f1..9cf0ccd733 100644 --- a/assets/ui/jamp/ingame_setup.menu +++ b/assets/ui/jamp/ingame_setup.menu @@ -32,7 +32,6 @@ hide advancedlighting hide vidrestart hide visuals - hide morevisuals hide hud hide sound hide options @@ -142,7 +141,6 @@ hide advancedlighting hide vidrestart hide visuals - hide morevisuals hide hud hide sound hide options @@ -207,7 +205,6 @@ hide advancedlighting hide vidrestart hide visuals - hide morevisuals hide hud hide sound hide options @@ -272,7 +269,6 @@ hide advancedlighting hide vidrestart show visuals - hide morevisuals hide hud hide sound hide options @@ -337,7 +333,6 @@ hide advancedlighting hide vidrestart hide visuals - hide morevisuals show hud hide sound hide options @@ -402,7 +397,6 @@ hide advancedlighting hide vidrestart hide visuals - hide morevisuals hide hud show sound hide options @@ -467,7 +461,6 @@ hide advancedlighting hide vidrestart hide visuals - hide morevisuals hide hud hide sound show options @@ -533,7 +526,6 @@ hide advancedlighting hide vidrestart hide visuals - hide morevisuals hide hud hide sound hide options @@ -613,7 +605,6 @@ hide advancedlighting hide vidrestart hide visuals - hide morevisuals hide hud hide sound hide options @@ -2272,17 +2263,11 @@ itemDef { - name blood + name consoleopacity group visuals - type ITEM_TYPE_MULTI - text "Blood:" - cvar "com_blood" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - "On + Gibs" 2 - } + type ITEM_TYPE_SLIDER + text "Console Opacity:" + cvarFloat "con_opacity" 1 0 1 rect 220 63 300 20 textalign ITEM_ALIGN_RIGHT textalignx 165 @@ -2291,49 +2276,23 @@ textscale 1 forecolor .615 .615 .956 1 visible 0 - descText "Toggle to display display blood." + descText "Adjust the console's opacity." action { play "sound/interface/button1" } mouseenter { show highlight2 } mouseexit { hide highlight2 } } itemDef - { - name showabsorb + { + name simpleitems group visuals type ITEM_TYPE_MULTI - text "Always Show Absorb:" - cvar "cg_alwaysShowAbsorb" + text @MENUS_SIMPLE_ITEMS + cvar "cg_simpleItems" cvarFloatList { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 83 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to always display absorb when active." - action { play "sound/interface/button1" } - mouseenter { show highlight3 } - mouseexit { hide highlight3 } - } - - itemDef - { - name ysalshell - group visuals - type ITEM_TYPE_MULTI - text "Draw Ysal Shell:" - cvar "cg_drawYsalShell" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 + @MENUS_OFF 0 + @MENUS_ON 1 } rect 220 103 300 20 textalign ITEM_ALIGN_RIGHT @@ -2343,7 +2302,7 @@ textscale 1 forecolor .615 .615 .956 1 visible 0 - descText "Toggle to draw ysal shell." + descText @MENUS_RENDER_ICONS_FOR_ITEMS action { play "sound/interface/button1" } mouseenter { show highlight4 } mouseexit { hide highlight4 } @@ -2351,11 +2310,16 @@ itemDef { - name flagalpha + name wall_marks group visuals - type ITEM_TYPE_SLIDER - text "Flag Opacity:" - cvarFloat "cg_thirdPersonFlagAlpha" 1 0 1 + type ITEM_TYPE_MULTI + text @MENUS_WALL_MARKS + cvar "cg_marks" + cvarFloatList + { + @MENUS_OFF 0 + @MENUS_ON 1 + } rect 220 123 300 20 textalign ITEM_ALIGN_RIGHT textalignx 165 @@ -2364,7 +2328,7 @@ textscale 1 forecolor .615 .615 .956 1 visible 0 - descText "Adjust opacity of flag in third person." + descText @MENUS_TOGGLE_TO_DISPLAY_SCORCH action { play "sound/interface/button1" } mouseenter { show highlight5 } mouseexit { hide highlight5 } @@ -2444,33 +2408,6 @@ mouseexit { hide highlight6 } } - itemDef - { - name screenshake - group visuals - type ITEM_TYPE_MULTI - text "Screen Shake:" - cvar "cg_screenShake" - cvarFloatList - { - @MENUS_OFF 0 - "While taking damage." 1 - "Also during charging and firing a weapon." 2 - } - rect 220 163 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to remove screen shaking." - action { play "sound/interface/button1" } - mouseenter { show highlight7 } - mouseexit { hide highlight7 } - } - itemDef { name drawgun @@ -2479,333 +2416,6 @@ text "Draw Gun:" cvar "cg_drawGun" cvarFloatList - { - @MENUS_OFF 0 - "Default" 1 - "Remove weapon bob while walking/running." 2 - "Also remove weapon while landing." 3 - "Also remove idle drift animation." 4 - } - rect 220 183 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to draw gun." - action { play "sound/interface/button1" } - mouseenter { show highlight8 } - mouseexit { hide highlight8 } - } - - itemDef - { - name playernames - group visuals - type ITEM_TYPE_MULTI - text "Draw Player Names:" - cvar "cg_drawPlayerNames" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - "On + Health Bar" 2 - } - rect 220 203 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to always display player names above heads." - action { play "sound/interface/button1" } - mouseenter { show highlight9 } - mouseexit { hide highlight9 } - } - - itemDef - { - name drawduelers - group visuals - type ITEM_TYPE_MULTI - text "Draw Duelers:" - cvar "cg_drawDuelers" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - "On + New Effect" 2 - } - rect 220 223 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to display duelers." - action { play "sound/interface/button1" } - mouseenter { show highlight10 } - mouseexit { hide highlight10 } - } - - itemDef - { - name drawracers - group visuals - type ITEM_TYPE_MULTI - text "Draw Racers:" - cvar "cg_drawRacers" - cvarFloatList - { - @MENUS_OFF 0 - "Only outside race mode" 1 - @MENUS_ON 2 - } - rect 220 243 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to display racers." - action { play "sound/interface/button1" } - mouseenter { show highlight11 } - mouseexit { hide highlight11 } - } - - itemDef - { - name morevisualsbutton_glow - style WINDOW_STYLE_SHADER - rect 260 265 200 16 - background "gfx/menus/menu_blendbox" - forecolor 1 0.5 0.5 1 - visible 0 - decoration - } - - itemDef - { - name morevisualsbutton - group visuals - type ITEM_TYPE_BUTTON - text "More Visual Options" - rect 260 263 200 20 - textalign ITEM_ALIGN_CENTER - textalignx 100 - textaligny 0 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 0 - descText "Configure more visual options." - action - { - play "sound/interface/button1" - hide visuals - hide morevisualsbutton_glow - show morevisuals - } - mouseenter { show morevisualsbutton_glow } - mouseexit { hide morevisualsbutton_glow } - } - - //---------------------------------------------------------------------------------------------- - // - // MORE VISUALS - // - //---------------------------------------------------------------------------------------------- - itemDef - { - name consoleopacity - group morevisuals - type ITEM_TYPE_SLIDER - text "Console Opacity:" - cvarFloat "con_opacity" 1 0 1 - rect 220 43 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Adjust the console's opacity." - action { play "sound/interface/button1" } - mouseenter { show highlight1 } - mouseexit { hide highlight1 } - } - - itemDef - { - name corpsefx - group morevisuals - type ITEM_TYPE_MULTI - text "Corpse Effects:" - cvar "cg_corpseEffects" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 63 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to display corpse effects." - action { play "sound/interface/button1" } - mouseenter { show highlight2 } - mouseexit { hide highlight2 } - } - - itemDef - { - name fleshsparks - group morevisuals - type ITEM_TYPE_NUMERICFIELD - text "Flesh Sparks:" - cvar "cg_fleshSparks" - rect 220 83 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Adjust the number of flesh sparks." - action { play "sound/interface/button1" } - mouseenter { show highlight3 } - mouseexit { hide highlight3 } - } - - itemDef - { - name simpleitems - group morevisuals - type ITEM_TYPE_MULTI - text @MENUS_SIMPLE_ITEMS - cvar "cg_simpleItems" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 103 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText @MENUS_RENDER_ICONS_FOR_ITEMS - action { play "sound/interface/button1" } - mouseenter { show highlight4 } - mouseexit { hide highlight4 } - } - - itemDef - { - name wall_marks - group morevisuals - type ITEM_TYPE_MULTI - text @MENUS_WALL_MARKS - cvar "cg_marks" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 123 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText @MENUS_TOGGLE_TO_DISPLAY_SCORCH - action { play "sound/interface/button1" } - mouseenter { show highlight5 } - mouseexit { hide highlight5 } - } - - itemDef - { - name nofx - group morevisuals - type ITEM_TYPE_MULTI - text "No Effects:" - cvar "cg_noFX" - cvarFloatList - { - @MENUS_OFF 0 - "Remove fx_runners" 1 - "Also remove target_speakers" 2 - "Also replace misc_models with box/hitbox model" 3 - "Also remove misc_models" 4 - } - rect 220 143 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle the effects." - action { play "sound/interface/button1" } - mouseenter { show highlight6 } - mouseexit { hide highlight6 } - } - - itemDef - { - name telefx - group morevisuals - type ITEM_TYPE_MULTI - text "No Teleport Effects:" - cvar "cg_noTeleFX" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 163 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to disable teleport effects." - action { play "sound/interface/button1" } - mouseenter { show highlight7 } - mouseexit { hide highlight7 } - } - - itemDef - { - name remaps - group morevisuals - type ITEM_TYPE_MULTI - text "Remaps:" - cvar "cg_remaps" - cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 @@ -2818,7 +2428,7 @@ textscale 1 forecolor .615 .615 .956 1 visible 0 - descText "Toggle remaps." + descText "Toggle to draw gun." action { play "sound/interface/button1" } mouseenter { show highlight8 } mouseexit { hide highlight8 } @@ -2827,7 +2437,7 @@ itemDef { name sabertrail - group morevisuals + group visuals type ITEM_TYPE_MULTI text "Saber Trail:" cvar "cg_saberTrail" @@ -2854,7 +2464,7 @@ itemDef { name speedtrail - group morevisuals + group visuals type ITEM_TYPE_MULTI text "Speed Trail:" cvar "cg_speedTrail" @@ -2877,32 +2487,6 @@ mouseexit { hide highlight10 } } - itemDef - { - name drawhitbox - group morevisuals - type ITEM_TYPE_MULTI - text "Draw Hit Box:" - cvar "cg_drawHitBox" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 243 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to draw hit box." - action { play "sound/interface/button1" } - mouseenter { show highlight11 } - mouseexit { hide highlight11 } - } - itemDef { name done2button_glow @@ -2914,32 +2498,6 @@ decoration } - itemDef - { - name done2 - group morevisuals - type ITEM_TYPE_BUTTON - text "Done" - rect 260 263 200 20 - textalign ITEM_ALIGN_CENTER - textalignx 100 - textaligny 0 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 0 - descText "Return to visuals." - action - { - play "sound/interface/button1" - show visuals - hide done2button_glow - hide morevisuals - } - mouseenter { show done2button_glow } - mouseexit { hide done2button_glow } - } - //---------------------------------------------------------------------------------------------- // // HUD @@ -2956,7 +2514,6 @@ { @MENUS_OFF 0 @MENUS_ON 1 - "On + Small Text" 2 } rect 220 83 300 20 textalign ITEM_ALIGN_RIGHT @@ -2974,150 +2531,17 @@ itemDef { - name drawtimer - group hud - type ITEM_TYPE_MULTI - text "Draw Timer:" - cvar "cg_drawTimer" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - "On + Small Text" 2 - } - rect 220 103 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to display timer." - action { play "sound/interface/button1" } - mouseenter { show highlight4 } - mouseexit { hide highlight4 } - } - - itemDef - { - name speedgraph - group hud - type ITEM_TYPE_MULTI - text "Speed Graph:" - cvar "cg_speedGraph" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 123 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to display speed graph." - action { play "sound/interface/button1" } - mouseenter { show highlight5 } - mouseexit { hide highlight5 } - } - - itemDef - { - name lagometer - group hud - type ITEM_TYPE_MULTI - text "Lagometer:" - cvar "cg_lagometer" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - "On + Ping" 2 - "On - Background" 3 - } - rect 220 143 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to display lagometer." - action { play "sound/interface/button1" } - mouseenter { show highlight6 } - mouseexit { hide highlight6 } - } - - itemDef - { - name smallscoreboard - group hud - type ITEM_TYPE_MULTI - text "Small Scoreboard:" - cvar "cg_smallScoreboard" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 163 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to make the small scoreboard persistant." - action { play "sound/interface/button1" } - mouseenter { show highlight7 } - mouseexit { hide highlight7 } - } - - itemDef - { - name killmessage - group hud - type ITEM_TYPE_MULTI - text "Kill Message:" - cvar "cg_killMessage" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 183 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to display kill message." - action { play "sound/interface/button1" } - mouseenter { show highlight8 } - mouseexit { hide highlight8 } - } - - itemDef - { - name tint + name drawtimer group hud type ITEM_TYPE_MULTI - text "Tint HUD:" - cvar "cg_tintHud" + text "Draw Timer:" + cvar "cg_drawTimer" cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 } - rect 220 203 300 20 + rect 220 103 300 20 textalign ITEM_ALIGN_RIGHT textalignx 165 textaligny 0 @@ -3125,25 +2549,25 @@ textscale 1 forecolor .615 .615 .956 1 visible 0 - descText "Toggle to display the color tinting on your HUD while on red or blue team." + descText "Toggle to display timer." action { play "sound/interface/button1" } - mouseenter { show highlight9 } - mouseexit { hide highlight9 } + mouseenter { show highlight4 } + mouseexit { hide highlight4 } } itemDef { - name simple + name lagometer group hud type ITEM_TYPE_MULTI - text "Simple HUD:" - cvar "cg_hudFiles" + text "Lagometer:" + cvar "cg_lagometer" cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 } - rect 220 223 300 20 + rect 220 143 300 20 textalign ITEM_ALIGN_RIGHT textalignx 165 textaligny 0 @@ -3151,27 +2575,25 @@ textscale 1 forecolor .615 .615 .956 1 visible 0 - descText "Toggle to display simple HUD." + descText "Toggle to display lagometer." action { play "sound/interface/button1" } - mouseenter { show highlight10 } - mouseexit { hide highlight10 } + mouseenter { show highlight6 } + mouseexit { hide highlight6 } } itemDef { - name gradient + name simple group hud type ITEM_TYPE_MULTI - text "HUD Gradient:" - cvar "cg_hudColors" + text "Simple HUD:" + cvar "cg_hudFiles" cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 } - cvarTest cg_hudFiles - hideCvar { 0 } - rect 220 243 300 20 + rect 220 183 300 20 textalign ITEM_ALIGN_RIGHT textalignx 165 textaligny 0 @@ -3179,10 +2601,10 @@ textscale 1 forecolor .615 .615 .956 1 visible 0 - descText "Toggle to add some gradient colors to simple HUD that change depending on health/ammo/force status." + descText "Toggle to display simple HUD." action { play "sound/interface/button1" } - mouseenter { show highlight11 } - mouseexit { hide highlight11 } + mouseenter { show highlight8 } + mouseexit { hide highlight8 } } //---------------------------------------------------------------------------------------------- @@ -3253,26 +2675,6 @@ hide highlight3 } } - - itemDef - { - name duel_music - group sound - type ITEM_TYPE_MULTI - text "Duel:" - cvar "cg_duelMusic" - cvarFloatList { "On" 1 "Off" 0 } - rect 506 81 54 20 - textalign ITEM_ALIGN_LEFT - textalignx 0 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - desctext "Toggle the duel soundtrack played during a duel." - action { play "sound/interface/button1" } - } itemDef { @@ -3304,50 +2706,6 @@ hide highlight4 } } - - itemDef - { - name hit - group sound - type ITEM_TYPE_MULTI - text "Hit Sound:" - cvar "cg_hitsounds" - cvarFloatList { "Default" 0 "Quake 3" 1 "Legions: Overdrive" 2 "Warsow" 3 "Tribes: Ascend" 4 } - rect 220 121 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 120 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Set the type of hit sounds." - mouseenter { show highlight5 } - mouseexit { hide highlight5 } - action { play "sound/interface/button1" } - } - - itemDef - { - name roll - group sound - type ITEM_TYPE_MULTI - text "Roll Sounds:" - cvar "cg_rollSounds" - cvarFloatList { "None" 0 "Always (Default)" 1 "Only play for other clients" 2 } - rect 220 141 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 120 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Set when roll sounds should be played." - mouseenter { show highlight6 } - mouseexit { hide highlight6 } - action { play "sound/interface/button1" } - } itemDef { @@ -3356,30 +2714,8 @@ type ITEM_TYPE_MULTI text "Jump Sounds:" cvar "cg_jumpSounds" - cvarFloatList { "Always (Default)" 0 "Only play for other clients" 2 } - rect 220 161 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 120 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Set when jump sounds should be played." - mouseenter { show highlight7 } - mouseexit { hide highlight7 } - action { play "sound/interface/button1" } - } - - itemDef - { - name chat - group sound - type ITEM_TYPE_MULTI - text "Chat Sounds:" - cvar "cg_chatSounds" cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 } - rect 220 181 300 20 + rect 220 141 300 20 textalign ITEM_ALIGN_RIGHT textalignx 120 textaligny 0 @@ -3387,9 +2723,9 @@ textscale 1 forecolor .615 .615 .956 1 visible 0 - descText "Toggle the chat beep notification." - mouseenter { show highlight8 } - mouseexit { hide highlight8 } + descText "Set when jump sounds should be played." + mouseenter { show highlight6 } + mouseexit { hide highlight6 } action { play "sound/interface/button1" } } @@ -3401,7 +2737,7 @@ cvar "s_UseOpenAL" cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 } text @MENUS_EAX - rect 220 201 300 20 + rect 220 181 300 20 textalign ITEM_ALIGN_RIGHT textalignx 120 textaligny 0 @@ -3418,11 +2754,11 @@ mouseenter { - show highlight9 + show highlight8 } mouseexit { - hide highlight9 + hide highlight8 } } @@ -3431,7 +2767,7 @@ name eax_icon group sound style WINDOW_STYLE_SHADER - rect 297 221 128 64 + rect 297 201 128 64 background "gfx/menus/eax" forecolor 1 1 1 1 visible 1 @@ -3447,8 +2783,8 @@ type ITEM_TYPE_MULTI text @MENUS_SOUND_QUALITY cvar "s_khz" - cvarFloatList { @MENUS_LOW 11 @MENUS_HIGH 22 } - rect 220 221 300 20 + cvarFloatList { @MENUS_LOW 11 @MENUS_HIGH 22 @MENUS_VERY_HIGH 44 } + rect 220 201 300 20 textalign ITEM_ALIGN_RIGHT textalignx 120 textaligny 0 @@ -3462,11 +2798,11 @@ mouseenter { - show highlight10 + show highlight9 } mouseexit { - hide highlight10 + hide highlight9 } action { @@ -3480,162 +2816,11 @@ // OPTION FIELDS // //---------------------------------------------------------------------------------------------- - itemDef - { - name simulatedprojectiles - group options - type ITEM_TYPE_NUMERICFIELD - text "Simulated Projectiles:" - cvar "cg_simulatedProjectiles" - rect 220 61 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Draws an instant clientside projectile to make aiming/tracking easier." - action { play "sound/interface/button1" } - mouseenter { show highlight2 } - mouseexit { hide highlight2 } - } - - itemDef - { - name leadindicator - group options - type ITEM_TYPE_MULTI - text "Lead Indicator:" - cvar "cg_leadIndicator" - cvarFloatList - { - @MENUS_OFF 0 - "Automatic" 1 - } - rect 220 81 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle lead indicator to account for your ping on the server." - action { play "sound/interface/button1" } - mouseenter { show highlight3 } - mouseexit { hide highlight3 } - } - - itemDef - { - name autokill - group options - type ITEM_TYPE_MULTI - text "Auto Kill When Falling:" - cvar "cg_autoKillWhenFalling" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 101 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to automatically self-kill when falling." - action { play "sound/interface/button1" } - mouseenter { show highlight4 } - mouseexit { hide highlight4 } - } - - itemDef - { - name autodemo - group options - type ITEM_TYPE_MULTI - text "Auto Record Demo:" - cvar "cg_autoRecordDemo" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 121 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to automatically record a demo." - action { play "sound/interface/button1" } - mouseenter { show highlight5 } - mouseexit { hide highlight5 } - } - - itemDef - { - name autorace - group options - type ITEM_TYPE_MULTI - text "Auto Record Race:" - cvar "cg_autoRecordRaceDemo" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 141 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to automatically record a race demo." - action { play "sound/interface/button1" } - mouseenter { show highlight6 } - mouseexit { hide highlight6 } - } - - itemDef - { - name autoscreen - group options - type ITEM_TYPE_MULTI - text "Auto Screenshot:" - cvar "cg_autoScreenshot" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 220 161 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Toggle to automatically take a screenshot at the end of a round." - action { play "sound/interface/button1" } - mouseenter { show highlight7 } - mouseexit { hide highlight7 } - } - itemDef { name footsteps group options - type ITEM_TYPE_MULTI + type ITEM_TYPE_MULTI text @MENUS_FOOTSTEPS desctext @MENUS_FOOTSTEPS_DESC cvar "cg_footsteps" @@ -3934,27 +3119,6 @@ mouseexit { hide highlight8 } } - itemDef - { - name timenudgeduration - group network - type ITEM_TYPE_NUMERICFIELD - text "Time Nudge Duration:" - cvar "cl_timeNudgeDuration" - rect 220 203 300 20 - textalign ITEM_ALIGN_RIGHT - textalignx 165 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 0 - descText "Configure your timenudge duration." - action { play "sound/interface/button1" } - mouseenter { show highlight9 } - mouseexit { hide highlight9 } - } - // APPLY CHANGES BUTTON itemDef { diff --git a/assets/ui/jamp/ingame_spectator.menu b/assets/ui/jamp/ingame_spectator.menu deleted file mode 100644 index cb0ce5078f..0000000000 --- a/assets/ui/jamp/ingame_spectator.menu +++ /dev/null @@ -1,127 +0,0 @@ -//----------------------------------------- -// SPECTATOR MENU -//----------------------------------------- -{ - menuDef - { - name spectatormenu - visible 0 - fullScreen 0 - outOfBoundsClick - rect 263 352 114 88 - focusColor 1 1 1 1 - - // Overall window backdrop - itemDef - { - name setup_background - group none - style WINDOW_STYLE_FILLED - rect 0 0 114 88 - backcolor 0 0 .35 .9 - forecolor 1 1 1 1 - border 1 - bordercolor 0 0 .8 1 - visible 1 - decoration - } - - itemDef - { - name hud - group spectator - type ITEM_TYPE_MULTI - text "SpecHUD:" - cvar cg_specHud - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 2 4 110 20 - textalign ITEM_ALIGN_RIGHT - textalignx 80 - textaligny 0 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name damp - group spectator - type ITEM_TYPE_MULTI - text "CameraDamp:" - cvar "cg_spectatorCameraDamp" - cvarFloatList - { - @MENUS_OFF 0 - @MENUS_ON 1 - } - rect 2 24 110 20 - textalign ITEM_ALIGN_RIGHT - textalignx 80 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name red - group spectator - type 1 - text "Follow Red Team" - cvartest "g_gametype" - showcvar { "6", "8" } - rect 2 44 110 20 - textalign ITEM_ALIGN_CENTER - textalignx 55 - textaligny 0 - font 4 - textscale 1 - forecolor 1 0 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd followredflag" ; - uiScript closeingame - } - } - - itemDef - { - name blue - group spectator - type 1 - text "Follow Blue Team" - cvartest "g_gametype" - showcvar { "6", "8" } - rect 2 64 110 20 - textalign ITEM_ALIGN_CENTER - textalignx 55 - textaligny 0 - font 4 - textscale 1 - forecolor 0 0 1 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - exec "cmd followblueflag" ; - uiScript closeingame - } - } -} \ No newline at end of file diff --git a/assets/ui/jamp/ingame_strafehelper.menu b/assets/ui/jamp/ingame_strafehelper.menu deleted file mode 100644 index 0d161cedab..0000000000 --- a/assets/ui/jamp/ingame_strafehelper.menu +++ /dev/null @@ -1,690 +0,0 @@ -//----------------------------------------- -// STRAFEHELPER MENU -//----------------------------------------- -{ - menuDef - { - name strafehelpermenu - visible 0 - fullscreen 0 - outOfBoundsClick - rect 10 292 282 148 - focusColor 1 1 1 1 - - // Overall window backdrop - itemDef - { - name setup_background - group none - style WINDOW_STYLE_FILLED - rect 0 0 282 148 - backcolor 0 0 .35 .9 - forecolor 1 1 1 1 - border 1 - bordercolor 0 0 .8 1 - visible 1 - decoration - } - - itemDef - { - name CutoffSlider - group strafeHelper - type ITEM_TYPE_SLIDER - text "Cutoff:" - cvarfloat "cg_strafeHelperCutoff" 0 0 230 - rect 10 4 172 20 - textalign ITEM_ALIGN_RIGHT - textalignx 68 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name CutoffField - group strafeHelper - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "cg_strafeHelperCutoff" - rect 192 4 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name CutoffReset - group strafeHelper - type ITEM_TYPE_BUTTON - text "Reset" - rect 242 4 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar cg_strafeHelperCutoff "0.00000" - } - } - - itemDef - { - name RedSlider - group strafeHelper - type ITEM_TYPE_SLIDER - text "Red:" - cvarfloat "ui_sha_r" 0 0 255 - rect 10 24 172 20 - textalign ITEM_ALIGN_RIGHT - textalignx 68 - font 4 - textscale 1 - forecolor 1 0 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name RedField - group strafeHelper - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "ui_sha_r" - rect 192 24 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name RedReset - group strafeHelper - type ITEM_TYPE_BUTTON - text "Reset" - rect 242 24 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar ui_sha_r "0.00000" - } - } - - itemDef - { - name GreenSlider - group strafeHelper - type ITEM_TYPE_SLIDER - text "Green:" - cvarfloat "ui_sha_g" 255 0 255 - rect 10 44 172 20 - textalign ITEM_ALIGN_RIGHT - textalignx 68 - font 4 - textscale 1 - forecolor 0 1 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name GreenField - group strafeHelper - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "ui_sha_g" - rect 192 44 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name GreenReset - group strafeHelper - type ITEM_TYPE_BUTTON - text "Reset" - rect 242 44 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar ui_sha_g "255.000" - } - } - - itemDef - { - name BlueSlider - group strafeHelper - type ITEM_TYPE_SLIDER - text "Blue:" - cvarfloat "ui_sha_b" 0 0 255 - rect 10 64 172 20 - textalign ITEM_ALIGN_RIGHT - textalignx 68 - font 4 - textscale 1 - forecolor 0 .6 1 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name BlueField - group strafeHelper - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "ui_sha_b" - rect 192 64 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name BlueReset - group strafeHelper - type ITEM_TYPE_BUTTON - text "Reset" - rect 242 64 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar ui_sha_b "0.00000" - } - } - - itemDef - { - name ActiveAlphaSlider - group strafeHelper - type ITEM_TYPE_SLIDER - text "Act. Alpha:" - cvarfloat "ui_sha_a" 200 25 255 - rect 10 84 172 20 - textalign ITEM_ALIGN_RIGHT - textalignx 68 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name ActiveAlphaField - group strafeHelper - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "ui_sha_a" - rect 192 84 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name ActiveAlphaReset - group strafeHelper - type ITEM_TYPE_BUTTON - text "Reset" - rect 242 84 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar ui_sha_a "200.000" - } - } - - itemDef - { - name InactiveAlphaSlider - group strafeHelper - type ITEM_TYPE_SLIDER - text "Inact. Alpha:" - cvarfloat "cg_strafeHelperInactiveAlpha" 200 0 255 - rect 10 104 172 20 - textalign ITEM_ALIGN_RIGHT - textalignx 68 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name InactiveAlphaField - group strafeHelper - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "cg_strafeHelperInactiveAlpha" - rect 192 104 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name InactiveAlphaReset - group strafeHelper - type ITEM_TYPE_BUTTON - text "Reset" - rect 242 104 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar cg_strafeHelperInactiveAlpha "200.000" - } - } - - itemDef - { - name advancedHighlight - group strafeHelper - style WINDOW_STYLE_SHADER - rect 10 124 262 20 - background "gfx/menus/menu_buttonback" // Frame around button - forecolor 1 1 1 1 - decoration - visible 0 - } - - itemDef - { - name advancedButton - group strafeHelper - type ITEM_TYPE_BUTTON - text "Advanced Options" - rect 10 124 262 20 - textalign ITEM_ALIGN_CENTER - textalignx 131 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - open advanced_popmenu - } - mouseEnter - { - show advancedHighlight - } - mouseExit - { - hide advancedHighlight - } - } - } - - menuDef - { - name "advanced_popmenu" - visible 0 - fullscreen 0 - outOfBoundsClick - rect 6 296 290 138 - focusColor 1 1 1 1 - style 1 - border 1 - popup - - onEsc - { - play "sound/interface/esc.wav" ; - close advanced_popmenu - } - - itemDef - { - name setup_background - group none - style WINDOW_STYLE_FILLED - rect 0 0 290 138 - backcolor 0 0 .35 .9 - forecolor 1 1 1 1 - border 1 - bordercolor 0 0 .8 1 - visible 1 - decoration - } - - itemDef - { - name advancedTitle - text "Advanced Strafe Helper Options" - style WINDOW_STYLE_SHADER - background "gfx/menus/menu_blendbox" - rect 0 4 290 20 - font 3 - textscale 0.7 - textalign ITEM_ALIGN_CENTER - textalignx 145 - textaligny 1 - forecolor .549 .854 1 1 - visible 1 - decoration - } - - itemDef - { - name FPSSlider - group strafeHelper - type ITEM_TYPE_SLIDER - text "FPS:" - cvarfloat "cg_strafeHelper_FPS" 1000 0 1000 - rect 14 24 172 20 - textalign ITEM_ALIGN_RIGHT - textalignx 68 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name FPSField - group strafeHelper - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "cg_strafeHelper_FPS" - rect 196 24 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name FPSReset - group strafeHelper - type ITEM_TYPE_BUTTON - text "Reset" - rect 246 24 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar cg_strafeHelper_FPS "1000.00" - } - } - - itemDef - { - name PrecisionSlider - group strafeHelper - type ITEM_TYPE_SLIDER - text "Precision:" - cvarfloat "cg_strafeHelperPrecision" 256 0 1000 - rect 14 44 172 20 - textalign ITEM_ALIGN_RIGHT - textalignx 68 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name PrecisionField - group strafeHelper - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "cg_strafeHelperPrecision" - rect 196 44 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name PrecisionReset - group strafeHelper - type ITEM_TYPE_BUTTON - text "Reset" - rect 246 44 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar cg_strafeHelperPrecision "256.000" - } - } - - itemDef - { - name OffsetSlider - group strafeHelper - type ITEM_TYPE_SLIDER - text "Offset:" - cvarfloat "cg_strafeHelperOffset" 75 0 200 - rect 14 64 172 20 - textalign ITEM_ALIGN_RIGHT - textalignx 68 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name OffsetField - group strafeHelper - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "cg_strafeHelperOffset" - rect 196 64 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name OffsetReset - group strafeHelper - type ITEM_TYPE_BUTTON - text "Reset" - rect 246 64 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar cg_strafeHelperOffset "75.0000" - } - } - - itemDef - { - name InvertOffsetSlider - group strafeHelper - type ITEM_TYPE_SLIDER - text "Invert Offset:" - cvarfloat "cg_strafeHelperInvertOffset" 75 0 200 - rect 14 84 172 20 - textalign ITEM_ALIGN_RIGHT - textalignx 68 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - } - } - - itemDef - { - name InvertOffsetField - group strafeHelper - type ITEM_TYPE_NUMERICFIELD - text "" - cvar "cg_strafeHelperInvertOffset" - rect 196 84 40 20 - font 4 - textscale 1 - forecolor .615 .615 .956 1 - visible 1 - action { play "sound/interface/button1.wav" ; } - } - - itemDef - { - name InvertOffsetReset - group strafeHelper - type ITEM_TYPE_BUTTON - text "Reset" - rect 246 84 30 20 - font 4 - textscale 1 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" ; - setcvar cg_strafeHelperInvertOffset "75.0000" - } - } - - itemDef - { - name button_glow - group none - style WINDOW_STYLE_SHADER - rect 20 104 250 30 - background "gfx/menus/menu_buttonback" - forecolor 1 1 1 1 - visible 0 - decoration - } - - itemDef - { - name doneText - text @MENUS_DONE - type 1 - font 3 - textscale .8 - style WINDOW_STYLE_FILLED - rect 20 104 250 30 - textalign ITEM_ALIGN_CENTER - textalignx 125 - textaligny 5 - forecolor 1 .682 0 1 - visible 1 - action - { - play "sound/interface/button1.wav" - close advanced_popmenu - } - mouseEnter - { - show button_glow - } - mouseExit - { - hide button_glow - } - } - } -} \ No newline at end of file diff --git a/assets/ui/jampingame.txt b/assets/ui/jampingame.txt index edc5ceebae..5bf152f414 100644 --- a/assets/ui/jampingame.txt +++ b/assets/ui/jampingame.txt @@ -33,10 +33,7 @@ loadMenu { "ui/jamp/ingame_objectives.menu" } loadMenu { "ui/jamp/ingame_server.menu" } - loadMenu { "ui/jamp/ingame_race.menu" } loadMenu { "ui/jamp/ingame_camera.menu" } - loadMenu { "ui/jamp/ingame_strafehelper.menu" } - loadMenu { "ui/jamp/ingame_spectator.menu" } loadMenu { "ui/jamp/ingame_account.menu" } } diff --git a/codemp/ui/ui_cvar.c b/codemp/ui/ui_cvar.c index 6a1c994f2e..1fae9af73e 100644 --- a/codemp/ui/ui_cvar.c +++ b/codemp/ui/ui_cvar.c @@ -33,9 +33,6 @@ static void CVU_Derpity( void ) { } */ -static void CVU_StrafeHelper (void) { - trap->Cvar_Set( "cg_strafeHelperActiveColor", va("%i %i %i %i", ui_sha_r.integer, ui_sha_g.integer, ui_sha_b.integer, ui_sha_a.integer) ); -} // // Cvar table diff --git a/codemp/ui/ui_main.c b/codemp/ui/ui_main.c index 5e85d4b431..e044dddc7a 100644 --- a/codemp/ui/ui_main.c +++ b/codemp/ui/ui_main.c @@ -6454,10 +6454,6 @@ static void UI_RunMenuScript(char **args) //trap->Cmd_ExecuteText( EXEC_APPEND, va("callvote kick \"%s\"\n",uiInfo.playerNames[uiInfo.playerIndex]) ); trap->Cmd_ExecuteText( EXEC_APPEND, va("callvote clientkick \"%i\"\n",uiInfo.playerIndexes[uiInfo.playerIndex]) ); } - } else if (Q_stricmp(name, "voteForceSpec") == 0) { - if (uiInfo.playerIndex >= 0 && uiInfo.playerIndex < uiInfo.playerCount) { - trap->Cmd_ExecuteText(EXEC_APPEND, va("callvote forcespec \"%i\"\n", uiInfo.playerIndexes[uiInfo.playerIndex])); - } } else if (Q_stricmp(name, "voteGame") == 0) { if (ui_netGametype.integer >= 0 && ui_netGametype.integer < uiInfo.numGameTypes) { trap->Cmd_ExecuteText( EXEC_APPEND, va("callvote g_gametype %i\n",uiInfo.gameTypes[ui_netGametype.integer].gtEnum) ); @@ -6482,10 +6478,6 @@ static void UI_RunMenuScript(char **args) trap->Cmd_ExecuteText( EXEC_APPEND, va("callvote timelimit %i\n", ui_duel_timelimit.integer) ); } else if (Q_stricmp(name, "voteDuelFrag") == 0) { trap->Cmd_ExecuteText( EXEC_APPEND, va("callvote fraglimit %i\n", ui_duel_fraglimit.integer) ); - } else if (Q_stricmp(name, "voteTeamSize") == 0) { - if (ui_teamSize.integer >= 1 && ui_teamSize.integer <= 16) { - trap->Cmd_ExecuteText( EXEC_APPEND, va("callvote sv_maxteamsize %i\n", ui_teamSize.integer) ); - } } else if (Q_stricmp(name, "login") == 0) { trap->Cmd_ExecuteText( EXEC_APPEND, va("login %s %s\n", ui_username.string, ui_password.string) ); } else if (Q_stricmp(name, "register") == 0) { diff --git a/codemp/ui/ui_xcvar.h b/codemp/ui/ui_xcvar.h index 59a56c02b0..48e3c5ac61 100644 --- a/codemp/ui/ui_xcvar.h +++ b/codemp/ui/ui_xcvar.h @@ -143,11 +143,6 @@ XCVAR_DEF( ui_team_friendly, "1", NULL, CVAR_ARCHIVE|CVAR_INTERNAL ) XCVAR_DEF( ui_team_timelimit, "20", NULL, CVAR_ARCHIVE|CVAR_INTERNAL ) XCVAR_DEF( ui_duel_fraglimit, "1", NULL, CVAR_ARCHIVE|CVAR_INTERNAL ) XCVAR_DEF( ui_duel_timelimit, "3", NULL, CVAR_ARCHIVE|CVAR_INTERNAL ) -XCVAR_DEF( ui_teamSize, "3", NULL, CVAR_ARCHIVE|CVAR_INTERNAL ) -XCVAR_DEF( ui_sha_r, "0", CVU_StrafeHelper, CVAR_ARCHIVE|CVAR_INTERNAL ) -XCVAR_DEF( ui_sha_g, "255", CVU_StrafeHelper, CVAR_ARCHIVE|CVAR_INTERNAL ) -XCVAR_DEF( ui_sha_b, "0", CVU_StrafeHelper, CVAR_ARCHIVE|CVAR_INTERNAL ) -XCVAR_DEF( ui_sha_a, "200", CVU_StrafeHelper, CVAR_ARCHIVE|CVAR_INTERNAL ) XCVAR_DEF( ui_username, "", NULL, CVAR_ARCHIVE|CVAR_INTERNAL ) XCVAR_DEF( ui_password, "", NULL, CVAR_ARCHIVE|CVAR_INTERNAL ) diff --git a/tools/travis-build.sh b/tools/travis-build.sh index baec4bd711..8b99f11252 100755 --- a/tools/travis-build.sh +++ b/tools/travis-build.sh @@ -66,10 +66,9 @@ fi case "${host}" in (macosx-universal-clang) ( cd $(pwd)/assets && \ - zip -r japro3ui-assets.pk3 * && \ - mv japro3ui-assets.pk3 ../build/DESTDIR/prefix/JediAcademy/openjk.x86_64.app/Contents/MacOS/japro/ && \ - cd ../build/DESTDIR/prefix/JediAcademy/openjk.x86_64.app/Contents/MacOS/eternaljk/ && \ - wget http://upsgaming.com/files/japro3.pk3 && \ + zip -r eternaljk-assets.pk3 * && \ + mv eternaljk-assets.pk3 ../build/DESTDIR/prefix/JediAcademy/eternaljk.x86_64.app/Contents/MacOS/eternaljk/ && \ + cd ../build/DESTDIR/prefix/JediAcademy/eternaljk.x86_64.app/Contents/MacOS/eternaljk/ && \ cd ../../../ && \ tar czvf eternaljk-macos-"${arch}".tar.gz * && \ mv eternaljk-macos-"${arch}".tar.gz /Users/travis/build/eternalcodes/EternalJK/ && \ @@ -79,11 +78,9 @@ case "${host}" in (i?86-linux-gnu|native) if [ -n "${deploy}" ]; then ( cd $(pwd)/assets && \ - zip -r japro3ui-assets.pk3 * && \ - mv japro3ui-assets.pk3 ../build/DESTDIR/prefix/JediAcademy/eternaljk/ && \ - cd ../build/DESTDIR/prefix/JediAcademy/eternaljk && \ - wget http://upsgaming.com/files/japro3.pk3 && \ - cd ../ && \ + zip -r eternaljk-assets.pk3 * && \ + mv eternaljk-assets.pk3 ../build/DESTDIR/prefix/JediAcademy/eternaljk/ && \ + cd ../build/DESTDIR/prefix/JediAcademy && \ tar czvf eternaljk-linux-"${arch}".tar.gz * && \ mv eternaljk-linux-"${arch}".tar.gz /home/travis/build/eternalcodes/EternalJK/ && \ cd ../../ && \