From 53627aa7c3664091e6d58c5698bf8be910d383cf Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Sun, 12 Apr 2020 13:22:46 -0400 Subject: Gameplay Fixes - Updated the team and class selection, text chat, killfeed, voice chat, target ID, disguise panel, item meters, spell selection, killstreak, stopwatch, quickswitch, map info, tournament spectator and vote panel. - Fixed the post-match summary page not displaying properly. --- customizations/team_menu/classselection-center.res | 18 +- customizations/team_menu/classselection.res | 167 +++++++---------- customizations/team_menu/teammenu-center.res | 35 ++-- customizations/team_menu/teammenu.res | 199 ++++++--------------- 4 files changed, 146 insertions(+), 273 deletions(-) (limited to 'customizations/team_menu') diff --git a/customizations/team_menu/classselection-center.res b/customizations/team_menu/classselection-center.res index c21c6f3..13e269a 100644 --- a/customizations/team_menu/classselection-center.res +++ b/customizations/team_menu/classselection-center.res @@ -11,7 +11,9 @@ "SidePanelBG" { - "fillcolor" "0 0 0 0" + "wide" "f0" + "tall" "f0" + "fillcolor" "0 0 0 150" } "scout" @@ -71,23 +73,19 @@ "random" { "xpos" "c80" - "ypos" "c101" + "ypos" "c100" } "EditLoadoutButton" [$WIN32] { - "xpos" "r180" - "wide" "120" - "textAlignment" "center" - "font" "CerbeticaBold16" + "xpos" "c80" + "ypos" "c120" } "CancelButton" [$WIN32] { - "xpos" "c-295" - "wide" "100" - "textAlignment" "center" - "font" "CerbeticaBold16" + "xpos" "c180" + "ypos" "c100" } "numScout" { diff --git a/customizations/team_menu/classselection.res b/customizations/team_menu/classselection.res index cfafccd..47e72d2 100644 --- a/customizations/team_menu/classselection.res +++ b/customizations/team_menu/classselection.res @@ -2,7 +2,7 @@ { "class" { - "ControlName" "ImagePanel" + "ControlName" "Frame" "fieldName" "class" "xpos" "0" "ypos" "0" @@ -13,7 +13,21 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "fillcolor" "0 0 0 128" + } + + "SidePanelBG" + { + "ControlName" "ImagePanel" + "fieldName" "SidePanelBG" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "255" + "tall" "f0" + "visible" "1" + "enabled" "1" + "scaleImage" "1" + "fillcolor" "0 0 0 120" } "SysMenu" @@ -34,33 +48,18 @@ "SelectClassLabel" { "ControlName" "CExLabel" - "fieldName" "SelectClassLabel" - "xpos" "9999" - "ypos" "9999" - "zpos" "5" + "fieldName" "SelectTeamLabel" + "xpos" "0" + "ypos" "15" + "zpos" "6" "wide" "255" "tall" "30" - "visible" "1" - "enabled" "1" "labelText" "#TF_SelectAClass" "textAlignment" "center" - "font" "CerbeticaBold28" - "fgcolor" "200 187 161 255" - } - - "SidePanelBG" - { - "ControlName" "ImagePanel" - "fieldName" "SidePanelBG" - "xpos" "0" - "ypos" "0" - "zpos" "0" - "wide" "255" - "tall" "f0" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - "fillcolor" "0 0 0 60" + "font" "CerbeticaBold32" + "visible" "0" + "enabled" "0" + "fgcolor" "TanLight" } "scout" @@ -77,7 +76,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "&1 Scout" + "labelText" "&1. Scout" "textAlignment" "west" "Command" "joinclass scout" "Default" "1" @@ -88,8 +87,8 @@ "fgcolor" "235 226 202 255" "defaultFgColor_override" "235 226 202 255" "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "depressedFgColor_override" "235 226 202 255" + "selectedFgColor_override" "72 255 255 255" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -114,7 +113,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "&2 Soldier" + "labelText" "&2. Soldier" "textAlignment" "west" "Command" "joinclass soldier" "Default" "0" @@ -125,8 +124,8 @@ "fgcolor" "235 226 202 255" "defaultFgColor_override" "235 226 202 255" "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "depressedFgColor_override" "235 226 202 255" + "selectedFgColor_override" "72 255 255 255" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -151,7 +150,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "&3 Pyro" + "labelText" "&3. Pyro" "textAlignment" "west" "Command" "joinclass pyro" "Default" "0" @@ -188,7 +187,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "&4 Demoman" + "labelText" "&4. Demoman" "textAlignment" "west" "Command" "joinclass demoman" "Default" "0" @@ -210,7 +209,7 @@ "selectonhover" "1" "keyboardinputenabled" "0" } - + "heavyweapons" { "ControlName" "CExLabel" @@ -225,7 +224,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "&5 Heavy" + "labelText" "&5. Heavy" "textAlignment" "west" "Command" "joinclass heavyweapons" "Default" "0" @@ -262,7 +261,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "&6 Engineer" + "labelText" "&6. Engineer" "textAlignment" "west" "Command" "joinclass engineer" "Default" "0" @@ -299,7 +298,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "&7 Medic" + "labelText" "&7. Medic" "textAlignment" "west" "Command" "joinclass medic" "Default" "0" @@ -321,7 +320,7 @@ "selectonhover" "1" "keyboardinputenabled" "0" } - + "sniper" { "ControlName" "CExImageButton" @@ -336,7 +335,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "&8 Sniper" + "labelText" "&8. Sniper" "textAlignment" "west" "Command" "joinclass sniper" "Default" "0" @@ -373,7 +372,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "&9 Spy" + "labelText" "&9. Spy" "textAlignment" "west" "Command" "joinclass spy" "Default" "0" @@ -398,24 +397,22 @@ "random" { - "ControlName" "CExLabel" + "ControlName" "CExButton" "fieldName" "random" "xpos" "30" - "ypos" "419" + "ypos" "r58" "zpos" "6" - "wide" "150" + "wide" "80" "tall" "16" "autoResize" "0" "pinCorner" "2" "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "&R Random" + "labelText" "(&R) RANDOM" "textAlignment" "west" "Command" "joinclass random" - "Default" "0" "font" "CerbeticaBold16" - "scaleImage" "1" "paintbackground" "0" "fgcolor" "235 226 202 255" @@ -427,31 +424,27 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" "sound_armed" "UI/buttonrollover.wav" - - "stayselectedonclick" "1" - "selectonhover" "1" - "keyboardinputenabled" "0" } - "EditLoadoutButton" [$WIN32] + "CancelButton" [$WIN32] { "ControlName" "CExButton" - "fieldName" "EditLoadoutButton" - "xpos" "135" + "fieldName" "CancelButton" + "xpos" "30" "ypos" "r38" "zpos" "6" - "wide" "100" - "tall" "25" + "wide" "80" + "tall" "16" "autoResize" "0" "pinCorner" "2" "visible" "1" "enabled" "1" "tabPosition" "0" - "paintbackground" "0" - "labelText" "(&E) EDIT LOADOUT" + "labelText" "(&Q) CANCEL" "textAlignment" "west" - "Command" "openloadout" - "font" "CerbeticaBold14" + "Command" "vguicancel" + "font" "CerbeticaBold16" + "paintbackground" "0" "fgcolor" "235 226 202 255" "defaultFgColor_override" "235 226 202 255" @@ -464,26 +457,25 @@ "sound_armed" "UI/buttonrollover.wav" } - "CancelButton" [$WIN32] + "EditLoadoutButton" [$WIN32] { "ControlName" "CExButton" - "fieldName" "CancelButton" - "xpos" "30" + "fieldName" "EditLoadoutButton" + "xpos" "125" "ypos" "r38" "zpos" "6" - "wide" "75" - "tall" "25" + "wide" "110" + "tall" "16" "autoResize" "0" "pinCorner" "2" "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "(&C) CANCEL" - "textAlignment" "west" - "Command" "vguicancel" - "font" "CerbeticaBold14" "paintbackground" "0" - "fgcolor" "235 226 202 255" + "labelText" "(&E) EDIT LOADOUT" + "textAlignment" "west" + "Command" "openloadout" + "font" "CerbeticaBold16" "fgcolor" "235 226 202 255" "defaultFgColor_override" "235 226 202 255" @@ -553,42 +545,19 @@ } } - "Hint" - { - "ControlName" "CExLabel" - "fieldName" "Hint" - "xpos" "c-300" - "ypos" "95" - "zpos" "2" - "wide" "600" - "tall" "50" - "autoResize" "1" - "pinCorner" "2" - "visible" "0" - "enabled" "1" - "tabPosition" "0" - "labelText" "%hint%" - "textAlignment" "left" - "wrap" "1" - "font" "HudFontMediumSmallSecondary" - "fgcolor" "212 160 23 255" - } - "ShadedBar" { "ControlName" "ImagePanel" "fieldName" "ShadedBar" - "xpos" "9999" - "ypos" "r50" - "zpos" "4" + "xpos" "0" + "ypos" "0" + "zpos" "0" "wide" "f0" - "tall" "50" + "tall" "f0" "visible" "1" "enabled" "1" - "tabPosition" "0" - "image" "loadout_bottom_gradient" - "tileImage" "1" "PaintBackgroundType" "0" + "fillcolor" "0 0 0 50" } "countImage0" [$WIN32] @@ -1084,10 +1053,10 @@ "pinCorner" "0" "visible" "1" "enabled" "1" + "render_texture" "0" "fov" "25" - "allow_rot" "0" + "allow_rot" "1" "paintbackground" "1" - "render_texture" "0" "paintbackgroundenabled" "1" "bgcolor_override" "255 255 255 0" diff --git a/customizations/team_menu/teammenu-center.res b/customizations/team_menu/teammenu-center.res index 6cfb517..dde4e99 100644 --- a/customizations/team_menu/teammenu-center.res +++ b/customizations/team_menu/teammenu-center.res @@ -38,6 +38,11 @@ "textAlignment" "west" } + "SelectTeamLabel" + { + "visible" "0" + } + "teambutton0" { "xpos" "c-110" @@ -87,6 +92,12 @@ "font" "CerbeticaBold16" } + "AutoJoinBG" + { + "visible" "0" + "enabled" "0" + } + "teambutton3" { "xpos" "c-110" @@ -98,6 +109,12 @@ "font" "CerbeticaBold16" } + "SpectateBG" + { + "visible" "0" + "enabled" "0" + } + "BlueCount" { "xpos" "c-157" @@ -156,22 +173,4 @@ "font" "Cerbetica14" "fgcolor" "255 255 255 175" } - - "HighlanderLabel" - { - "xpos" "c-50" - "ypos" "c100" - "wide" "105" - } - - "HighlanderLabelShadow" - { - "wide" "105" - } - - "CancelButton" - { - "xpos" "r190" - "wide" "150" - } } \ No newline at end of file diff --git a/customizations/team_menu/teammenu.res b/customizations/team_menu/teammenu.res index 2db7ae9..4314de3 100644 --- a/customizations/team_menu/teammenu.res +++ b/customizations/team_menu/teammenu.res @@ -15,59 +15,19 @@ "fgcolor" "255 0 0 255" "tabPosition" "0" } - "MainBG" - { - "ControlName" "ImagePanel" - "fieldName" "MainBG" - "xpos" "0" - "ypos" "0" - "zpos" "0" - "wide" "f0" - "tall" "f0" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - "fillcolor" "0 0 0 0" - } "SidePanelBG" { "ControlName" "ImagePanel" "fieldName" "SidePanelBG" "xpos" "0" "ypos" "0" - "zpos" "1" + "zpos" "0" "wide" "255" "tall" "f0" "visible" "1" "enabled" "1" "scaleImage" "1" - "fillcolor" "0 0 0 60" - } - "AutojoinBackground" - { - "ControlName" "ImagePanel" - "fieldName" "AutojoinBackground" - "xpos" "0" - "ypos" "c-75" - "zpos" "0" - "wide" "255" - "tall" "30" - "visible" "1" - "enabled" "1" - "fillcolor" "0 0 0 100" - } - "SpectateBackground" - { - "ControlName" "ImagePanel" - "fieldName" "SpectateBackground" - "xpos" "0" - "ypos" "c45" - "zpos" "0" - "wide" "255" - "tall" "30" - "visible" "1" - "enabled" "1" - "fillcolor" "0 0 0 100" + "fillcolor" "0 0 0 120" } "SysMenu" @@ -100,32 +60,12 @@ "tabPosition" "0" } - "mapname" - { - "ControlName" "Label" - "fieldName" "mapname" - "xpos" "10" - "ypos" "35" - "wide" "235" - "tall" "30" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "1" - "font" "CerbeticaBold28" - "fgcolor" "235 226 202 255" - } - "SelectTeamLabel" { "ControlName" "CExLabel" "fieldName" "SelectTeamLabel" "xpos" "0" - "ypos" "c165" + "ypos" "15" "zpos" "6" "wide" "255" "tall" "30" @@ -134,7 +74,7 @@ "font" "CerbeticaBold32" "visible" "1" "enabled" "1" - "fgcolor" "200 187 161 255" + "fgcolor" "TanLight" } "teambutton0" @@ -142,7 +82,7 @@ "ControlName" "CTFTeamButton" "fieldName" "teambutton0" "xpos" "10" - "ypos" "c-35" + "ypos" "c5" "zpos" "3" "wide" "245" "tall" "30" @@ -151,7 +91,7 @@ "visible" "1" "enabled" "1" "tabPosition" "3" - "labelText" "&3 BLU" [$WIN32] + "labelText" "&3. BLU" [$WIN32] "textAlignment" "west" "dulltext" "0" "brighttext" "0" @@ -166,16 +106,16 @@ "BlueTeamBG" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "BlueTeamBG" "xpos" "0" - "ypos" "c-35" + "ypos" "c5" "zpos" "0" "wide" "255" "tall" "30" "visible" "1" "enabled" "1" - "fillcolor" "70 130 180 125" + "bgcolor_override" "70 130 180 125" } "teambutton1" @@ -183,7 +123,7 @@ "ControlName" "CTFTeamButton" "fieldName" "teambutton1" "xpos" "10" - "ypos" "c5" + "ypos" "c45" "zpos" "3" "wide" "245" "tall" "30" @@ -192,7 +132,7 @@ "visible" "1" "enabled" "1" "tabPosition" "3" - "labelText" "&4 RED" [$WIN32] + "labelText" "&4. RED" [$WIN32] "textAlignment" "west" "dulltext" "0" "brighttext" "0" @@ -208,16 +148,16 @@ "RedTeamBG" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "RedTeamBG" "xpos" "0" - "ypos" "c5" + "ypos" "c45" "zpos" "0" "wide" "255" "tall" "30" "visible" "1" "enabled" "1" - "fillcolor" "205 50 50 153" + "bgcolor_override" "205 50 50 153" } "teambutton2" @@ -233,13 +173,14 @@ "pinCorner" "2" "visible" "1" "enabled" "1" - "tabPosition" "1" - "labelText" "&1 Auto-Join" + "tabPosition" "3" + "labelText" "&1. Auto-Join" "textAlignment" "west" "dulltext" "0" "brighttext" "0" "paintborder" "0" "command" "jointeam auto" + "font" "CerbeticaBold20" "defaultFgColor_override" "255 255 255 128" "armedFgColor_override" "235 226 202 255" @@ -247,12 +188,26 @@ "selectedFgColor_override" "235 226 202 255" } + "AutoJoinBG" + { + "ControlName" "EditablePanel" + "fieldName" "AutoJoinBG" + "xpos" "0" + "ypos" "c-75" + "zpos" "0" + "wide" "255" + "tall" "30" + "visible" "1" + "enabled" "1" + "bgcolor_override" "HudBlack" + } + "teambutton3" { "ControlName" "CTFTeamButton" "fieldName" "teambutton3" "xpos" "10" - "ypos" "c45" + "ypos" "c-35" "zpos" "3" "wide" "245" "tall" "30" @@ -260,13 +215,14 @@ "pinCorner" "2" "visible" "1" "enabled" "1" - "tabPosition" "2" - "labelText" "&2 Spectate" [$WIN32] + "tabPosition" "3" + "labelText" "&2. Spectate" [$WIN32] "textAlignment" "west" "dulltext" "0" "brighttext" "0" "paintborder" "0" "command" "jointeam spectate" + "font" "CerbeticaBold20" "defaultFgColor_override" "255 255 255 128" "armedFgColor_override" "235 226 202 255" @@ -274,48 +230,18 @@ "selectedFgColor_override" "235 226 202 255" } - "TeamMenuAuto" + "SpectateBG" { - "ControlName" "CExLabel" - "fieldName" "TeamMenuAuto" - "xpos" "9999" - "ypos" "9999" - "zpos" "1" - "wide" "102" - "tall" "24" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "labelText" "#TF_Random" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "wrap" "0" - "font" "MenuSmallFont" - "fgcolor" "Black" - } - - "TeamMenuSpectate" - { - "ControlName" "CExLabel" - "fieldName" "TeamMenuSpectate" - "xpos" "9999" - "ypos" "9999" - "zpos" "1" - "wide" "0" - "tall" "0" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "labelText" "" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "wrap" "0" - "font" "CerbeticaBold16" - "fgcolor" "242 242 242 255" + "ControlName" "EditablePanel" + "fieldName" "SpectateBG" + "xpos" "0" + "ypos" "c-35" + "zpos" "0" + "wide" "255" + "tall" "30" + "visible" "1" + "enabled" "1" + "bgcolor_override" "HudBlack" } "MenuBG" @@ -339,8 +265,9 @@ "ControlName" "CExLabel" "fieldName" "BlueCount" "xpos" "-10" - "ypos" "c-35" + "ypos" "c5" "zpos" "1" + "zpos" "3" "wide" "255" "tall" "30" "autoResize" "0" @@ -360,8 +287,8 @@ "ControlName" "CExLabel" "fieldName" "RedCount" "xpos" "-10" - "ypos" "c5" - "zpos" "1" + "ypos" "c45" + "zpos" "3" "wide" "255" "tall" "30" "autoResize" "0" @@ -387,8 +314,8 @@ "tall" "50" "autoResize" "0" "pinCorner" "0" - "visible" "1" - "enabled" "1" + "visible" "0" + "enabled" "0" "labelText" "#TF_Highlander_Mode" "textAlignment" "Center" "dulltext" "0" @@ -476,26 +403,6 @@ { "ControlName" "CExButton" "fieldName" "CancelButton" - "xpos" "0" - "ypos" "r40" - "zpos" "6" - "wide" "255" - "tall" "30" - "autoResize" "0" - "pinCorner" "2" - "visible" "0" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_Cancel" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "paintbackground""0" - "command" "cancelmenu" - "font" "CerbeticaBold16" - "defaultFgColor_override" "255 255 255 128" - "armedFgColor_override" "235 226 202 255" - "depressedFgColor_override" "255 255 255 128" - "selectedFgColor_override" "235 226 202 255" + "wide" "0" } } \ No newline at end of file -- cgit v1.2.3