From 168a9058bf0f0a8ceaf3efd4d3e4aa8dd026f759 Mon Sep 17 00:00:00 2001 From: Tomi Isoaho Date: Wed, 23 Feb 2011 01:17:17 +0000 Subject: [PATCH] More UI stuff --- reaction/uifiles/alphabet.menu | 87 +++++++ reaction/uifiles/createserver.menu | 6 +- reaction/uifiles/credit.menu | 2 +- reaction/uifiles/ingame.menu | 327 +++++++++++--------------- reaction/uifiles/ingame.txt | 13 +- reaction/uifiles/ingame_callvote.menu | 157 ++++++------- reaction/uifiles/ingame_devmode.menu | 156 +++++++++++- reaction/uifiles/ingame_join.menu | 11 +- reaction/uifiles/ingame_join_dm.menu | 4 +- reaction/uifiles/ingame_record.menu | 139 +++++++++++ reaction/uifiles/ingame_setup.menu | 32 +++ reaction/uifiles/ingame_weapon.menu | 7 +- reaction/uifiles/main.menu | 45 ++-- reaction/uifiles/menudef.h | 2 + reaction/uifiles/menus.txt | 2 + reaction/uifiles/options.menu | 24 +- reaction/uifiles/password.menu | 3 +- reaction/uifiles/replacements.menu | 7 +- reaction/uifiles/serverinfo.menu | 9 +- reaction/uifiles/shared.h | 4 +- 20 files changed, 689 insertions(+), 348 deletions(-) create mode 100644 reaction/uifiles/alphabet.menu create mode 100644 reaction/uifiles/ingame_record.menu diff --git a/reaction/uifiles/alphabet.menu b/reaction/uifiles/alphabet.menu new file mode 100644 index 00000000..eaec5fd6 --- /dev/null +++ b/reaction/uifiles/alphabet.menu @@ -0,0 +1,87 @@ +#include "ui/menudef.h" + +{ + + menuDef { + renderpoint + name "alphabet" + visible MENU_FALSE // Visible on open + focusColor RQ3_MAIN_FOCUSCOLOR // Menu focus color for text and items + rect 232 80 368 356 + anglevectors 0 -90 + style WINDOW_STYLE_EMPTY + popup + onOpen { play "sound/ui/whoosh3.wav" } + onOOBClick { close _self ; open main } + onEsc { close _self ; open main } + + itemDef { + name "paper" + menuAnchor + subgroup "fade_fore_alpha" + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor MENUCOLOR_DEMO 1 + rect -8 -16 408 420 + anglevectors 0 -90 + visible 1 + decoration + } + + itemDef { + name "font20" + renderpoint + alignrect "paper" ITEM_ALIGN_LEFT 32 40 240 24 + textaligny 24 + text "!\"#$%& ()*+,-./0 \n" + "123456789:;<=>?@ABCD\n" + "EFGHIJKLMNOPQRSTUV\n" + "WXYZ[\\]^^0_`abcdefghijkl\n" + "mnopqrstuvwxyz{|}~" + forecolor 0 0 0 1 + autowrapped + visible 1 + decoration + //style WINDOW_STYLE_FILLED + //backcolor 0 0 0 .6 + } + + itemDef { + name "font16" + renderpoint + alignrect "font20" ITEM_ALIGN_LEFT 0 160 160 24 + textscale UI_MAIN_TEXTSIZE + textaligny 24 + text "!\"#$%& ()*+,-./0 \n" + "123456789:;<=>?@ABCD\n" + "EFGHIJKLMNOPQRSTUV\n" + "WXYZ[\\]^^0_`abcdefghijkl\n" + "mnopqrstuvwxyz{|}~" + forecolor 0 0 0 1 + autowrapped + visible 1 + decoration + //style WINDOW_STYLE_FILLED + //backcolor 0 0 0 .6 + } + + itemDef { + name "font12" + renderpoint + alignrect "font16" ITEM_ALIGN_LEFT 192 0 128 24 + textscale 0.2 + textaligny 24 + text "!\"#$%& ()*+,-./0 \n" + "123456789:;<=>?@ABCD\n" + "EFGHIJKLMNOPQRSTUV\n" + "WXYZ[\\]^^0_`abcdefghijkl\n" + "mnopqrstuvwxyz{|}~" + forecolor 0 0 0 1 + autowrapped + visible 1 + decoration + //style WINDOW_STYLE_FILLED + //backcolor 0 0 0 .6 + } + } +} \ No newline at end of file diff --git a/reaction/uifiles/createserver.menu b/reaction/uifiles/createserver.menu index 2127a8b9..b85eb3f9 100644 --- a/reaction/uifiles/createserver.menu +++ b/reaction/uifiles/createserver.menu @@ -577,7 +577,7 @@ Group # 3 BEGIN_OPTION("Require Password", "g_needpass", ITEM_TYPE_YESNO, 4, 3) kind YESNO_ICON_RIGHT - OPTION_BELOW("gr3_ctrl3") + OPTION_BELOW("gr3_ctrl3") ASSIGN_HINT("hint_needpass") END_OPTION ADD_HINT("hint_needpass", "Specifies whether the password is needed in order to connect to your server", "group3") @@ -594,7 +594,7 @@ Group # 3 BEGIN_OPTION("Synchronous Clients", "g_synchronousclients", ITEM_TYPE_YESNO, 6, 3) kind YESNO_ICON_RIGHT - OPTION_BELOW("gr3_ctrl5") + OPTION_BELOW("gr3_ctrl5") ASSIGN_HINT("hint_sync") END_OPTION ADD_HINT("hint_sync", "Toggles synchronization of all clients to allow demo recording on the server", "group3") @@ -603,7 +603,7 @@ Group # 3 BEGIN_OPTION("VoIP", "sv_voip", ITEM_TYPE_YESNO, 7, 3) kind YESNO_ICON_RIGHT - OPTION_BELOW("gr3_ctrl6") + OPTION_BELOW("gr3_ctrl6") ASSIGN_HINT("hint_voip") END_OPTION ADD_HINT("hint_voip", "Enable server-side VoIP support", "group3") diff --git a/reaction/uifiles/credit.menu b/reaction/uifiles/credit.menu index 4c46fc5f..5ec3a551 100644 --- a/reaction/uifiles/credit.menu +++ b/reaction/uifiles/credit.menu @@ -1899,7 +1899,7 @@ textalignx 220 textaligny 80 text "THIS HAS BEEN A BOOMSTICK STUDIOS\nPRODUCTION\n\n" - "Copyright 2000 - 2010" + "Copyright 2000 - 2011" autowrapped visible 1 decoration diff --git a/reaction/uifiles/ingame.menu b/reaction/uifiles/ingame.menu index 4e071bdb..0e29d19d 100644 --- a/reaction/uifiles/ingame.menu +++ b/reaction/uifiles/ingame.menu @@ -2,6 +2,83 @@ #define ANGLES 2 -88 #define FADEIN_TIME 125 + +#define ITEM_HEIGHT 20 + +#define MENU_ITEM(ITEM_NAME, DESTINATION, ITEM_TEXT, KEY, ALIGN, ITEM_WIDTH, Y_POS)\ + itemDef { \ + renderpoint \ + name ITEM_NAME \ + group ingameMain \ + text "> "ITEM_TEXT \ + shortcutKey KEY \ + forecolor 0 0 0 1 \ + textaligny 14 \ + textscale UI_INGAME_TEXTSIZE \ + alignrect ALIGN ITEM_ALIGN_LEFT 0 Y_POS ITEM_WIDTH ITEM_HEIGHT \ + type ITEM_TYPE_BUTTON \ + style WINDOW_STYLE_EMPTY \ + visible 1 \ + action { open DESTINATION } \ + } + + //style WINDOW_STYLE_FILLED \ + //backcolor 0 0 0 .5 \ + +#define MENU_ITEM_TOGGLE(ITEM_NAME, DESTINATION, ITEM_TEXT, KEY, ALIGN, ITEM_WIDTH, Y_POS, CVAR_TEST)\ + itemDef { \ + renderpoint \ + name ITEM_NAME \ + group ingameMain \ + text "> "ITEM_TEXT \ + forecolor UI_COLOR_INACTIVE \ + textaligny 14 \ + textscale UI_INGAME_TEXTSIZE \ + alignrect ALIGN ITEM_ALIGN_LEFT 0 Y_POS ITEM_WIDTH ITEM_HEIGHT \ + type ITEM_TYPE_TEXT \ + style WINDOW_STYLE_EMPTY \ + visible 1 \ + cvartest CVAR_TEST \ + showCvar { "0" } \ + decoration \ + } \ + itemDef { \ + renderpoint \ + name ITEM_NAME \ + group ingameMain \ + text "> "ITEM_TEXT \ + shortcutKey KEY \ + forecolor 0 0 0 1 \ + textaligny 14 \ + textscale UI_INGAME_TEXTSIZE \ + alignrect ALIGN ITEM_ALIGN_LEFT 0 Y_POS ITEM_WIDTH ITEM_HEIGHT \ + type ITEM_TYPE_BUTTON \ + style WINDOW_STYLE_EMPTY \ + visible 1 \ + cvartest CVAR_TEST \ + hideCvar { "0" } \ + action { open DESTINATION } \ + } + +#define MENU_ITEM_HIDE(ITEM_NAME, DESTINATION, ITEM_TEXT, KEY, ALIGN, ITEM_WIDTH, Y_POS, CVAR_TEST, HIDE_OR_SHOW)\ + itemDef { \ + renderpoint \ + name ITEM_NAME \ + group ingameMain \ + text "> "ITEM_TEXT \ + shortcutKey KEY \ + forecolor 0 0 0 1 \ + textaligny 14 \ + textscale UI_INGAME_TEXTSIZE \ + alignrect ALIGN ITEM_ALIGN_LEFT 0 Y_POS ITEM_WIDTH ITEM_HEIGHT \ + type ITEM_TYPE_BUTTON \ + style WINDOW_STYLE_EMPTY \ + visible 1 \ + cvartest CVAR_TEST \ + HIDE_OR_SHOW \ + action { open DESTINATION } \ + } + { menuDef { @@ -9,23 +86,32 @@ visible 0 fullScreen 0 //onOOBClick { close _self } // this closes the window if it gets a click out of the rectangle - rect 0 0 640 480 + rect UI_MINX UI_MINY UI_WIDTH UI_HEIGHT focusColor RQ3_MAIN_FOCUSCOLOR disableColor .5 .5 .5 1 onOpen { setitemcolor window forecolor 5 5 5 0 ; timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; play "sound/ui/whoosh3.wav" ; - setfocus "btn_about" ; + setfocus "button_about" ; } itemdef { - name "ig-overlay" + name "ingame-back" group background - //rect 0 0 640 480 - rect UI_MINX UI_MINY UI_WIDTH UI_HEIGHT - style WINDOW_STYLE_FILLED - backcolor 0 0 0 0.5 + background UI_ASSETS"/ingame-back.tga" + rect 0 0 UI_WIDTH UI_HEIGHT + style WINDOW_STYLE_SHADER + visible 1 + decoration + } + + itemdef { + name "gradient-bottom" + group background + background UI_ASSETS"/ingame-gradient.tga" + rect 0 $evalfloat(UI_MAXY - 128) UI_WIDTH 128 + style WINDOW_STYLE_SHADER visible 1 decoration } @@ -42,192 +128,55 @@ visible 1 decoration } - + + itemdef { + name "gradient-top" + group background + background UI_ASSETS"/ingame-gradient-top.tga" + rect 0 0 UI_WIDTH 96 + style WINDOW_STYLE_SHADER + visible 1 + decoration + } + itemDef { renderpoint - name "paper" + name "spacer" style WINDOW_STYLE_SHADER - background UI_ASSETS"/paper_1" - forecolor MENUCOLOR_SETUP 1 - rect 96 48 320 420 + rect 146 80 320 420 anglevectors ANGLES visible 0 decoration } - - itemDef { - name "ig-logo" - group background - rect 88 16 256 128 - style WINDOW_STYLE_SHADER - background UI_ASSETS"/ingame-logo" - forecolor 1 1 1 1 - visible 0 - decoration - } - -/* - itemDef { - renderpoint - name "postit2" - group ingameMain - style WINDOW_STYLE_SHADER - background UI_ASSETS"/post_it" - //forecolor .8 .85 .9 1 - forecolor 0.85 0.75 0.5 1 - //rect -20 136 180 152 - rect $evalfloat(UI_MINX - 20) 136 180 152 - anglevectors -6 -96 - visible 1 - decoration - } -*/ - - //Restart - - itemdef { - renderpoint - name "btn_restart" - group ingameMain - text "> ^_R^_estart map" - shortcutKey "R" - forecolor 0 0 0 1 - textaligny 20 - textscale UI_MAIN_TEXTSIZE - alignrect "paper" ITEM_ALIGN_LEFT 32 160 120 24 - //alignrect "postit2" ITEM_ALIGN_LEFT $evalfloat(UI_MINX + 32) 8 120 24 - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_EMPTY - visible 1 - //action { show confirm } - action { open confirmRestart } - } - - //Exit to main menu - - itemdef { - name "btn_mainmenu" - group ingameMain - text "> ^_M^_ain menu" - shortcutKey "M" - forecolor 0 0 0 1 - textaligny 20 - textscale UI_MAIN_TEXTSIZE - alignrect "btn_restart" ITEM_ALIGN_LEFT 0 24 120 24 - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_EMPTY - visible 1 - action { open confirmMain } - } - - //Quit game - - itemdef { - name "btn_quit" - group ingameMain - text "> ^_E^_xit Reaction" - shortcutKey "E" - forecolor 0 0 0 1 - textaligny 20 - textscale UI_MAIN_TEXTSIZE - alignrect "btn_mainmenu" ITEM_ALIGN_LEFT 0 24 120 24 - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_EMPTY - visible 1 - action { open confirmQuit } - } - - - - -/* - itemDef { - renderpoint - name "postit" - group ingameMain - style WINDOW_STYLE_SHADER - background UI_ASSETS"/post_it" - //forecolor .8 .85 .9 1 - forecolor 0.85 0.75 0.45 1 - //rect -16 32 180 152 - rect $evalfloat(UI_MINX - 16) 32 180 152 - anglevectors 10 -80 - visible 1 - decoration - } -*/ - - //About itemdef { - renderpoint - name "btn_about" - group ingameMain - text "> ^_S^_erver info" - shortcutKey "S" - forecolor 0 0 0 1 - textaligny 20 - textscale UI_MAIN_TEXTSIZE - alignrect "paper" ITEM_ALIGN_LEFT 32 40 120 24 - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_EMPTY + name "logo" + group background + background UI_ASSETS"/logo2.tga" + rect $evalfloat(UI_WIDTH - 256) $evalfloat(UI_MAXY - 128) 256 128 + style WINDOW_STYLE_SHADER visible 1 - action { open ingame_about } + decoration } + + MENU_ITEM("button_about", "ingame_about", "^_S^_erver info", "S", "spacer", 86, 20) + MENU_ITEM_HIDE("button_join", "ingame_join", "^_J^_oin Game", "J", "button_about", 78, 20, "g_gametype", hideCvar { 0 }) + MENU_ITEM_HIDE("button_join_dm", "ingame_join_dm", "^_J^_oin Game", "J", "button_about", 78, 20, "g_gametype", showCvar { 0 }) + MENU_ITEM_TOGGLE("button_weapon", "ingame_weapon", "^_W^_eapon Selection", "W", "button_about", 129, 40, "g_gametype") + MENU_ITEM_TOGGLE("button_vote", "ingame_callvote", "^_V^_ote", "V", "button_weapon", 43, 20, "g_allowVote") + MENU_ITEM("button_ignore", "ingame_ignore", "^_I^_gnore", "I", "button_vote", 56, 20) + + MENU_ITEM_TOGGLE("button_addbot", "ingame_addbot", "^_A^_dd Bot", "A", "button_ignore", 64, 40, "bot_enable") + //MENU_ITEM_HIDE("button_addbot", "ingame_addbot", "^_A^_dd Bot", "A", "button_ignore", 64, 40, "ui_singlePlayerActive", showCvar { 1 }) + MENU_ITEM_TOGGLE("button_mm", "ingame_matchmode", "Mat^_c^_h Mode", "C", "button_addbot", 94, 20, "g_RQ3_matchmode") + MENU_ITEM_HIDE("button_devmode", "ingame_devmode", "^_D^_eveloper Mode", "D", "button_mm", 119, 20, "sv_cheats", hideCvar { 0 }) + MENU_ITEM("button_options", "ingame_setup", "^_O^_ptions", "O", "button_mm", 64, 40) + + MENU_ITEM("button_restart", "confirmRestart", "^_R^_estart", "R", "button_options", 62, 40) + MENU_ITEM("button_main", "confirmMain", "^_M^_ain Menu", "M", "button_restart", 84, 20) + MENU_ITEM("button_quit", "confirmQuit", "^_E^_xit Reaction", "E", "button_main", 100, 20) - //Options - - itemdef { - name "btn_options" - group ingameMain - text "> ^_O^_ptions" - shortcutKey "O" - forecolor 0 0 0 1 - textaligny 20 - textscale UI_MAIN_TEXTSIZE - alignrect "btn_about" ITEM_ALIGN_LEFT 0 24 120 24 - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_EMPTY - visible 1 - action { open ingame_setup } - } - - //Ignore - - itemdef { - name "btn_ignore" - group ingameMain - text "> ^_I^_gnore" - shortcutKey "I" - forecolor 0 0 0 1 - textaligny 20 - textscale UI_MAIN_TEXTSIZE - alignrect "btn_options" ITEM_ALIGN_LEFT 0 24 120 24 - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_EMPTY - visible 1 - action { open ingame_ignore } - } - - //Vote - - itemdef { - name "btn_vote" - group ingameMain - text "> ^_V^_ote" - shortcutKey "V" - forecolor 0 0 0 1 - textaligny 20 - textscale UI_MAIN_TEXTSIZE - alignrect "btn_ignore" ITEM_ALIGN_LEFT 0 24 120 24 - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_EMPTY - visible 1 - cvartest "g_allowVote" - showCvar { "1" } - action { open ingame_callvote } - } - } + } @@ -235,8 +184,8 @@ menuDef { name "confirmRestart" - rect 108 152 152 144 - onOpen { play "sound/ui/whoosh3.wav" } + rect 112 250 152 144 + onOpen { play "sound/ui/whoosh3.wav" ; setfocus no } onOOBClick { close _self ; open _prev } onEsc { close _self ; open _prev } disableColor .5 .5 .5 1 @@ -265,7 +214,7 @@ name restartConfirm group confirm autowrapped - text "Restart map?" + text "Restart Map?" forecolor 0 0 0 1 textaligny 20 textscale UI_MAIN_TEXTSIZE @@ -322,8 +271,8 @@ menuDef { name "confirmMain" - rect 88 176 160 144 - onOpen { play "sound/ui/whoosh3.wav" } + rect 118 272 160 144 + onOpen { play "sound/ui/whoosh3.wav" ; setfocus no } onOOBClick { close _self ; open _prev } onEsc { close _self ; open _prev } disableColor .5 .5 .5 1 @@ -352,7 +301,7 @@ name restartConfirm group confirm autowrapped - text "Main menu?" + text "Return to \nMain Menu?" forecolor 0 0 0 1 textaligny 20 textscale UI_MAIN_TEXTSIZE @@ -409,8 +358,8 @@ menuDef { name "confirmQuit" - rect 84 192 160 144 - onOpen { play "sound/ui/whoosh3.wav" } + rect 84 184 160 144 + onOpen { play "sound/ui/whoosh3.wav" ; setfocus no } onOOBClick { close _self ; open _prev } onEsc { close _self ; open _prev } disableColor .5 .5 .5 1 diff --git a/reaction/uifiles/ingame.txt b/reaction/uifiles/ingame.txt index 84601053..9ef3073c 100644 --- a/reaction/uifiles/ingame.txt +++ b/reaction/uifiles/ingame.txt @@ -7,6 +7,7 @@ //loadMenu { "ui/ingame_vote.menu" } loadMenu { "ui/ingame_callvote.menu" } loadMenu { "ui/ingame_setup.menu" } + loadMenu { "ui/ingame_record.menu" } loadMenu { "ui/ingame_join.menu" } loadMenu { "ui/ingame_join_dm.menu" } @@ -15,12 +16,12 @@ loadMenu { "ui/ingame_tkok.menu" } //loadMenu { "ui/ingame_player.menu" } - //loadMenu { "ui/ingame_addbot.menu" } - //loadMenu { "ui/ingame_matchmode.menu" } - //loadMenu { "ui/ingame_matchmode_captain.menu" } - //loadMenu { "ui/ingame_matchmode_referee.menu" } - //loadMenu { "ui/ingame_matchmode_settings.menu" } - //loadMenu { "ui/ingame_devmode.menu" } + loadMenu { "ui/ingame_addbot.menu" } + loadMenu { "ui/ingame_matchmode.menu" } + loadMenu { "ui/ingame_matchmode_captain.menu" } + loadMenu { "ui/ingame_matchmode_referee.menu" } + loadMenu { "ui/ingame_matchmode_settings.menu" } + loadMenu { "ui/ingame_devmode.menu" } loadMenu { "ui/ingame_presets.menu" } loadMenu { "ui/ingame_presets_edit.menu" } diff --git a/reaction/uifiles/ingame_callvote.menu b/reaction/uifiles/ingame_callvote.menu index 18aca136..911442ba 100644 --- a/reaction/uifiles/ingame_callvote.menu +++ b/reaction/uifiles/ingame_callvote.menu @@ -106,24 +106,26 @@ // // - // Map - ADD_TAB( - "^_M^_ap.", - "M", 1, "group2,group3", - alignrect "title" ITEM_ALIGN_LEFT 2 28 28 TAB_HEIGHT - ) - ADD_HINT("hint_tab1", "Call a vote for a map change", "group2,group3") - -//--------------------------------------------------------- - // Gametype ADD_TAB( "^_G^_ametype.", - "G", 2, "group1,group3", - alignrect "tab1" ITEM_ALIGN_RIGHT -58 0 58 TAB_HEIGHT + "G", 1, "group2,group3", + alignrect "title" ITEM_ALIGN_LEFT 2 28 55 TAB_HEIGHT ) - ADD_HINT("hint_tab2", "Call a vote for a gametype change", "group1,group3") + ADD_HINT("hint_tab1", "Call a vote for a gametype change", "group2,group3") + +//--------------------------------------------------------- + + // Map + + ADD_TAB( + "^_M^_ap.", + "M", 2, "group1,group3", + alignrect "tab1" ITEM_ALIGN_RIGHT -27 0 27 TAB_HEIGHT + ) + ADD_HINT("hint_tab2", "Call a vote for a map change", "group1,group3") + //--------------------------------------------------------- @@ -132,22 +134,68 @@ ADD_TAB( "^_K^_ick.", "K", 3, "group1,group2", - alignrect "tab2" ITEM_ALIGN_RIGHT -30 0 32 TAB_HEIGHT + alignrect "tab2" ITEM_ALIGN_RIGHT -31 0 32 TAB_HEIGHT ) ADD_HINT("hint_tab3", "Call a vote to kick a player from the server", "group1,group2") /* ========================================================== -Group # 1 - Map +Group # 1 - Gametype + +========================================================== +*/ + + BEGIN_SIMPLE_OPTION(1, 1) + alignrect "line" ITEM_ALIGN_LEFT 56 44 156 VSIZE + text "" + ownerdraw UI_NETGAMETYPE + ASSIGN_HINT("hint_tab1") + END_OPTION + + itemDef { + name "btn_game,allgroups,group1" + subgroup "fade_fore_alpha" + alignrect "line" ITEM_ALIGN_LEFT 228 46 36 16 + text "> ^_O^_K <" + shortcutKey "O" + style WINDOW_STYLE_EMPTY + forecolor .5 0 0 1 + textalignx 0 + textaligny 12 + textscale .225 + visible 1 + type ITEM_TYPE_BUTTON + action { play "sound/ui/whoosh3.wav" ; uiScript voteGame ; uiScript closeingame } + ASSIGN_HINT("hint_tab1") + } + + itemDef { + name "gametype_dots" + group "fade_fore_alpha,group1,allgroups" + style 0 + text ".............................................." + alignrect "gr1_ctrl1" ITEM_ALIGN_LEFT 0 0 168 20 + textscale .225 + textalign ITEM_ALIGN_LEFT + textaligny 20 + forecolor OPTION_COLOR + visible 1 + decoration + } + +/* +========================================================== + +Group # 2 - Map ========================================================== */ itemDef { text "Call a vote for" - name "hint_map,allgroups,group1,hints,fade_alpha" - group "fade_fore_alpha,group1,allgroups" + name "hint_map,allgroups,group2,hints,fade_alpha" + group "fade_fore_alpha,group2,allgroups" ownerdraw UI_ALLMAPS_SELECTION autowrapped forecolor HINT_COLOR 1 @@ -165,19 +213,18 @@ Group # 1 - Map itemDef { name "maplist" - subgroup "fade_fore_alpha,group1,allgroups" + subgroup "fade_fore_alpha,group2,allgroups" LISTBOX_STYLE(.225, 8) alignrect "line" ITEM_ALIGN_LEFT 4 32 188 124 feeder FEEDER_ALLMAPS visible 1 columns 1 2 140 25 - ASSIGN_HINT("hint_tab1") + ASSIGN_HINT("hint_tab2") } itemDef { - name "allgroups,group1,gr1_ctrl3,fade_alpha" - //name "vote_next" - group "fade_fore_alpha,group1,allgroups" + name "allgroups,group2,gr2_ctrl3,fade_alpha" + group "fade_fore_alpha,group2,allgroups" alignrect "paper" ITEM_ALIGN_LEFT 240 112 68 14 text "> ^_N^_ext map <" shortcutKey "N" @@ -194,7 +241,7 @@ Group # 1 - Map itemDef { name "vote_restart" - subgroup "fade_fore_alpha,group1,allgroups" + subgroup "fade_fore_alpha,group2,allgroups" alignrect "paper" ITEM_ALIGN_LEFT 240 128 84 14 text "> ^_R^_estart map <" shortcutKey "R" @@ -211,7 +258,7 @@ Group # 1 - Map itemDef { name "vote_map" - subgroup "fade_fore_alpha,group1,allgroups" + subgroup "fade_fore_alpha,group2,allgroups" alignrect "paper" ITEM_ALIGN_LEFT 240 224 36 14 text "> ^_O^_K <" shortcutKey "O" @@ -226,66 +273,17 @@ Group # 1 - Map ASSIGN_HINT("hint_map") } - ADD_HINT("hint_next", "Call a vote to change to the next map in rotation", "group1") - ADD_HINT("hint_restart", "Call a vote to restart the current map", "group1") + ADD_HINT("hint_next", "Call a vote to change to the next map in rotation", "group2") + ADD_HINT("hint_restart", "Call a vote to restart the current map", "group2") /* ========================================================== -Group # 2 - Gametype - -========================================================== -*/ - - //BEGIN_OPTION("Gametype", "g_gametype", ITEM_TYPE_MULTI, 1, 2) - BEGIN_SIMPLE_OPTION(1, 2) - alignrect "line" ITEM_ALIGN_LEFT 56 44 156 VSIZE - //type ITEM_TYPE_MULTI - text "" - ownerdraw UI_NETGAMETYPE - ASSIGN_HINT("hint_tab2") - END_OPTION - - itemDef { - name "btn_game,allgroups,group2" - subgroup "fade_fore_alpha" - alignrect "line" ITEM_ALIGN_LEFT 228 46 36 16 - text "> ^_O^_K <" - shortcutKey "O" - style WINDOW_STYLE_EMPTY - forecolor .5 0 0 1 - textalignx 0 - textaligny 12 - textscale .225 - visible 1 - type ITEM_TYPE_BUTTON - action { play "sound/ui/whoosh3.wav" ; uiScript voteGame ; uiScript closeingame } - ASSIGN_HINT("hint_tab2") - } - - itemDef { - name "gametype_dots" - group "fade_fore_alpha,group2,allgroups" - style 0 - text ".............................................." - alignrect "gr2_ctrl1" ITEM_ALIGN_LEFT 0 0 168 20 - textscale .225 - textalign ITEM_ALIGN_LEFT - textaligny 20 - forecolor OPTION_COLOR - visible 1 - decoration - } - -/* -========================================================== - Group # 3 - Kick ========================================================== */ itemDef { - //name "playerlist" name "allgroups,group3,gr3_ctrl1,fade_alpha" subgroup "fade_fore_alpha" LISTBOX_STYLE(.225, 8) @@ -293,15 +291,6 @@ Group # 3 - Kick feeder FEEDER_PLAYER_LIST visible 1 ASSIGN_HINT("hint_tab3") - /* - type ITEM_TYPE_LISTBOX - style WINDOW_STYLE_FILLED - elementwidth 192 - elementheight 15 - textscale .2 - elementtype LISTBOX_TEXT - forecolor 0 0 0 1 - */ } itemDef { diff --git a/reaction/uifiles/ingame_devmode.menu b/reaction/uifiles/ingame_devmode.menu index d73cd218..3be94593 100644 --- a/reaction/uifiles/ingame_devmode.menu +++ b/reaction/uifiles/ingame_devmode.menu @@ -1,4 +1,157 @@ #include "ui/menudef.h" +#define FADEIN_TIME 125 +#define ANGLES -1 -91 +#define ITEM_HEIGHT 14 +#define DEVMODE_OPTION(COMMAND, CMD_TEXT, CMD_SHORTCUT, CMD_ALIGN, ITEM_WIDTH ) \ + itemDef { \ + name "cmd_"COMMAND \ + text CMD_TEXT \ + shortcutKey CMD_SHORTCUT \ + type ITEM_TYPE_BUTTON \ + style WINDOW_STYLE_EMPTY \ + textstyle ITEM_TEXTSTYLE_NORMAL \ + alignrect CMD_ALIGN ITEM_ALIGN_LEFT 0 16 ITEM_WIDTH ITEM_HEIGHT \ + textalign ITEM_ALIGN_LEFT \ + textalignx 8 \ + textaligny 12 \ + textscale .225 \ + forecolor 0 0 0 1 \ + visible 1 \ + action { play "sound/ui/whoosh3.wav" ; exec COMMAND } \ + } + +#define DEVMODE_YESNO(COMMAND, CMD_TEXT, CMD_SHORTCUT, CMD_ALIGN) \ + itemdef { \ + name "cmd_"COMMAND \ + type ITEM_TYPE_YESNO \ + text CMD_TEXT":" \ + cvar COMMAND \ + shortcutKey CMD_SHORTCUT \ + kind YESNO_ICON_RIGHT \ + alignrect CMD_ALIGN ITEM_ALIGN_LEFT 0 16 64 ITEM_HEIGHT \ + textalign ITEM_ALIGN_RIGHT \ + textalignx 0 \ + textaligny 14 \ + textscale .225 \ + forecolor 0 0 0 1 \ + visible 1 \ + } + +{ + menuDef { + name "ingame_devmode" + visible 0 + fullscreen 0 + rect UI_MINX 44 232 272 + anglevectors ANGLES + focusColor RQ3_MAIN_FOCUSCOLOR + popup + style WINDOW_STYLE_EMPTY + //style WINDOW_STYLE_FILLED + //backcolor 0 0 0 .5 + onOpen { + play "sound/ui/whoosh3.wav" ; + setitemcolor window forecolor 5 5 5 0 ; + timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; + close "ingame" ; + } + onESC { play "sound/ui/whoosh3.wav" ; close _self } + onOOBClick { play "sound/ui/whoosh3.wav" ; close _self } + + itemDef { + renderpoint + name "paper" + menuAnchor + group window + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor .92 .97 1 1 + rect -4 -12 256 320 + anglevectors ANGLES + visible 1 + decoration + } + + // TITLE // + + itemDef { + renderpoint + name "title" + text "Developer Mode:" + forecolor .6 .0 .0 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 0 + textaligny 12 + textscale RQ3_MAIN_TEXTSIZE + alignrect "paper" ITEM_ALIGN_LEFT 28 36 240 36 + visible 1 + autowrapped + decoration + } + + itemDef { + renderpoint + name "spacer" + style WINDOW_STYLE_SHADER + alignrect "title" ITEM_ALIGN_LEFT 128 12 112 14 + visible 0 + decoration + } + + // BUTTONS // + + //DEVMODE_YESNO("noclip", "^_n^_oclip", "N", "spacer") + DEVMODE_YESNO("r_drawentities", "r_drawentities", "E", "spacer") + DEVMODE_YESNO("r_fastsky", "r_fastsky", "F", "cmd_r_drawentities") + DEVMODE_YESNO("r_lightmap", "r_lightmap", "L", "cmd_r_fastsky") + DEVMODE_YESNO("r_lockpvs", "r_lockpvs", "P", "cmd_r_lightmap") + DEVMODE_YESNO("r_showtris", "r_showtris", "T", "cmd_r_lockpvs") + DEVMODE_YESNO("r_speeds", "r_speeds", "S", "cmd_r_showtris") + DEVMODE_YESNO("cg_draw2D", "cg_draw2D", "C", "cmd_r_speeds") + DEVMODE_YESNO("cg_drawGun", "cg_drawGun", "D", "cmd_cg_draw2D") + DEVMODE_YESNO("cg_thirdPerson", "cg_thirdPerson", "D", "cmd_cg_drawGun") + //DEVMODE_OPTION("give all", "give ^_a^_ll", "A", "cmd_cg_drawgun", 48 ) + //DEVMODE_OPTION("god", "^_g^_od", "G", "cmd_give all", 48 ) + + //3rd Person Angle + itemDef { + type ITEM_TYPE_SLIDER + name "3rda" + text "Angle:" + cvarfloat "cg_thirdPersonAngle" 180 0 360 + alignrect "spacer" ITEM_ALIGN_LEFT -104 167 144 20 + textalign ITEM_ALIGN_RIGHT + textalignx 24 + textaligny 14 + textscale .225 + forecolor 0 0 0 1 + visible 1 + cvartest "cg_thirdPerson" + hideCvar { "0" } + } + + //3rd Person Range + itemDef { + type ITEM_TYPE_SLIDER + text "Range:" + cvarfloat "cg_thirdPersonRange" 200 40 840 + alignrect "3rda" ITEM_ALIGN_LEFT 0 20 144 20 + textalign ITEM_ALIGN_RIGHT + textalignx 24 + textaligny 14 + textscale .225 + forecolor 0 0 0 1 + visible 1 + cvartest "cg_thirdPerson" + hideCvar { "0" } + } + + } +} + +#if 0 +#include "ui/menudef.h" { @@ -291,4 +444,5 @@ } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/reaction/uifiles/ingame_join.menu b/reaction/uifiles/ingame_join.menu index c9b25d0d..bd8deb98 100644 --- a/reaction/uifiles/ingame_join.menu +++ b/reaction/uifiles/ingame_join.menu @@ -18,8 +18,9 @@ setitemcolor window forecolor 5 5 5 0 ; timefade window forecolor 5 5 5 1 0 FADEIN_TIME } - onESC { play "sound/ui/whoosh3.wav" ; close _self } - onOOBClick { play "sound/ui/whoosh3.wav" ; close _self } + //onESC { play "sound/ui/whoosh3.wav" ; close _self } + onESC { play "sound/ui/whoosh3.wav" } + //onOOBClick { play "sound/ui/whoosh3.wav" ; close _self } itemDef { renderpoint @@ -120,7 +121,7 @@ style WINDOW_STYLE_FILLED backcolor 0 0 0 .6 */ - action { play "sound/ui/whoosh3.wav" ; exec "cmd team blue" ; uiScript "weapAfterJoin" ; uiScript closeingame } + action { play "sound/ui/whoosh3.wav" ; exec "cmd team blue" ; uiScript "weapAfterJoin" ; close "ingame_join" } } itemDef { @@ -159,7 +160,7 @@ textscale .225 forecolor 0 0 .1 1 visible 1 - action { play "sound/ui/whoosh3.wav" ; exec "cmd team auto" ; uiScript "weapAfterJoin" ; uiScript closeingame } + action { play "sound/ui/whoosh3.wav" ; exec "cmd team auto" ; uiScript "weapAfterJoin" ; close "ingame_join" } /* style WINDOW_STYLE_FILLED backcolor 0 0 0 .6 @@ -180,7 +181,7 @@ textscale .225 forecolor 0 0 .1 1 visible 1 - action { play "sound/ui/whoosh3.wav" ; exec "cmd team s" ; uiScript closeingame } + action { play "sound/ui/whoosh3.wav" ; exec "cmd team s" ; close "ingame_join" } /* style WINDOW_STYLE_FILLED backcolor 0 0 0 .6 diff --git a/reaction/uifiles/ingame_join_dm.menu b/reaction/uifiles/ingame_join_dm.menu index f00c6581..9da12559 100644 --- a/reaction/uifiles/ingame_join_dm.menu +++ b/reaction/uifiles/ingame_join_dm.menu @@ -76,7 +76,7 @@ itemDef { name team1 text "" - cvar "ui_RQ3_teamCount1" + cvar "ui_RQ3_teamCount1" //doesn't work type ITEM_TYPE_NUMERICFIELD style WINDOW_STYLE_EMPTY alignrect title ITEM_ALIGN_LEFT 104 32 32 14 @@ -111,7 +111,7 @@ itemDef { name team3 text "" - cvar "ui_RQ3_numSpectators" + cvar "ui_RQ3_numSpectators" //doesn't work type ITEM_TYPE_NUMERICFIELD style WINDOW_STYLE_EMPTY alignrect title ITEM_ALIGN_LEFT 104 48 32 14 diff --git a/reaction/uifiles/ingame_record.menu b/reaction/uifiles/ingame_record.menu new file mode 100644 index 00000000..b4bee54f --- /dev/null +++ b/reaction/uifiles/ingame_record.menu @@ -0,0 +1,139 @@ +#include "ui/menudef.h" +#define FADEIN_TIME 125 +#define ANGLES -1 -91 +{ + menuDef { + name "ingame_record" + visible 0 + fullscreen 0 + rect 192 144 276 118 + anglevectors ANGLES + focusColor RQ3_MAIN_FOCUSCOLOR + popup + style WINDOW_STYLE_EMPTY + //style WINDOW_STYLE_FILLED + //backcolor 0 0 0 .5 + onOOBClick { close _self ; open _prev } + onOpen { + play "sound/ui/whoosh3.wav" ; + setitemcolor window forecolor 5 5 5 0 ; + timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; + setfocus "demoEntry" ; + } + onESC { close _self } + + itemDef { + renderpoint + name "paper" + menuAnchor + group window + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor 1 1 .92 1 + rect -4 -4 300 136 + anglevectors ANGLES + visible 1 + decoration + } + + // TITLE // + + itemDef { + renderpoint + name "title" + text "Demo recorder:" + forecolor .6 .0 .0 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 0 + textaligny 12 + textscale RQ3_MAIN_TEXTSIZE + alignrect "paper" ITEM_ALIGN_LEFT 28 26 240 36 + visible 1 + autowrapped + decoration + } + + itemDef { + renderpoint + name "demo" + text "Filename:" + style 0 + decoration + textscale .25 + alignrect "paper" ITEM_ALIGN_LEFT 40 48 52 20 + textalign ITEM_ALIGN_LEFT + textalignx 20 + textaligny 16 + forecolor 0 0 .15 1 + visible 1 + } + + itemDef { + name "demo_dots" + text "............................" + style 0 + decoration + textscale .25 + alignrect "demo" ITEM_ALIGN_LEFT 80 2 120 20 + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 19 + forecolor 0 0 0 1 + visible 1 + } + + itemDef { + name "demoEntry" + style WINDOW_STYLE_EMPTY + alignrect "demo_dots" ITEM_ALIGN_LEFT 0 0 120 20 + text "" + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 12 + maxchars 20 + maxPaintChars 12 + textscale .225 + type ITEM_TYPE_EDITFIELD + cvar "ui_RQ3_demoName" + forecolor 0 0 0 1 + visible 1 + } + + // Record // + + itemDef { + name "record" + alignrect "demoEntry" ITEM_ALIGN_LEFT 16 30 60 20 + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + textscale .25 + textalign ITEM_ALIGN_CENTER + textalignx 30 + textaligny 12 + text "^_R^_ecord" + shortcutKey "R" + forecolor .5 0 0 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; uiScript closeingame ; uiScript recordDemo } + } + + // Stop recording // + + itemDef { + alignrect "record" ITEM_ALIGN_LEFT 61 0 40 20 + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + textstyle ITEM_TEXTSTYLE_NORMAL + textscale .25 + textalign ITEM_ALIGN_CENTER + textalignx 20 + textaligny 12 + text "^_S^_top" + shortcutKey "S" + forecolor 0 0 0 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; uiScript closeingame ; exec "stoprecord"} + } + } +} diff --git a/reaction/uifiles/ingame_setup.menu b/reaction/uifiles/ingame_setup.menu index a5ec50b9..558a2852 100644 --- a/reaction/uifiles/ingame_setup.menu +++ b/reaction/uifiles/ingame_setup.menu @@ -272,6 +272,38 @@ decoration } +// Demo recorder + + itemdef { + name "btn_demo" + text "> ^_D^_emo recorder" + shortcutKey "D" + forecolor 0 0 0 1 + textalign 0 + textalignx 0 + textaligny 20 + textscale UI_MAIN_TEXTSIZE + alignrect "btn_replace" ITEM_ALIGN_LEFT 0 36 108 24 + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + visible 1 + action { openSpecial ingame_record } + } + + itemdef { + text "Shoot a scene" + forecolor .25 .25 .25 1 + textalign 0 + textalignx 12 + textaligny 12 + textscale 0.2 + alignrect "btn_demo" ITEM_ALIGN_LEFT 0 20 96 24 + type ITEM_TYPE_TEXT + style 0 + visible 1 + decoration + } + // Reset to defaults /* itemdef { diff --git a/reaction/uifiles/ingame_weapon.menu b/reaction/uifiles/ingame_weapon.menu index 34ed40d6..68bbc7f3 100644 --- a/reaction/uifiles/ingame_weapon.menu +++ b/reaction/uifiles/ingame_weapon.menu @@ -72,8 +72,8 @@ uiScript "updateItemBans" ; setfocus mp5 } - onESC { play "sound/ui/whoosh3.wav" ; close _self } - onOOBClick { play "sound/ui/whoosh3.wav" ; close _self } + onESC { play "sound/ui/whoosh3.wav" ; close _self ; open _prev } + onOOBClick { play "sound/ui/whoosh3.wav" ; close _self ; open _prev } itemDef { renderpoint @@ -82,7 +82,8 @@ group window style WINDOW_STYLE_SHADER background UI_ASSETS"/paper_1" - forecolor .9 .9 .82 1 + forecolor .934 .938 .891 1 + //forecolor .9 .9 .82 1 //forecolor .78 .82 .86 1 rect -8 -12 380 320 anglevectors ANGLES diff --git a/reaction/uifiles/main.menu b/reaction/uifiles/main.menu index 47ecc750..6259a7dc 100644 --- a/reaction/uifiles/main.menu +++ b/reaction/uifiles/main.menu @@ -350,41 +350,24 @@ decoration } - /* - itemDef { - name "paper" - subgroup "fade_alpha" - style WINDOW_STYLE_SHADER - background UI_ASSETS"/paper_1" - forecolor .95 1 .95 1 - rect 32 48 600 520 - anglevectors 7 -83 - visible 1 - decoration - } - -//Server list - - itemdef { - renderpoint - name serverlist_window - group serverlist - alignrect "paper" ITEM_ALIGN_LEFT 32 96 488 212 - //rect 20 96 600 212 - LISTBOX_STYLE(.175, 4) - feeder FEEDER_SERVERS - visible 1 - columns 5 2 72 72 280 40 12 404 5 10 464 5 5 524 6 6 - //mouseenter { setitemcolor serverlist bordercolor .7 0 0 1 } - //mouseexit { setitemcolor serverlist bordercolor .5 .5 .5 1 } - onFocus { show serverlist_hint ; timeFade serverlist_hint forecolor .9 .9 .9 1 0 250 } - leaveFocus { timeFade serverlist_hint forecolor .9 .9 .9 0 0 250 } - doubleClick { uiScript JoinServer } + itemDef { + cvarTest "developer" + showCvar { "1" } + text "> Test" + forecolor 0 0 0 1 + textalign 0 + textalignx 0 + textaligny 20 + textscale UI_MAIN_TEXTSIZE + alignrect "btn_quit" ITEM_ALIGN_LEFT 0 36 96 24 + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + visible 1 + action { open alphabet } } */ - } diff --git a/reaction/uifiles/menudef.h b/reaction/uifiles/menudef.h index dc91a7ac..a4608f2b 100644 --- a/reaction/uifiles/menudef.h +++ b/reaction/uifiles/menudef.h @@ -389,6 +389,8 @@ #define UI_MAIN_ITEM_SPACING_Y 36 #define UI_MAIN_HINT_OFFSET_Y 20 #define UI_MAIN_TEXTSIZE .28 +#define UI_INGAME_TEXTSIZE .28 +#define UI_COLOR_INACTIVE 0 0 0 0.2 //Ingame stuff diff --git a/reaction/uifiles/menus.txt b/reaction/uifiles/menus.txt index 5800305e..bff9c8ac 100644 --- a/reaction/uifiles/menus.txt +++ b/reaction/uifiles/menus.txt @@ -32,4 +32,6 @@ loadMenu { "ui/quit.menu" } + loadMenu { "ui/alphabet.menu" } + } diff --git a/reaction/uifiles/options.menu b/reaction/uifiles/options.menu index 9fba3d94..e0ac9492 100644 --- a/reaction/uifiles/options.menu +++ b/reaction/uifiles/options.menu @@ -335,7 +335,7 @@ Group # 2 - Crosshair itemDef { name "preview" subgroup "fade_fore_alpha,group2,allgroups" - alignrect "line" ITEM_ALIGN_LEFT 112 16 56 56 + alignrect "line" ITEM_ALIGN_LEFT 120 24 56 56 style WINDOW_STYLE_SHADER background UI_ASSETS"/crosshair_back" decoration @@ -351,7 +351,7 @@ Group # 2 - Crosshair textaligny -4 textscale .225 forecolor OPTION_COLOR - alignrect "line" ITEM_ALIGN_LEFT 52 52 96 VSIZE + alignrect "line" ITEM_ALIGN_LEFT 52 60 96 VSIZE decoration visible 1 } @@ -359,7 +359,7 @@ Group # 2 - Crosshair itemdef { renderpoint name "allgroups,group2,gr2_ctrl3,fade_alpha" - alignrect "line" ITEM_ALIGN_LEFT 112 16 56 56 + alignrect "line" ITEM_ALIGN_LEFT 120 24 56 56 ownerdraw UI_CROSSHAIR ASSIGN_HINT("hint_crosshair") visible 1 @@ -372,7 +372,7 @@ Group # 2 - Crosshair // Crosshair size // BEGIN_OPTION("Crosshair Size", "cg_crosshairSize", ITEM_TYPE_MULTI, 4, 2) - alignrect "line" ITEM_ALIGN_LEFT 112 72 112 VSIZE + alignrect "line" ITEM_ALIGN_LEFT 112 80 112 VSIZE ASSIGN_HINT("hint_crosshairsize") cvarFloatList { "Small" 16 @@ -451,26 +451,28 @@ Group # 3 - SSG Crosshair BEGIN_SLIDER("Alpha", "cg_RQ3_ssgColorA", 1, 0, 1, 4, 3) OPTION_BELOW("gr3_ctrl3") - ASSIGN_HINT("hint_color") + ASSIGN_HINT("hint_alpha") END_OPTION // Preview // - - itemdef { +/* + itemDef { name "allgroups,group3,gr3_ctrl5,fade_alpha" - style WINDOW_STYLE_FILLED - backcolor 0 0 0 .5 alignrect "gr3_ctrl1" ITEM_ALIGN_LEFT 112 0 136 136 + style WINDOW_STYLE_SHADER + background UI_ASSETS"/crosshair_back" decoration - visible 1 - } + }*/ itemdef { name "allgroups,group3,gr3_ctrl6,fade_alpha" alignrect "gr3_ctrl1" ITEM_ALIGN_LEFT 116 4 128 128 ownerdraw UI_SSG_CROSSHAIR + ASSIGN_HINT("hint_ssg") visible 1 } + + ADD_HINT("hint_ssg", "Change SSG crosshair style", "group3") // Next // diff --git a/reaction/uifiles/password.menu b/reaction/uifiles/password.menu index f5700f8f..970fd3f8 100644 --- a/reaction/uifiles/password.menu +++ b/reaction/uifiles/password.menu @@ -26,9 +26,8 @@ timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; play "sound/ui/whoosh3.wav" ; setQuitText confirm ; - setfocus no + setfocus passwordEntry } - //onOpen { play "sound/misc/menu1.wav" ; setfocus passwordEntry } //onESC { close password_popmenu ; open joinserver } onESC { close _self ; open _prev } onOOBClick { close _self ; open _prev } diff --git a/reaction/uifiles/replacements.menu b/reaction/uifiles/replacements.menu index 46d5c2c2..ce33e606 100644 --- a/reaction/uifiles/replacements.menu +++ b/reaction/uifiles/replacements.menu @@ -62,7 +62,6 @@ //style WINDOW_STYLE_FILLED //backcolor 0 0 0 1 popup - onOOBClick { close _self ; open _prev } onOpen { play "sound/ui/whoosh3.wav" ; uiScript buildReplacementList ACTIVATE_TAB(1) ; @@ -267,7 +266,7 @@ name "weapon_tip" group "fade_fore_alpha,group1,allgroups" style 0 - text "Select a weapon you\n" + text "Select the weapon you\n" "want to replace:" autowrapped alignrect "line" ITEM_ALIGN_LEFT 4 48 208 20 @@ -284,7 +283,7 @@ name "item_tip" group "fade_fore_alpha,group2,allgroups" style 0 - text "Select an item you\n" + text "Select the item you\n" "want to replace:" autowrapped alignrect "line" ITEM_ALIGN_LEFT 4 48 208 20 @@ -301,7 +300,7 @@ name "ammo_tip" group "fade_fore_alpha,group3,allgroups" style 0 - text "Select an ammo type\n" + text "Select the ammo type\n" "you want to replace:" autowrapped alignrect "line" ITEM_ALIGN_LEFT 4 48 208 20 diff --git a/reaction/uifiles/serverinfo.menu b/reaction/uifiles/serverinfo.menu index 7661c5e0..db9cd6cd 100644 --- a/reaction/uifiles/serverinfo.menu +++ b/reaction/uifiles/serverinfo.menu @@ -91,10 +91,11 @@ textscale .2 elementtype LISTBOX_TEXT feeder FEEDER_SERVERSTATUS - columns 4 4 40 20 - 40 40 10 - 80 40 10 - 120 20 20 + columns 4 + 2 0 22 + 44 0 5 + 92 0 5 + 136 0 22 forecolor 0 0 0 1 visible 1 } diff --git a/reaction/uifiles/shared.h b/reaction/uifiles/shared.h index 9e291815..f5e2b43f 100644 --- a/reaction/uifiles/shared.h +++ b/reaction/uifiles/shared.h @@ -40,7 +40,7 @@ textalignx 120 \ textaligny 24 \ forecolor 0 0 0.05 1 \ - text "(c) 2000-2010 Boomstick Studios\n\n\n\n\n" \ + text "(c) 2000-2011 Boomstick Studios\n\n\n\n\n" \ "http://www.rq3.com" \ autowrapped \ visible 1 \ @@ -51,7 +51,7 @@ name "copyright,_common_" autowrapped text "Reaction v1.0\n" - "Copyright (c) 2000 - 2010 Boomstick Studios\n" + "Copyright (c) 2000 - 2011 Boomstick Studios\n" "Quake III Arena (c) 1999 - 2000 id Software Inc." //style 0 textstyle 3