From cf9b7835e0f7021739bc620ac51c6081036faaee Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sun, 9 Apr 2006 00:11:10 +0000 Subject: * Fixed display of long server names * Fixed sort by ping * Changed default source to internet * Added simple options menu to frontend * Removed PB menu file * Changed default net rate * Fixed scoreboard alignment * Implemented "scoresUp" and "scoresDown" --- ui/joinserver.menu | 4 +- ui/main.menu | 26 ++++- ui/menus.txt | 2 +- ui/options.menu | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++++ ui/punkbuster.menu | 292 ----------------------------------------------------- ui/teamscore.menu | 4 +- 6 files changed, 316 insertions(+), 299 deletions(-) create mode 100644 ui/options.menu delete mode 100644 ui/punkbuster.menu (limited to 'ui') diff --git a/ui/joinserver.menu b/ui/joinserver.menu index 38ee1b1e..11dc2f57 100644 --- a/ui/joinserver.menu +++ b/ui/joinserver.menu @@ -294,7 +294,7 @@ outlinecolor 0.1 0.1 0.1 0.5 visible 1 columns 4 - 2 40 40 ITEM_ALIGN_LEFT + 2 40 80 ITEM_ALIGN_LEFT 375 40 20 ITEM_ALIGN_LEFT 500 5 10 ITEM_ALIGN_LEFT 560 20 20 ITEM_ALIGN_LEFT @@ -411,7 +411,7 @@ action { play "sound/misc/menu1.wav"; - uiScript ServerSort 4; + uiScript ServerSort 3; setitemcolor grpColumn backcolor 0 0 0 0; setitemcolor pingColumn backcolor 0.3 1 1 0.5 diff --git a/ui/main.menu b/ui/main.menu index dbb5fda6..488fe694 100644 --- a/ui/main.menu +++ b/ui/main.menu @@ -82,7 +82,7 @@ itemDef { name mainmenu - text "Mods" + text "Options" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY textstyle ITEM_TEXTSTYLE_NORMAL @@ -95,6 +95,28 @@ forecolor 1 1 1 1 visible 1 action + { + play "sound/misc/menu1.wav"; + open simple_options + } + } + + itemDef + { + name mainmenu + text "Mods" + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + textstyle ITEM_TEXTSTYLE_NORMAL + textscale .416 + rect 472 60 128 20 + textalignx 128 + textaligny 20 + textalign ITEM_ALIGN_RIGHT + backcolor 0 0 0 0 + forecolor 1 1 1 1 + visible 1 + action { play "sound/misc/menu1.wav"; open mod @@ -108,7 +130,7 @@ type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY textstyle ITEM_TEXTSTYLE_NORMAL - rect 472 60 128 20 + rect 472 80 128 20 textalignx 128 textaligny 20 textscale .416 diff --git a/ui/menus.txt b/ui/menus.txt index cc6f73c7..753fb953 100644 --- a/ui/menus.txt +++ b/ui/menus.txt @@ -3,7 +3,7 @@ { loadMenu { "ui/main.menu" } loadMenu { "ui/joinserver.menu" } - loadMenu { "ui/punkbuster.menu" } + loadMenu { "ui/options.menu" } loadMenu { "ui/createserver.menu" } loadMenu { "ui/mod.menu" } loadMenu { "ui/credit.menu" } diff --git a/ui/options.menu b/ui/options.menu new file mode 100644 index 00000000..c6cc01c1 --- /dev/null +++ b/ui/options.menu @@ -0,0 +1,287 @@ +#include "ui/menudef.h" + +{ + \\ FRONT END OPTIONS BOX \\ + + menuDef + { + name "simple_options" + visible 0 + fullscreen 0 + rect 200 80 240 320 + focusColor 1 .75 0 1 + style 1 + border 1 + popup + onEsc + { + close simple_options; + open main + } + + itemDef + { + name window + rect 0 0 240 320 + style WINDOW_STYLE_FILLED + backcolor 0 0 0 1 + visible 1 + decoration + + border WINDOW_BORDER_FULL + borderSize 1.0 + borderColor 0.5 0.5 0.5 1 + } + + + + itemDef + { + type ITEM_TYPE_EDITFIELD + style 0 + text "Name:" + cvar "name" + maxchars 26 + rect 50 20 192 15 + textalign ITEM_ALIGN_RIGHT + textalignx 64 + textaligny 12 + textscale .25 + forecolor 1 1 1 1 + visible 1 + } + + itemDef + { + type ITEM_TYPE_MULTI + text "Video Quality:" + cvar "ui_glCustom" + cvarFloatList { "High Quality" 0 "Normal" 1 "Fast" 2 "Fastest" 3 "Custom" 4 } + rect 50 45 192 15 + textalign ITEM_ALIGN_RIGHT + textalignx 64 + textaligny 12 + textscale .25 + forecolor 1 1 1 1 + visible 1 + action + { + play "sound/misc/menu1.wav"; + uiScript update "ui_glCustom" + } + } + + itemDef + { + type ITEM_TYPE_MULTI + text "Video Mode:" + cvar "r_mode" + cvarFloatList { "320x240" 0 "400x300" 1 "512x384" 2 "640x480" 3 + "800x600" 4 "960x720" 5 "1024x768" 6 "1152x864" 7 + "1280x1024" 8 "1600x1200" 9 "2048x1536" 10 "856x480 wide screen" 11 } + rect 50 60 192 15 + textalign ITEM_ALIGN_RIGHT + textalignx 64 + textaligny 12 + textscale .25 + forecolor 1 1 1 1 + visible 1 + action + { + play "sound/misc/menu1.wav"; + uiScript glCustom + } + } + + itemDef + { + type ITEM_TYPE_SLIDER + text "Video Brightness:" + cvarfloat "r_gamma" 1 .5 2 + rect 50 75 192 20 + textalign ITEM_ALIGN_RIGHT + textalignx 64 + textaligny 12 + textscale .25 + forecolor 1 1 1 1 + visible 1 + } + + + + itemDef + { + type ITEM_TYPE_SLIDER + text "Effects Volume:" + cvarfloat "s_volume" 0.7 0 1 + rect 50 110 192 20 + textalign ITEM_ALIGN_RIGHT + textalignx 64 + textaligny 12 + textscale .25 + forecolor 1 1 1 1 + visible 1 + } + + itemDef + { + type ITEM_TYPE_SLIDER + text "Music Volume:" + cvarfloat "s_musicvolume" 0.25 0 1 + rect 50 130 192 20 + textalign ITEM_ALIGN_RIGHT + textalignx 64 + textaligny 12 + textscale .25 + forecolor 1 1 1 1 + visible 1 + } + + itemDef + { + type ITEM_TYPE_YESNO + text "OpenAL Sound:" + cvar "s_useOpenAL" + rect 50 145 192 15 + textalign ITEM_ALIGN_RIGHT + textalignx 64 + textaligny 12 + textscale .25 + forecolor 1 1 1 1 + visible 1 + action + { + play "sound/misc/menu1.wav"; + } + } + + + + itemDef + { + type ITEM_TYPE_SLIDER + text "Mouse Sensitivity:" + cvarfloat "sensitivity" 5 1 30 + rect 50 175 192 20 + textalign ITEM_ALIGN_RIGHT + textalignx 64 + textaligny 12 + textscale .25 + forecolor 1 1 1 1 + visible 1 + } + + itemDef + { + type ITEM_TYPE_YESNO + text "Invert Mouse:" + cvar "ui_mousePitch" + rect 50 190 192 15 + textalign ITEM_ALIGN_RIGHT + textalignx 64 + textaligny 12 + textscale .25 + forecolor 1 1 1 1 + visible 1 + action + { + play "sound/misc/menu1.wav"; + uiScript update ui_mousePitch + } + } + + + + itemDef + { + type ITEM_TYPE_MULTI + text "Network Connection:" + cvar "rate" + cvarFloatList { "<=28.8k" 2500 "33.6k" 3000 "56k" 4000 "ISDN" 5000 "LAN/CABLE/xDSl" 25000 } + rect 50 220 192 20 + textalign ITEM_ALIGN_RIGHT + textalignx 64 + textaligny 12 + textscale .25 + forecolor 1 1 1 1 + visible 1 + action + { + play "sound/misc/menu1.wav"; + } + } + + itemDef + { + type ITEM_TYPE_YESNO + text "Allow Auto Download:" + cvar "cl_allowDownload" + rect 50 235 192 15 + textalign ITEM_ALIGN_RIGHT + textalignx 64 + textaligny 12 + textscale .25 + forecolor 1 1 1 1 + visible 1 + action + { + play "sound/misc/menu1.wav"; + } + } + + + itemDef + { + text "APPLY" + type ITEM_TYPE_BUTTON + textscale .25 + style WINDOW_STYLE_EMPTY + rect 95 255 30 20 + textalign ITEM_ALIGN_CENTER + textalignx 15 + textaligny 15 + forecolor 1 1 1 1 + visible 1 + action + { + play "sound/misc/menu1.wav"; + exec "snd_restart" // includes vid_restart + } + } + + itemDef + { + text "OK" + type ITEM_TYPE_BUTTON + textscale .25 + style WINDOW_STYLE_EMPTY + rect 125 255 20 20 + textalign ITEM_ALIGN_CENTER + textalignx 10 + textaligny 15 + forecolor 1 1 1 1 + visible 1 + action + { + play "sound/misc/menu1.wav"; + close simple_options; + } + } + + + itemDef + { + text "For further options please use the in-game options menu" + style WINDOW_STYLE_EMPTY + textstyle ITEM_TEXTSTYLE_NORMAL + textscale .25 + rect 0 300 240 40 + textalign ITEM_ALIGN_CENTER + textaligny 0 + textalignx 120 + forecolor 1 1 1 1 + visible 1 + decoration + } + } +} diff --git a/ui/punkbuster.menu b/ui/punkbuster.menu deleted file mode 100644 index acd36949..00000000 --- a/ui/punkbuster.menu +++ /dev/null @@ -1,292 +0,0 @@ -#include "ui/menudef.h" - -{ - - // PB enable ---------------- - - menuDef - { - name "pbenable_popmenu" - visible 0 - fullscreen 0 - rect 204 122 235 235 - focusColor 1 .75 0 1 - style 1 - border 1 - popup - onESC - { - close pbenable_popmenu; - open joinserver - } - - itemDef - { - name window - rect 47 47 144 144 - style WINDOW_STYLE_FILLED - backcolor 0 0 0 1 - visible 1 - decoration - - border WINDOW_BORDER_FULL - borderSize 1.0 - borderColor 0.5 0.5 0.5 1 - } - - itemDef - { - name confirm - text "Enable Punkbuster?" - style 0 - textscale .25 - textstyle 3 - rect 0 85 110 20 - textalign 1 - textalignx 120 - textaligny 15 - decoration - forecolor 1 1 1 1 - visible 1 - } - - // yes/no button - - itemDef - { - name yes - text "YES" - type 1 - textscale .25 - rect 75 140 30 26 - textalign 1 - textalignx 18 - textaligny 20 - forecolor 1 1 1 1 - visible 1 - action - { - play "sound/misc/menu1.wav"; - uiScript setPbClStatus 1; - close pbenable_popmenu; - open joinserver - } - } - - itemDef - { - name no - text "NO" - type 1 - textscale .25 - rect 128 140 30 26 - textalign 1 - textalignx 18 - textaligny 20 - forecolor 1 1 1 1 - visible 1 - action - { - play "sound/misc/menu4.wav"; - close pbenable_popmenu; - open joinserver - } - } - } - - // PB disable --------------- - - menuDef - { - name "pbdisable_popmenu" - visible 0 - fullscreen 0 - rect 204 122 235 235 - focusColor 1 .75 0 1 - style 1 - border 1 - popup - onESC - { - close pbdisable_popmenu; - open joinserver - } - - itemDef - { - name window - rect 47 47 144 144 - style WINDOW_STYLE_FILLED - backcolor 0 0 0 1 - visible 1 - decoration - - border WINDOW_BORDER_FULL - borderSize 1.0 - borderColor 0.5 0.5 0.5 1 - } - - itemDef - { - name confirm - text "Disable Punkbuster?" - style 0 - textscale .25 - textstyle 3 - rect 0 85 110 20 - textalign 1 - textalignx 120 - textaligny 15 - decoration - forecolor 1 1 1 1 - visible 1 - } - - // yes/no button - - itemDef - { - name yes - text "YES" - type 1 - textscale .25 - rect 75 140 30 26 - textalign 1 - textalignx 18 - textaligny 20 - forecolor 1 1 1 1 - visible 1 - action - { - play "sound/misc/menu1.wav"; - close pbdisable_popmenu; - open pbmsg_popmenu - } - } - - itemDef - { - name no - text "NO" - type 1 - textscale .25 - rect 128 140 30 26 - textalign 1 - textalignx 18 - textaligny 20 - forecolor 1 1 1 1 - visible 1 - action - { - play "sound/misc/menu4.wav"; - close pbdisable_popmenu; - open joinserver - } - } - } - - // disable msg -------------- - - menuDef - { - name "pbmsg_popmenu" - visible 0 - fullscreen 0 - rect 204 122 235 235 - focusColor 1 .75 0 1 - style 1 - border 1 - popup - onESC - { - play "sound/misc/menu4.wav"; - close pbmsg_popmenu; - open joinserver - } - - itemDef - { - name window - rect 47 47 144 144 - style WINDOW_STYLE_FILLED - backcolor 0 0 0 1 - visible 1 - decoration - - border WINDOW_BORDER_FULL - borderSize 1.0 - borderColor 0.5 0.5 0.5 1 - } - - itemDef - { - name confirm - text "PunkBuster will be disabled" - style 0 - textscale .25 - textstyle 3 - rect 0 85 110 20 - textalign 1 - textalignx 120 - textaligny 15 - decoration - forecolor 1 1 1 1 - visible 1 - } - - itemDef - { - name confirm - text "next time you start" - style 0 - textscale .25 - textstyle 3 - rect 0 100 110 20 - textalign 1 - textalignx 120 - textaligny 15 - decoration - forecolor 1 1 1 1 - visible 1 - } - - itemDef - { - name confirm - text "Tremulous" - style 0 - textscale .25 - textstyle 3 - rect 0 115 110 20 - textalign 1 - textalignx 120 - textaligny 15 - decoration - forecolor 1 1 1 1 - visible 1 - } - - // ok button - - itemDef - { - name yes - text "OK" - type 1 - textscale .25 - rect 103 158 30 26 - textalign 1 - textalignx 18 - textaligny 20 - forecolor 1 1 1 1 - visible 1 - action - { - play "sound/misc/menu1.wav"; - uiScript setPbClStatus 0; - close pbmsg_popmenu; - open joinserver - } - } - } -} diff --git a/ui/teamscore.menu b/ui/teamscore.menu index 0c0da7e4..2c8a7dd7 100644 --- a/ui/teamscore.menu +++ b/ui/teamscore.menu @@ -181,7 +181,7 @@ itemDef { name leftlist - rect 14 142 306 222 + rect 14 136 306 222 forecolor .75 .75 .75 1 visible 1 type ITEM_TYPE_LISTBOX @@ -204,7 +204,7 @@ itemDef { name rightlist - rect 320 142 306 222 + rect 320 136 306 222 forecolor 1 1 1 1 visible 1 type ITEM_TYPE_LISTBOX -- cgit