diff options
71 files changed, 1556 insertions, 1365 deletions
diff --git a/customizations/main_menu/mainmenuoverride-classic.res b/customizations/main_menu/mainmenuoverride-classic.res index 4e80008..8bfb28b 100644 --- a/customizations/main_menu/mainmenuoverride-classic.res +++ b/customizations/main_menu/mainmenuoverride-classic.res @@ -17,6 +17,7 @@ "button_x_offset" "-285" "button_y" "120" "button_y_delta" "5" + "button_kv" { "xpos" "0" @@ -55,24 +56,6 @@ "defaultFgColor_override" "235 226 202 255" "armedFgColor_override" "72 255 255 255" "depressedFgColor_override" "72 255 255 255" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - "image_depressedcolor" "72 255 255 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "6" - "ypos" "6" - "zpos" "1" - "wide" "14" - "tall" "14" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - } } } @@ -163,17 +146,30 @@ "Background" { - "ControlName" "ImagePanel" + "ControlName" "ScalableImagePanel" "fieldName" "Background" - "xpos" "0" + "xpos" "cs-0.5" "ypos" "0" "zpos" "-200" - "wide" "0" - "tall" "0" + "wide" "o1.6" + "tall" "f0" "visible" "0" "enabled" "1" "image" "" "scaleImage" "1" + "proportionaltoparent" "1" + + if_wider + { + "wide" "f0" + "tall" "o0.628" + } + + if_taller + { + "wide" "o1.6" + "tall" "f0" + } } "TFLogoImage" @@ -235,45 +231,22 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "textinsetx" "25" - "labelText" "" - "use_proportional_insets" "1" - "font" "HudFontSmallBold" - "command" "open_rank_type_menu" - "textAlignment" "west" + "labelText" "v" + "font" "CustomIcons" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" "default" "1" - "sound_depressed" "UI/buttonclick.wav" - "sound_released" "vo/null.mp3" "actionsignallevel" "1" - "proportionaltoparent" "1" - + "command" "open_rank_type_menu" + "paintbackground" "0" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "0" - "paintborder" "0" - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "cs-0.5" - "ypos" "cs-0.5" - "zpos" "1" - "wide" "f2" - "tall" "f2" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - "image" "glyph_options" - - "proportionaltoparent" "1" - "mouseinputenabled" "0" - "keyboardinputenabled" "0" - } + + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" } "RankTooltipPanel" @@ -301,7 +274,7 @@ "ypos" "250" "zpos" "0" "wide" "170" - "tall" "60" + "tall" "56" "visible" "1" "proportionaltoparent" "1" "mouseinputenabled" "0" @@ -327,7 +300,7 @@ "textinsety" "10" "font" "HudFontSmallestBold" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" "labelText" "#TF_MM_NoGC_Rank" "textAlignment" "north-west" "use_proportional_insets" "1" @@ -465,70 +438,58 @@ } } - "WatchStreamButton" + "QuestLogButton" { - "ControlName" "CExImageButton" - "fieldName" "WatchStreamButton" - "xpos" "r28" + "ControlName" "EditablePanel" + "fieldName" "QuestLogButton" + "xpos" "rs1-10" "ypos" "65" - "zpos" "0" + "zpos" "1" "wide" "20" "tall" "20" "autoResize" "0" - "pinCorner" "0" + "pinCorner" "3" "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "" - "Command" "engine hud_reloadscheme" - - "defaultBgColor_override" "Transparent" - "armedBgColor_override" "Transparent" - "depressedBgColor_override" "Transparent" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - "SubImage" + "SubButton" { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "2" - "ypos" "2" - "zpos" "1" - "wide" "18" - "tall" "18" - "visible" "1" - "enabled" "1" - "scaleImage" "1" + "ControlName" "CExImageButton" + "fieldName" "SubButton" + "xpos" "0" + "ypos" "0" + "wide" "20" + "tall" "20" + "autoResize" "0" + "pinCorner" "3" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "r" + "font" "CustomIcons" + "command" "questlog" "proportionaltoparent" "1" - "image" "icon_resume" - "drawcolor_override" "235 226 202 255" - } - } + "textAlignment" "center" + "default" "1" + "actionsignallevel" "2" + "paintbackground" "0" + "paintborder" "0" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" - "StreamListPanel" - { - "ControlName" "CTFStreamListPanel" - "fieldName" "StreamListPanel" - "xpos" "r330" - "ypos" "65" - "zpos" "1" - "wide" "300" - "tall" "325" - "visible" "0" - "PaintBackgroundType" "0" - "paintbackground" "2" - "bgcolor_override" "DarkGrey" + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "72 255 255 255" + } } - "QuestLogButton" + "MOTD_ShowButtonPanel" { "ControlName" "EditablePanel" - "fieldName" "QuestLogButton" - "xpos" "r28" + "fieldName" "MOTD_ShowButtonPanel" + "xpos" "rs1-10" "ypos" "90" - "zpos" "1" + "zpos" "0" "wide" "20" "tall" "20" "autoResize" "0" @@ -539,23 +500,23 @@ "SubButton" { - "ControlName" "CExImageButton" - "fieldName" "SubButton" - "xpos" "0" - "ypos" "0" - "wide" "20" - "tall" "20" - "autoResize" "0" - "pinCorner" "3" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "x" - "font" "CustomIcons" - "command" "questlog" - "proportionaltoparent" "1" - "textAlignment" "center" - "default" "1" + "ControlName" "CExImageButton" + "fieldName" "SubButton" + "xpos" "0" + "ypos" "0" + "wide" "20" + "tall" "20" + "autoResize" "0" + "pinCorner" "3" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "o" + "font" "CustomIcons" + "command" "motd_show" + "use_proportional_insets" "1" + "textAlignment" "center" + "default" "1" "actionsignallevel" "2" "paintbackground" "0" "paintborder" "0" @@ -567,40 +528,34 @@ } } - "MOTD_ShowButtonPanel" + "RefreshHUDButton" { "ControlName" "EditablePanel" - "fieldName" "MOTD_ShowButtonPanel" - "xpos" "r28" + "fieldName" "RefreshHUDButton" + "xpos" "rs1-09" "ypos" "115" - "zpos" "0" + "zpos" "1" "wide" "20" "tall" "20" - "autoResize" "0" - "pinCorner" "3" "visible" "1" - "enabled" "1" - "tabPosition" "0" - - "MOTD_ShowButtonPanel_SB" + + "SubButton" { - "ControlName" "CExImageButton" - "fieldName" "MOTD_ShowButtonPanel_SB" - "xpos" "0" - "ypos" "0" - "wide" "20" - "tall" "20" - "autoResize" "0" - "pinCorner" "3" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "o" - "font" "CustomIcons" - "command" "motd_show" + "ControlName" "CExImageButton" + "fieldName" "SubButton" + "xpos" "0" + "ypos" "0" + "wide" "20" + "tall" "20" + "autoResize" "0" + "pinCorner" "3" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "font" "CustomIcons" "use_proportional_insets" "1" - "textAlignment" "center" - "default" "1" + "textAlignment" "center" + "default" "1" "actionsignallevel" "2" "paintbackground" "0" "paintborder" "0" @@ -672,42 +627,22 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labeltext" "" - "font" "" + "labeltext" "(" + "font" "CustomIcons" "textAlignment" "center" "dulltext" "0" "brighttext" "0" "default" "0" "actionsignallevel" "2" - - "sound_depressed" "UI/buttonclick.wav" - "sound_released" "UI/buttonclickrelease.wav" "Command" "motd_hide" "paintbackground" "0" - - //"defaultFgColor_override" "TanLight" - //"armedFgColor_override" "TanDarker" - "defaultFgColor_override" "Blank" - "armedFgColor_override" "Blank" - "depressedFgColor_override" "Blank" - - "image_drawcolor" "TanLight" - "image_armedcolor" "255 0 0 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "0" - "ypos" "0" - "zpos" "1" - "wide" "14" - "tall" "14" - "visible" "1" - "enabled" "1" - "image" "replay/thumbnails/close" - "scaleImage" "1" - } + + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "255 0 0 255" + "depressedFgColor_override" "TanLight" } "MOTD_HeaderIcon" @@ -729,7 +664,7 @@ { "ControlName" "CExLabel" "fieldName" "MOTD_TitleLabel" - "font" "FontRegular14" + "font" "HudFontSmall" "labelText" "%motdtitle%" "textAlignment" "west" "xpos" "10" @@ -748,7 +683,7 @@ { "ControlName" "CExLabel" "fieldName" "MOTD_Label" - "font" "FontRegular12" + "font" "HudFontSmallest" "labelText" "%motddate%" "textAlignment" "north-west" "xpos" "10" @@ -832,7 +767,7 @@ { "ControlName" "CExLabel" "fieldName" "MOTD_TextLabel" - "font" "FontRegular12" + "font" "HudFontSmallest" "labelText" "%motdtext%" "textAlignment" "north-west" "xpos" "0" @@ -899,7 +834,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "" - "font" "FontRegular12" + "font" "HudFontSmallest" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -944,7 +879,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "" - "font" "FontRegular12" + "font" "HudFontSmallest" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -981,7 +916,7 @@ "fieldName" "Notifications_Panel" "xpos" "r240" "ypos" "60" - "zpos" "1" + "zpos" "100" "wide" "210" "tall" "80" "visible" "0" @@ -1004,39 +939,22 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labeltext" "" - "font" "HudFontSmallBold" + "labeltext" "(" + "font" "CustomIcons" "textAlignment" "center" "dulltext" "0" "brighttext" "0" "default" "0" "actionsignallevel" "2" "Command" "noti_hide" + "paintbackground" "0" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "0" - - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "72 255 255 255" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "255 0 0 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "0" - "ypos" "0" - "zpos" "1" - "wide" "14" - "tall" "14" - "visible" "1" - "enabled" "1" - "image" "replay/thumbnails/close" - "scaleImage" "1" - } + + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "255 0 0 255" + "depressedFgColor_override" "235 226 202 255" } "Notifications_TitleLabel" @@ -1097,14 +1015,14 @@ "FriendsContainer" { "ControlName" "EditablePanel" - "fieldname" "FriendsContainer" + "fieldName" "FriendsContainer" "xpos" "80" "ypos" "285" "zpos" "5" "wide" "190" "tall" "180" "visible" "1" - "border" "NoBorder" + "border" "NoBorder" "bgcolor_override" "Transparent" "TitleLabel" @@ -1126,7 +1044,7 @@ "InnerShadow" { "ControlName" "EditablePanel" - "fieldname" "InnerShadow" + "fieldName" "InnerShadow" "xpos" "cs-0.5" "ypos" "30" "zpos" "501" @@ -1144,7 +1062,7 @@ "SteamFriendsList" { "ControlName" "CSteamFriendsListPanel" - "fieldname" "SteamFriendsList" + "fieldName" "SteamFriendsList" "xpos" "cs-0.5" "ypos" "30" "zpos" "500" @@ -1202,7 +1120,7 @@ "BelowDarken" { "ControlName" "EditablePanel" - "fieldname" "BelowDarken" + "fieldName" "BelowDarken" "xpos" "cs-0.5" "ypos" "30" "zpos" "499" @@ -1221,7 +1139,7 @@ "ControlName" "CExLabel" "fieldName" "VersionLabel" "font" "HudFontSmall" - "labelText" "v2020.0808" + "labelText" "v2020.1230" "xpos" "r135" "ypos" "r15" "wide" "130" @@ -1237,7 +1155,7 @@ "CharacterSetupButton" { "ControlName" "CExImageButton" - "fieldname" "CharacterSetupButton" + "fieldName" "CharacterSetupButton" "xpos" "90" "ypos" "75" "zpos" "11" @@ -1266,7 +1184,7 @@ "GeneralStoreButton" { "ControlName" "CExImageButton" - "fieldname" "GeneralStoreButton" + "fieldName" "GeneralStoreButton" "xpos" "90" "ypos" "95" "zpos" "11" @@ -1295,7 +1213,7 @@ "SteamWorkshopButton" { "ControlName" "CExImageButton" - "fieldname" "SteamWorkshopButton" + "fieldName" "SteamWorkshopButton" "xpos" "90" "ypos" "115" "zpos" "11" @@ -1436,37 +1354,18 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "textinsetx" "0" - "font" "FontRegular20" + "font" "CustomIcons" "use_proportional_insets" "1" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "default" "1" - + "default" "1" + "actionsignallevel" "2" + "paintbackground" "0" + "paintborder" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "" - "border_armed" "" - "paintbackground" "0" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "2" - "ypos" "2" - "zpos" "1" - "wide" "15" - "tall" "15" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - } + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "72 255 255 255" } } @@ -1474,13 +1373,17 @@ { "ControlName" "EditablePanel" "fieldname" "ConsoleButton" - "xpos" "110" - "ypos" "200" + "xpos" "20" + "ypos" "0" "zpos" "12" "wide" "20" "tall" "20" "visible" "1" + "pin_to_sibling" "AchievementsButton" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + "SubButton" { "ControlName" "CExImageButton" @@ -1494,37 +1397,18 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "textinsetx" "0" - "font" "FontRegular20" + "font" "CustomIcons" "use_proportional_insets" "1" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "default" "1" - + "actionsignallevel" "2" + "paintbackground" "0" + "paintborder" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "" - "border_armed" "" - "paintbackground" "0" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "2" - "ypos" "2" - "zpos" "1" - "wide" "15" - "tall" "15" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - } + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "72 255 255 255" } } @@ -1532,13 +1416,17 @@ { "ControlName" "EditablePanel" "fieldname" "ReplayButton" - "xpos" "130" - "ypos" "200" + "xpos" "20" + "ypos" "0" "zpos" "12" "wide" "20" "tall" "20" "visible" "1" + "pin_to_sibling" "ConsoleButton" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + "SubButton" { "ControlName" "CExImageButton" @@ -1552,37 +1440,18 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "textinsetx" "0" - "font" "HudFontMediumSecondary" + "font" "CustomIcons" "use_proportional_insets" "1" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "default" "1" - + "actionsignallevel" "2" + "paintbackground" "0" + "paintborder" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "" - "border_armed" "" - "paintbackground" "0" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "2" - "ypos" "2" - "zpos" "1" - "wide" "15" - "tall" "15" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - } + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "72 255 255 255" } } @@ -1590,13 +1459,17 @@ { "ControlName" "EditablePanel" "fieldname" "ReportBugButton" - "xpos" "150" - "ypos" "200" + "xpos" "20" + "ypos" "0" "zpos" "12" "wide" "20" "tall" "20" "visible" "1" + "pin_to_sibling" "ReplayButton" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + "SubButton" { "ControlName" "CExImageButton" @@ -1610,37 +1483,18 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "textinsetx" "0" - "font" "FontRegular20" + "font" "CustomIcons" "use_proportional_insets" "1" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "default" "1" - + "actionsignallevel" "2" + "paintbackground" "0" + "paintborder" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "" - "border_armed" "" - "paintbackground" "0" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "2" - "ypos" "2" - "zpos" "1" - "wide" "15" - "tall" "15" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - } + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "72 255 255 255" } } @@ -1648,13 +1502,17 @@ { "ControlName" "EditablePanel" "fieldname" "CoachPlayersButton" - "xpos" "170" - "ypos" "200" + "xpos" "20" + "ypos" "0" "zpos" "12" "wide" "20" "tall" "20" "visible" "1" + "pin_to_sibling" "ReportBugButton" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + "SubButton" { "ControlName" "CExImageButton" @@ -1668,37 +1526,18 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "textinsetx" "0" - "font" "HudFontMediumSecondary" + "font" "CustomIcons" "use_proportional_insets" "1" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "default" "1" - + "actionsignallevel" "2" + "paintbackground" "0" + "paintborder" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "" - "border_armed" "" - "paintbackground" "0" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "2" - "ypos" "2" - "zpos" "1" - "wide" "15" - "tall" "15" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - } + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "72 255 255 255" } } @@ -1706,13 +1545,17 @@ { "ControlName" "EditablePanel" "fieldname" "RequestCoachButton" - "xpos" "190" - "ypos" "200" + "xpos" "20" + "ypos" "0" "zpos" "12" "wide" "20" "tall" "20" "visible" "1" + "pin_to_sibling" "CoachPlayersButton" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + "SubButton" { "ControlName" "CExImageButton" @@ -1726,37 +1569,18 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "textinsetx" "0" - "font" "FontRegular20" + "font" "CustomIcons" "use_proportional_insets" "1" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "default" "1" - + "actionsignallevel" "2" + "paintbackground" "0" + "paintborder" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "" - "border_armed" "" - "paintbackground" "0" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "2" - "ypos" "2" - "zpos" "1" - "wide" "15" - "tall" "15" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - } + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "72 255 255 255" } } @@ -1764,13 +1588,17 @@ { "ControlName" "EditablePanel" "fieldname" "CallVoteButton" - "xpos" "210" - "ypos" "200" + "xpos" "20" + "ypos" "0" "zpos" "12" "wide" "20" "tall" "20" "visible" "1" + "pin_to_sibling" "RequestCoachButton" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + "SubButton" { "ControlName" "CExImageButton" @@ -1784,37 +1612,18 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "textinsetx" "0" - "font" "FontRegular20" + "font" "CustomIcons" "use_proportional_insets" "1" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "default" "1" - + "actionsignallevel" "2" + "paintbackground" "0" + "paintborder" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "" - "border_armed" "" - "paintbackground" "0" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "2" - "ypos" "2" - "zpos" "1" - "wide" "15" - "tall" "15" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - } + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "72 255 255 255" } } @@ -1822,13 +1631,17 @@ { "ControlName" "EditablePanel" "fieldname" "MutePlayersButton" - "xpos" "230" - "ypos" "200" + "xpos" "20" + "ypos" "0" "zpos" "12" "wide" "20" "tall" "20" "visible" "1" + "pin_to_sibling" "CallVoteButton" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + "SubButton" { "ControlName" "CExImageButton" @@ -1842,37 +1655,18 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "textinsetx" "0" - "font" "FontRegular20" + "font" "CustomIcons" "use_proportional_insets" "1" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "default" "1" - + "actionsignallevel" "2" + "paintbackground" "0" + "paintborder" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "" - "border_armed" "" - "paintbackground" "0" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "2" - "ypos" "2" - "zpos" "1" - "wide" "15" - "tall" "15" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - } + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "72 255 255 255" } } @@ -1880,13 +1674,17 @@ { "ControlName" "EditablePanel" "fieldname" "ReportPlayerButton" - "xpos" "250" - "ypos" "200" + "xpos" "20" + "ypos" "0" "zpos" "12" "wide" "20" "tall" "20" "visible" "1" + "pin_to_sibling" "MutePlayersButton" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + "SubButton" { "ControlName" "CExImageButton" @@ -1900,37 +1698,18 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "textinsetx" "0" - "font" "FontRegular20" + "font" "CustomIcons" "use_proportional_insets" "1" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "default" "1" - + "actionsignallevel" "2" + "paintbackground" "0" + "paintborder" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "border_default" "" - "border_armed" "" - "paintbackground" "0" - - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "2" - "ypos" "2" - "zpos" "1" - "wide" "15" - "tall" "15" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - } + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "72 255 255 255" } } @@ -1963,32 +1742,4 @@ "bgcolor_override" "ColorCyan" "PaintBackgroundType" "2" } - - "icon_generator" - { - "ControlName" "CEmbeddedItemModelPanel" - "fieldName" "icon_generator" - "xpos" "0" - "ypos" "0" - "zpos" "1" - "wide" "300" - "tall" "300" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "useparentbg" "1" - "inset_eq_x" "2" - "inset_eq_y" "2" - "fov" "54" - "start_framed" "1" - "disable_manipulation" "1" - - "model" - { - "angles_x" "10" - "angles_y" "130" - "angles_z" "0" - } - } }
\ No newline at end of file diff --git a/customizations/main_menu/mainmenuoverride.res b/customizations/main_menu/mainmenuoverride.res index 1dd261f..8e376f2 100644 --- a/customizations/main_menu/mainmenuoverride.res +++ b/customizations/main_menu/mainmenuoverride.res @@ -1172,7 +1172,7 @@ "ControlName" "CExLabel" "fieldName" "VersionLabel" "font" "HudFontSmall" - "labelText" "v2020.0808" + "labelText" "v2020.1230" "xpos" "r135" "ypos" "r15" "wide" "130" diff --git a/customizations/scoreboards/scoreboard.res b/customizations/scoreboards/scoreboard.res index 6e764f4..ad97352 100644 --- a/customizations/scoreboards/scoreboard.res +++ b/customizations/scoreboards/scoreboard.res @@ -38,7 +38,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fillcolor" "70 130 180 153" + "fillcolor" "Blue" "scaleImage" "1" if_mvm @@ -73,7 +73,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fillcolor" "205 50 50 153" + "fillcolor" "Red" "scaleImage" "1" if_mvm diff --git a/materials/sprites/obj_icons/icon_obj_white.vmt b/materials/sprites/obj_icons/icon_obj_white.vmt new file mode 100644 index 0000000..f5becf0 --- /dev/null +++ b/materials/sprites/obj_icons/icon_obj_white.vmt @@ -0,0 +1,11 @@ +"UnlitGeneric" +{ + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_white" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" +}
\ No newline at end of file diff --git a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_white.vtf b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_white.vtf Binary files differnew file mode 100644 index 0000000..3c5efda --- /dev/null +++ b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_white.vtf diff --git a/resource/preload.res b/resource/preload.res index b55caef..501fd23 100644 --- a/resource/preload.res +++ b/resource/preload.res @@ -38,6 +38,7 @@ "enabled" "1" "image" "../sprites/obj_icons/icon_obj_red_locked" } + "CPIconNeutral" { "ControlName" "ImagePanel" @@ -58,6 +59,16 @@ "image" "../sprites/obj_icons/icon_obj_neutral_locked" } + "CPIconWhite" + { + "ControlName" "ImagePanel" + "fieldName" "CPIconWhite" + "xpos" "9999" + "visible" "1" + "enabled" "1" + "image" "../sprites/obj_icons/icon_obj_white" + } + "CPIconBlu1" { "ControlName" "ImagePanel" diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res index f4e6759..dbf1f69 100644 --- a/resource/scheme/clientscheme_colors.res +++ b/resource/scheme/clientscheme_colors.res @@ -91,10 +91,10 @@ Scheme "PartyMember6" "255 133 255 255" "White" "242 242 242 255" - "Red" "158 64 61 140" - "RedSolid" "158 64 61 255" - "Blue" "72 112 125 140" - "BlueSolid" "72 112 125 255" + "Red" "205 50 50 150" + "RedSolid" "205 50 50 255" + "Blue" "70 130 180 150" + "BlueSolid" "70 130 180 255" "Yellow" "251 235 202 255" "TransparentYellow" "251 235 202 140" "BrightYellow" "251 235 0 255" diff --git a/resource/ui/build_menu/base_active.res b/resource/ui/build_menu/base_active.res index 0db63e9..ee30937 100644 --- a/resource/ui/build_menu/base_active.res +++ b/resource/ui/build_menu/base_active.res @@ -152,7 +152,7 @@ "font" "HudFontMediumSecondary" "fgcolor" "TanLight" "xpos" "0" - "ypos" "92" + "ypos" "95" "zpos" "1" "wide" "100" "tall" "20" diff --git a/resource/ui/build_menu/base_active_teleport_target.res b/resource/ui/build_menu/base_active_teleport_target.res index 2893389..89fe1b8 100644 --- a/resource/ui/build_menu/base_active_teleport_target.res +++ b/resource/ui/build_menu/base_active_teleport_target.res @@ -94,7 +94,7 @@ "font" "HudFontMediumSecondary" "fgcolor" "TanLight" "xpos" "0" - "ypos" "92" + "ypos" "95" "zpos" "1" "wide" "100" "tall" "20" diff --git a/resource/ui/build_menu/base_already_built.res b/resource/ui/build_menu/base_already_built.res index 26fc4a2..b614adb 100644 --- a/resource/ui/build_menu/base_already_built.res +++ b/resource/ui/build_menu/base_already_built.res @@ -116,7 +116,7 @@ "font" "HudFontMediumSecondary" "fgcolor" "ColorRed" "xpos" "0" - "ypos" "92" + "ypos" "95" "zpos" "1" "wide" "100" "tall" "20" diff --git a/resource/ui/build_menu/base_cant_afford.res b/resource/ui/build_menu/base_cant_afford.res index 98f5cc0..c8a3bb0 100644 --- a/resource/ui/build_menu/base_cant_afford.res +++ b/resource/ui/build_menu/base_cant_afford.res @@ -172,7 +172,7 @@ "font" "HudFontMediumSecondary" "fgcolor" "ColorRed" "xpos" "0" - "ypos" "92" + "ypos" "95" "zpos" "1" "wide" "100" "tall" "20" diff --git a/resource/ui/build_menu/base_unavailable.res b/resource/ui/build_menu/base_unavailable.res index 40434c2..fee2503 100644 --- a/resource/ui/build_menu/base_unavailable.res +++ b/resource/ui/build_menu/base_unavailable.res @@ -172,7 +172,7 @@ "font" "HudFontMediumSecondary" "fgcolor" "ColorRed" "xpos" "0" - "ypos" "92" + "ypos" "95" "zpos" "1" "wide" "100" "tall" "20" diff --git a/resource/ui/build_menu/base_unavailable_teleport_target.res b/resource/ui/build_menu/base_unavailable_teleport_target.res index ed46d54..e4f521c 100644 --- a/resource/ui/build_menu/base_unavailable_teleport_target.res +++ b/resource/ui/build_menu/base_unavailable_teleport_target.res @@ -100,7 +100,7 @@ "font" "HudFontMediumSecondary" "fgcolor" "ColorRed" "xpos" "0" - "ypos" "92" + "ypos" "95" "zpos" "1" "wide" "100" "tall" "20" diff --git a/resource/ui/build_menu/hudmenuengybuild.res b/resource/ui/build_menu/hudmenuengybuild.res index 39ce48f..6a33150 100644 --- a/resource/ui/build_menu/hudmenuengybuild.res +++ b/resource/ui/build_menu/hudmenuengybuild.res @@ -62,7 +62,7 @@ "fieldName" "CancelLabel" "font" "SpectatorKeyHints" "xpos" "0" - "ypos" "127" + "ypos" "8" "zpos" "1" "wide" "395" "tall" "13" diff --git a/resource/ui/build_menu/hudmenueurekaeffect.res b/resource/ui/build_menu/hudmenueurekaeffect.res index f3ca7fe..9d6dc78 100644 --- a/resource/ui/build_menu/hudmenueurekaeffect.res +++ b/resource/ui/build_menu/hudmenueurekaeffect.res @@ -73,7 +73,7 @@ "fieldName" "CancelLabel" "font" "SpectatorKeyHints" "xpos" "0" - "ypos" "127" + "ypos" "8" "zpos" "1" "wide" "195" "tall" "13" diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res index e64fef3..53b9ec4 100644 --- a/resource/ui/charinfopanel.res +++ b/resource/ui/charinfopanel.res @@ -91,7 +91,7 @@ "FooterLine" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "FooterLine" "xpos" "0" "ypos" "420" diff --git a/resource/ui/compstats.res b/resource/ui/compstats.res index c3c9067..5f14f5d 100644 --- a/resource/ui/compstats.res +++ b/resource/ui/compstats.res @@ -33,10 +33,10 @@ "ControlName" "CPvPRankPanel" "fieldName" "RankPanel" "xpos" "0" - "ypos" "-60" + "ypos" "-65" "zpos" "100" "wide" "330" - "tall" "92" + "tall" "f0" "visible" "1" "proportionaltoparent" "1" "mouseinputenabled" "0" diff --git a/resource/ui/craftingpanel.res b/resource/ui/craftingpanel.res index cbcded2..f331a1a 100644 --- a/resource/ui/craftingpanel.res +++ b/resource/ui/craftingpanel.res @@ -158,7 +158,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "200 187 161 255" + "fgcolor_override" "TanLight" } "selectedrecipecontainer" @@ -425,36 +425,36 @@ "TooltipPanel" { - "ControlName" "EditablePanel" - "fieldName" "TooltipPanel" - "xpos" "0" - "ypos" "0" - "zpos" "100" - "wide" "140" - "tall" "50" - "visible" "0" + "ControlName" "EditablePanel" + "fieldName" "TooltipPanel" + "xpos" "0" + "ypos" "0" + "zpos" "100" + "wide" "140" + "tall" "50" + "visible" "0" "PaintBackgroundType" "2" - "border" "MainMenuBGBorder" + "border" "MainMenuBGBorder" "TipLabel" { - "ControlName" "CExLabel" - "fieldName" "TipLabel" - "font" "HudFontSmallest" - "labelText" "%tiptext%" - "textAlignment" "center" - "xpos" "20" - "ypos" "10" - "zpos" "2" - "wide" "100" - "tall" "30" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" + "ControlName" "CExLabel" + "fieldName" "TipLabel" + "font" "HudFontSmallest" + "labelText" "%tiptext%" + "textAlignment" "center" + "xpos" "20" + "ypos" "10" + "zpos" "2" + "wide" "100" + "tall" "30" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" "fgcolor_override" "TanLight" - "wrap" "1" - "centerwrap" "1" + "wrap" "1" + "centerwrap" "1" } } diff --git a/resource/ui/craftingstatusdialog.res b/resource/ui/craftingstatusdialog.res index a5229b3..4e84cf6 100644 --- a/resource/ui/craftingstatusdialog.res +++ b/resource/ui/craftingstatusdialog.res @@ -9,10 +9,10 @@ "ypos" "200" "wide" "200" "tall" "110" - "bgcolor_override" "DarkGrey" - "paintbackgroundtype" "0" "settitlebarvisible" "0" "border" "CyanBorder" + "bgcolor_override" "DarkGrey" + "paintbackgroundtype" "0" } "CenterPositioner" diff --git a/resource/ui/destroy_menu/base_active.res b/resource/ui/destroy_menu/base_active.res index e606c95..2ace4fa 100644 --- a/resource/ui/destroy_menu/base_active.res +++ b/resource/ui/destroy_menu/base_active.res @@ -91,7 +91,7 @@ "font" "HudFontMediumSecondary" "fgcolor" "TanLight" "xpos" "0" - "ypos" "92" + "ypos" "95" "zpos" "1" "wide" "100" "tall" "20" diff --git a/resource/ui/destroy_menu/base_inactive.res b/resource/ui/destroy_menu/base_inactive.res index 969bb1d..119d671 100644 --- a/resource/ui/destroy_menu/base_inactive.res +++ b/resource/ui/destroy_menu/base_inactive.res @@ -100,7 +100,7 @@ "font" "HudFontMediumSecondary" "fgcolor" "ColorRed" "xpos" "0" - "ypos" "92" + "ypos" "95" "zpos" "1" "wide" "100" "tall" "20" diff --git a/resource/ui/destroy_menu/hudmenuengydestroy.res b/resource/ui/destroy_menu/hudmenuengydestroy.res index 2efc06f..f72eb92 100644 --- a/resource/ui/destroy_menu/hudmenuengydestroy.res +++ b/resource/ui/destroy_menu/hudmenuengydestroy.res @@ -62,7 +62,7 @@ "fieldName" "CancelLabel" "font" "SpectatorKeyHints" "xpos" "0" - "ypos" "127" + "ypos" "8" "zpos" "1" "wide" "395" "tall" "13" diff --git a/resource/ui/disguise_menu/heavy_red.res b/resource/ui/disguise_menu/heavy_red.res index ba6513d..28745e8 100644 --- a/resource/ui/disguise_menu/heavy_red.res +++ b/resource/ui/disguise_menu/heavy_red.res @@ -8,7 +8,7 @@ "xpos" "20" "ypos" "0" "zpos" "1" - "wide" "55" + "wide" "45" "tall" "20" "autoResize" "0" "pinCorner" "0" diff --git a/resource/ui/disguise_menu/hudmenuspydisguise.res b/resource/ui/disguise_menu/hudmenuspydisguise.res index 016445b..1481ee2 100644 --- a/resource/ui/disguise_menu/hudmenuspydisguise.res +++ b/resource/ui/disguise_menu/hudmenuspydisguise.res @@ -55,17 +55,14 @@ "textAlignment" "west" "dulltext" "1" "brighttext" "0" - - "pin_to_sibling" "TitleLabel" - "pin_corner_to_sibling" "PIN_TOPLEFT" - "pin_to_sibling_corner" "PIN_TOPLEFT" + "pin_to_sibling" "TitleLabel" } "ToggleLabel" { "ControlName" "CExLabel" "fieldName" "ToggleLabel" - "font" "TextTooltipFont" + "font" "SpectatorKeyHints" "xpos" "0" "ypos" "165" "zpos" "2" @@ -96,7 +93,7 @@ "visible" "0" "enabled" "0" "labelText" "#Hud_Menu_Build_Cancel" - "textAlignment" "East" + "textAlignment" "east" "dulltext" "0" "brighttext" "0" } diff --git a/resource/ui/econ/confirmapplydecodedialog.res b/resource/ui/econ/confirmapplydecodedialog.res new file mode 100644 index 0000000..10f7d60 --- /dev/null +++ b/resource/ui/econ/confirmapplydecodedialog.res @@ -0,0 +1,298 @@ +"Resource/UI/ConfirmApplyDecodeDialog.res" +{ + "ConfirmApplyDecodeDialog" + { + "fieldName" "ConfirmApplyDecodeDialog" + "visible" "1" + "enabled" "1" + "xpos" "c-200" + "ypos" "c-200" + "wide" "400" + "tall" "240" + "bgcolor_override" "DarkGrey" + "paintbackgroundtype" "0" + "settitlebarvisible" "0" + "border" "CyanBorderThick" + } + + "mouseoveritempanel" + { + "ControlName" "CItemModelPanel" + "fieldName" "mouseoveritempanel" + "xpos" "c-70" + "ypos" "270" + "zpos" "100" + "wide" "300" + "tall" "300" + "visible" "0" + "bgcolor_override" "Transparent" + "noitem_textcolor" "TextColor" + "PaintBackgroundType" "2" + "paintborder" "1" + "text_ypos" "20" + "text_center" "1" + "model_hide" "1" + "resize_to_text" "1" + "padding_height" "15" + + "attriblabel" + { + "font" "ItemFontAttribLarge" + "xpos" "0" + "ypos" "30" + "zpos" "2" + "wide" "140" + "tall" "60" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "labelText" "%attriblist%" + "textAlignment" "center" + "fgcolor" "TextColor" + "centerwrap" "1" + } + } + + "TitleLabel" + { + "ControlName" "CExLabel" + "fieldName" "TitleLabel" + "font" "HudFontMediumBold" + "labelText" "dynamic" + "textAlignment" "center" + "xpos" "100" + "ypos" "10" + "zpos" "0" + "wide" "200" + "tall" "60" + "autoResize" "1" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "centerwrap" "1" + } + + "ToolBG" + { + "ControlName" "CExLabel" + "fieldName" "ToolBG" + "font" "HudFontSmallBold" + "labelText" "" + "textAlignment" "east" + "xpos" "10" + "ypos" "10" + "zpos" "-1" + "wide" "84" + "tall" "64" + "autoResize" "1" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "paintbackground" "0" + "border" "BackpackItemBorder_SelfMade" + } + + "tool_icon" + { + "ControlName" "ScalableImagePanel" + "fieldName" "tool_icon" + "xpos" "10" + "ypos" "10" + "zpos" "2" + "wide" "16" + "tall" "16" + "visible" "1" + "enabled" "1" + "image" "backpack_jewel_modify_target_b_g" + "tileImage" "0" + "tileVertically" "0" + "drawcolor" "112 176 74 255" + } + + "tool_modelpanel" + { + "ControlName" "CItemModelPanel" + "fieldName" "tool_modelpanel" + "xpos" "10" + "ypos" "10" + "zpos" "1" + "wide" "84" + "tall" "64" + "visible" "1" + "bgcolor_override" "Transparent" + "noitem_textcolor" "TextColor" + "PaintBackgroundType" "2" + "paintborder" "0" + "model_xpos" "2" + "model_ypos" "5" + "model_wide" "80" + "model_tall" "54" + "text_ypos" "100" + "text_center" "1" + "name_only" "1" + "paint_icon_hide" "1" + + "itemmodelpanel" + { + "use_item_rendertarget" "0" + "allow_rot" "0" + "inventory_image_type" "1" + } + } + + "SubjectBG" + { + "ControlName" "CExLabel" + "fieldName" "SubjectBG" + "font" "HudFontSmallBold" + "labelText" "" + "textAlignment" "east" + "xpos" "300" + "ypos" "10" + "zpos" "-1" + "wide" "84" + "tall" "64" + "autoResize" "1" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "paintbackground" "0" + "border" "BackpackItemBorder_Vintage" + } + + "subject_icon" + { + "ControlName" "ScalableImagePanel" + "fieldName" "subject_icon" + "xpos" "300" + "ypos" "10" + "zpos" "2" + "wide" "16" + "tall" "16" + "visible" "1" + "enabled" "1" + "image" "backpack_jewel_modify_target_b_g" + "tileImage" "0" + "tileVertically" "0" + "drawcolor" "71 98 145 255" + } + + "subject_modelpanel" + { + "ControlName" "CItemModelPanel" + "fieldName" "subject_modelpanel" + "xpos" "300" + "ypos" "10" + "zpos" "1" + "wide" "84" + "tall" "64" + "visible" "1" + "bgcolor_override" "Transparent" + "noitem_textcolor" "TextColor" + "PaintBackgroundType" "2" + "paintborder" "0" + "model_xpos" "2" + "model_ypos" "5" + "model_wide" "80" + "model_tall" "54" + "text_ypos" "100" + "text_center" "1" + "name_only" "1" + + "itemmodelpanel" + { + "use_item_rendertarget" "0" + "allow_rot" "0" + "inventory_image_type" "1" + } + } + + "ConfirmLabel" + { + "ControlName" "CExLabel" + "fieldName" "ConfirmLabel" + "font" "HudFontSmall" + "labelText" "%confirm_text%" + "textAlignment" "center" + "xpos" "20" + "ypos" "80" + "zpos" "0" + "wide" "360" + "tall" "20" + "autoResize" "1" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fgcolor_override" "Yellow" + } + + "OptionalAppendLabel" + { + "ControlName" "CExLabel" + "fieldName" "OptionalAppendLabel" + "font" "HudFontSmall" + "labelText" "%optional_append%" + "textAlignment" "center" + "xpos" "20" + "ypos" "80" + "zpos" "0" + "wide" "360" + "tall" "60" + "autoResize" "1" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fgcolor_override" "LightRed" + } + + "CancelButton" + { + "ControlName" "CExButton" + "fieldName" "CancelButton" + "xpos" "50" + "ypos" "200" + "zpos" "1" + "wide" "130" + "tall" "20" + "autoResize" "0" + "pinCorner" "3" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "#Cancel" + "font" "HudFontSmall" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "0" + "Command" "cancel" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + + "OkButton" + { + "ControlName" "CExButton" + "fieldName" "OkButton" + "xpos" "220" + "ypos" "200" + "zpos" "1" + "wide" "130" + "tall" "20" + "autoResize" "0" + "pinCorner" "3" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "#CraftNameConfirm" + "font" "HudFontSmall" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "1" + "Command" "apply" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } +}
\ No newline at end of file diff --git a/resource/ui/econ/genericwaitingdialog.res b/resource/ui/econ/genericwaitingdialog.res index fa122eb..3c687d7 100644 --- a/resource/ui/econ/genericwaitingdialog.res +++ b/resource/ui/econ/genericwaitingdialog.res @@ -12,7 +12,7 @@ "bgcolor_override" "DarkGrey" "paintbackgroundtype" "1" "settitlebarvisible" "0" - "border" "NoBorder" + "border" "CyanBorder" } "TitleLabel" diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res index 02e4c82..3a20a22 100644 --- a/resource/ui/econ/inspectionpanel.res +++ b/resource/ui/econ/inspectionpanel.res @@ -532,6 +532,11 @@ "sound_released" "UI/buttonclickrelease.wav" "command" "random_seed" + "defaultFgColor_override" "White" + "defaultBgColor_override" "Black" + "selectedFgColor_override" "Black" + "selectedBgColor_override" "White" + "consume_mode" { "visible" "0" diff --git a/resource/ui/econ/itemmodelpanel.res b/resource/ui/econ/itemmodelpanel.res index 8da8930..9e5aa8a 100644 --- a/resource/ui/econ/itemmodelpanel.res +++ b/resource/ui/econ/itemmodelpanel.res @@ -177,7 +177,7 @@ "xpos" "4" "ypos" "4" "zpos" "2" - "wide" "14" + "wide" "17" "tall" "10" "autoResize" "0" "pinCorner" "0" diff --git a/resource/ui/econ/store/v2/storepage.res b/resource/ui/econ/store/v2/storepage.res index b876c4c..0ab0419 100644 --- a/resource/ui/econ/store/v2/storepage.res +++ b/resource/ui/econ/store/v2/storepage.res @@ -188,19 +188,19 @@ "paintborder" "1" "fgcolor_override" "TanLight" - "bgcolor_override" "15 15 15 255" + "bgcolor_override" "Black" "disabledFgColor_override" "TanLight" - "disabledBgColor_override" "15 15 15 255" - "selectionColor_override" "15 15 15 255" + "disabledBgColor_override" "Black" + "selectionColor_override" "Black" "selectionTextColor_override" "TanLight" - "defaultSelectionBG2Color_override" "15 15 15 255" + "defaultSelectionBG2Color_override" "Black" "Button" { "defaultFgColor_override" "TanLight" - "defaultBgColor_override" "15 15 15 255" + "defaultBgColor_override" "Black" "armedFgColor_override" "15 255 255 255" - "armedBgColor_override" "15 15 15 255" + "armedBgColor_override" "Black" "paintbackgroundtype" "2" } } @@ -229,19 +229,19 @@ "paintborder" "1" "fgcolor_override" "TanLight" - "bgcolor_override" "15 15 15 255" + "bgcolor_override" "Black" "disabledFgColor_override" "TanLight" - "disabledBgColor_override" "15 15 15 255" - "selectionColor_override" "15 15 15 255" + "disabledBgColor_override" "Black" + "selectionColor_override" "Black" "selectionTextColor_override" "TanLight" - "defaultSelectionBG2Color_override" "15 15 15 255" + "defaultSelectionBG2Color_override" "Black" "Button" { "defaultFgColor_override" "TanLight" - "defaultBgColor_override" "15 15 15 255" + "defaultBgColor_override" "Black" "armedFgColor_override" "15 255 255 255" - "armedBgColor_override" "15 15 15 255" + "armedBgColor_override" "Black" "paintbackgroundtype" "2" } } diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res index e1b48d0..0db5a9f 100644 --- a/resource/ui/econ/store/v2/storepanel.res +++ b/resource/ui/econ/store/v2/storepanel.res @@ -221,7 +221,7 @@ "zpos" "5" "wide" "70" "tall" "100" - "font" "HudFontSmallest" + "font" "Cerbetica10" "wrap" "1" "labelText" "#Store_ConfirmStampDonationAddTitle" "visible" "0" diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res index ecdeea9..288c206 100644 --- a/resource/ui/econ/store/v2/storepreviewitempanel.res +++ b/resource/ui/econ/store/v2/storepreviewitempanel.res @@ -1464,6 +1464,7 @@ "dulltext" "0" "brighttext" "0" "default" "1" + "allcaps" "1" "Command" "addtocart" "sound_depressed" "UI/buttonclick.wav" diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res index f8eaf13..9f67564 100644 --- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res +++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res @@ -533,6 +533,7 @@ "brighttext" "0" "default" "1" "Command" "close" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" } @@ -556,7 +557,9 @@ "dulltext" "0" "brighttext" "0" "default" "1" + "allcaps" "1" "Command" "addtocart" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" } diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res index a192e77..ed81ff3 100644 --- a/resource/ui/econ/tradingstartdialog.res +++ b/resource/ui/econ/tradingstartdialog.res @@ -357,7 +357,7 @@ "ypos" "40" "zpos" "-1" "wide" "400" - "tall" "30" + "tall" "35" "autoResize" "0" "pinCorner" "0" "visible" "1" diff --git a/resource/ui/freezepanel_basic.res b/resource/ui/freezepanel_basic.res index db9447d..8e7220b 100644 --- a/resource/ui/freezepanel_basic.res +++ b/resource/ui/freezepanel_basic.res @@ -1,92 +1,18 @@ +#base "hudinspectpanel.res" + "Resource/UI/FreezePanel_Basic.res" { "itempanel" { - "ControlName" "CItemModelPanel" - "fieldName" "itempanel" - "xpos" "r249" - "ypos" "c50" - "zpos" "10" - "wide" "240" - "tall" "100" - "visible" "0" - "bgcolor_override" "255 255 255 0" - "PaintBackgroundType" "0" - - "model_ypos" "20" - "model_center_x" "1" - "model_wide" "90" - "model_tall" "60" - - "text_xpos" "10" - "text_ypos" "10" - "text_wide" "220" - "text_center" "1" - - "max_text_height" "100" - "padding_height" "10" - "resize_to_text" "1" - "text_forcesize" "2" - - "ItemBackground" - { - "ControlName" "ImagePanel" - "fieldName" "ItemBackground" - "xpos" "0" - "ypos" "0" - "zpos" "-1" - "wide" "240" - "tall" "900" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "fillcolor" "TransparentBlack" - } - - "TitleBackground" - { - "ControlName" "ImagePanel" - "fieldName" "TitleBackground" - "xpos" "4" - "ypos" "4" - "zpos" "-1" - "wide" "232" - "tall" "14" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "fillcolor" "TransparentBlack" - } - - "itemmodelpanel" - { - "fieldName" "itemmodelpanel" - "use_item_rendertarget" "0" - "useparentbg" "1" - "inventory_image_type" "1" - } + // For some reason this doesnt obey the xpos set in HUD Layout + "xpos" "r249" + } - "ItemLabel" - { - "ControlName" "CExLabel" - "fieldName" "ItemLabel" - "font" "HudFontSmall" - "xpos" "10" - "ypos" "3" - "zpos" "1" - "wide" "270" - "tall" "16" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "#FreezePanel_Item" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" - } + "FreezePanel" + { + "ControlName" "CTFFreezePanel" + "fieldName" "FreezePanel" + "screenshot_move_panel_to_corner" "0" } "FreezePanelBase" diff --git a/resource/ui/hud_obj_sapper.res b/resource/ui/hud_obj_sapper.res index b66fd76..f411662 100644 --- a/resource/ui/hud_obj_sapper.res +++ b/resource/ui/hud_obj_sapper.res @@ -6,8 +6,8 @@ "fieldName" "BuildingStatusItem" "xpos" "0" "ypos" "0" - "wide" "150" - "tall" "177" + "wide" "140" + "tall" "30" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -29,10 +29,10 @@ { "ControlName" "CIconPanel" "fieldName" "Icon" - "xpos" "24" - "ypos" "147" - "wide" "28" - "tall" "28" + "xpos" "15" + "ypos" "3" + "wide" "25" + "tall" "25" "visible" "1" "enabled" "1" "scaleImage" "1" @@ -45,20 +45,20 @@ "ControlName" "EditablePanel" "fieldName" "NotBuiltPanel" "xpos" "0" - "ypos" "146" + "ypos" "0" "wide" "160" - "tall" "31" + "tall" "30" "visible" "1" "NotBuiltLabel" { "ControlName" "CExLabel" "fieldName" "NotBuiltLabel" - "font" "DefaultSmall" + "font" "HudFontSmallest" "xpos" "60" "ypos" "0" "wide" "200" - "tall" "31" + "tall" "30" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -76,9 +76,9 @@ "ControlName" "EditablePanel" "fieldName" "BuiltPanel" "xpos" "0" - "ypos" "146" + "ypos" "0" "wide" "160" - "tall" "43" + "tall" "30" "visible" "0" "proportionaltoparent" "1" @@ -87,10 +87,10 @@ "ControlName" "CBuildingHealthBar" "fieldName" "Health" "font" "Default" - "xpos" "13" - "ypos" "2" + "xpos" "0" + "ypos" "3" "wide" "8" - "tall" "24" + "tall" "25" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -108,14 +108,14 @@ "xpos" "60" "ypos" "0" "wide" "100" - "tall" "31" + "tall" "30" "visible" "0" "BuildingLabel" { "ControlName" "CExLabel" "fieldName" "BuildingLabel" - "font" "DefaultSmall" + "font" "HudFontSmallest" "xpos" "0" "ypos" "5" "wide" "200" @@ -153,10 +153,10 @@ { "ControlName" "EditablePanel" "fieldName" "RunningPanel" - "xpos" "55" - "ypos" "0" + "xpos" "35" + "ypos" "3" "wide" "100" - "tall" "31" + "tall" "30" "visible" "0" "proportionaltoparent" "1" @@ -165,10 +165,11 @@ "ControlName" "CIconPanel" "fieldName" "TargetIcon" "xpos" "0" - "ypos" "5" - "wide" "20" - "tall" "20" - "visible" "1" + "ypos" "10" + "zpos" "1" + "wide" "10" + "tall" "10" + "visible" "0" "enabled" "1" "scaleImage" "1" "icon" "obj_status_sentrygun_1" @@ -181,10 +182,10 @@ "ControlName" "ContinuousProgressBar" "fieldName" "TargetHealth" "font" "Default" - "xpos" "22" - "ypos" "12" - "wide" "35" - "tall" "8" + "xpos" "12" + "ypos" "10" + "wide" "38" + "tall" "10" "autoResize" "0" "pinCorner" "0" "visible" "1" diff --git a/resource/ui/hudammoweapons.res b/resource/ui/hudammoweapons.res index 22d0666..ef72d5e 100644 --- a/resource/ui/hudammoweapons.res +++ b/resource/ui/hudammoweapons.res @@ -57,7 +57,7 @@ "font" "Cerbetica32" "font_minmode" "Cerbetica20" "fgcolor" "Ammo In Reserve" - "xpos" "65" + "xpos" "-65" "ypos" "0" "zpos" "7" "wide" "f0" @@ -66,6 +66,7 @@ "enabled" "1" "textAlignment" "west" "labelText" "%AmmoInReserve%" + "pin_to_sibling" "AmmoInClip" } "AmmoInReserveShadow" { diff --git a/resource/ui/hudarenaclasslayout.res b/resource/ui/hudarenaclasslayout.res index 20b1812..3a5314a 100644 --- a/resource/ui/hudarenaclasslayout.res +++ b/resource/ui/hudarenaclasslayout.res @@ -72,8 +72,8 @@ { "ControlName" "CExLabel" "fieldName" "titleShadow" - "xpos" "-1" - "ypos" "-1" + "xpos" "-2" + "ypos" "-2" "zpos" "5" "wide" "400" "tall" "20" diff --git a/resource/ui/hudarenaplayercount.res b/resource/ui/hudarenaplayercount.res index 610ab5a..50a5fb9 100644 --- a/resource/ui/hudarenaplayercount.res +++ b/resource/ui/hudarenaplayercount.res @@ -22,7 +22,7 @@ "tall" "23" "visible" "1" "enabled" "1" - "bgcolor_override" "104 124 155 255" + "bgcolor_override" "BlueSolid" } "count" @@ -101,7 +101,7 @@ "tall" "23" "visible" "1" "enabled" "1" - "bgcolor_override" "180 92 77 255" + "bgcolor_override" "RedSolid" } "count" diff --git a/resource/ui/hudarenateammenu.res b/resource/ui/hudarenateammenu.res index 004f455..121c339 100644 --- a/resource/ui/hudarenateammenu.res +++ b/resource/ui/hudarenateammenu.res @@ -97,11 +97,12 @@ "brighttext" "0" "command" "jointeam spectate" "font" "Cerbetica20" - + "allcaps" "1" + "defaultFgColor_override" "255 255 255 128" - "armedFgColor_override" "235 226 202 255" + "armedFgColor_override" "TanLight" "depressedFgColor_override" "255 255 255 128" - "selectedFgColor_override" "235 226 202 255" + "selectedFgColor_override" "TanLight" } "teambutton3" @@ -126,9 +127,9 @@ "font" "Cerbetica20" "defaultFgColor_override" "255 255 255 128" - "armedFgColor_override" "235 226 202 255" + "armedFgColor_override" "TanLight" "depressedFgColor_override" "255 255 255 128" - "selectedFgColor_override" "235 226 202 255" + "selectedFgColor_override" "TanLight" } "CancelButton" @@ -138,18 +139,32 @@ "wide" "0" } + "FightBG" + { + "ControlName" "EditablePanel" + "fieldName" "FightBG" + "xpos" "0" + "ypos" "c-35" + "zpos" "0" + "wide" "255" + "tall" "30" + "visible" "1" + "enabled" "1" + "bgcolor_override" "TransparentBlack" + } + "SpectateBG" { "ControlName" "EditablePanel" "fieldName" "SpectateBG" "xpos" "0" - "ypos" "c-35" + "ypos" "c5" "zpos" "0" "wide" "255" "tall" "30" "visible" "1" "enabled" "1" - "bgcolor_override" "HudBlack" + "bgcolor_override" "TransparentBlack" } "MenuBG" diff --git a/resource/ui/hudarenawinpanel.res b/resource/ui/hudarenawinpanel.res index 55b2d97..f5f0812 100644 --- a/resource/ui/hudarenawinpanel.res +++ b/resource/ui/hudarenawinpanel.res @@ -21,7 +21,7 @@ "tall" "25" "visible" "1" "enabled" "1" - "bgcolor_override" "70 130 180 255" + "bgcolor_override" "BlueSolid" } "RedScoreBG" { @@ -34,7 +34,7 @@ "tall" "25" "visible" "1" "enabled" "1" - "bgcolor_override" "205 50 50 255" + "bgcolor_override" "RedSolid" } "BlueTeamLabel" @@ -62,7 +62,7 @@ "labelText" "%blueteamscore%" "textAlignment" "east" "xpos" "138" - "ypos" "1" + "ypos" "10" "zpos" "3" "wide" "80" "tall" "70" @@ -107,6 +107,7 @@ "visible" "1" "enabled" "1" } + "RedTeamScore" { "ControlName" "CExLabel" @@ -115,7 +116,7 @@ "labelText" "%redteamscore%" "textAlignment" "west" "xpos" "230" - "ypos" "1" + "ypos" "10" "zpos" "3" "wide" "80" "tall" "70" diff --git a/resource/ui/hudbosshealth.res b/resource/ui/hudbosshealth.res new file mode 100644 index 0000000..a058325 --- /dev/null +++ b/resource/ui/hudbosshealth.res @@ -0,0 +1,70 @@ +"Resource/UI/HudBossHealth.res" +{ + "BorderImage" + { + "ControlName" "EditablePanel" + "fieldName" "BorderImage" + "xpos" "0" + "ypos" "5" + "zpos" "0" + "wide" "200" + "tall" "22" + "visible" "1" + "enabled" "1" + "bgcolor_override" "TransparentBlack" + "PaintBackgroundType" "2" + } + + "HealthBarPanel" + { + "ControlName" "EditablePanel" + "fieldName" "HealthBarPanel" + "xpos" "15" + "ypos" "9" + "zpos" "1" + "wide" "168" + "tall" "13" + "visible" "1" + "enabled" "1" + "PaintBackgroundType" "2" + + "BarImage" + { + "ControlName" "ImagePanel" + "fieldName" "BarImage" + "xpos" "0" + "ypos" "0" + "zpos" "5" + "wide" "168" + "tall" "18" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "image" "../hud/halloween_bar" + "scaleImage" "1" + } + } + + "StunMeter" + { + "ControlName" "ContinuousProgressBar" + "fieldName" "StunMeter" + "font" "Default" + "xpos" "50" + "ypos" "19" + "zpos" "2" + "wide" "100" + "tall" "8" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "textAlignment" "Left" + "dulltext" "0" + "brighttext" "0" + "fgcolor_override" "255 255 0 255" + "bgcolor_override" "50 0 0 255" + } +}
\ No newline at end of file diff --git a/resource/ui/hudcurrencyaccount.res b/resource/ui/hudcurrencyaccount.res index 5d89d54..3776fb5 100644 --- a/resource/ui/hudcurrencyaccount.res +++ b/resource/ui/hudcurrencyaccount.res @@ -19,7 +19,7 @@ "CurrencyBG" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "CurrencyBG" "xpos" "0" "ypos" "0" @@ -30,7 +30,8 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fillcolor" "TransparentBlack" + "bgcolor_override" "TransparentBlack" + "PaintBackgroundType" "2" } "CurrencyLabel" diff --git a/resource/ui/huddemomancharge.res b/resource/ui/huddemomancharge.res index dc31608..3c566b9 100644 --- a/resource/ui/huddemomancharge.res +++ b/resource/ui/huddemomancharge.res @@ -4,9 +4,9 @@ { "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter" - "xpos" "0" + "xpos" "c-75" "ypos" "c92" - "xpos_minmode" "10" + "xpos_minmode" "c-60" "ypos_minmode" "c55" "zpos" "2" "wide" "120" @@ -26,8 +26,8 @@ { "ControlName" "CExLabel" "fieldName" "ItemEffectMeterLabel" - "xpos" "125" - "ypos" "c92" + "xpos" "85" + "ypos" "0" "zpos" "3" "wide" "80" "tall" "8" @@ -41,5 +41,9 @@ "textAlignment" "west" "font" "HudFontSmallest" "fgcolor_override" "White" + + "pin_to_sibling" "ChargeMeter" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" } }
\ No newline at end of file diff --git a/resource/ui/huddemomanpipes.res b/resource/ui/huddemomanpipes.res index 09484f1..afa7268 100644 --- a/resource/ui/huddemomanpipes.res +++ b/resource/ui/huddemomanpipes.res @@ -18,7 +18,7 @@ "textAlignment" "west" "dulltext" "0" "brighttext" "0" - "font" "HudFontSmall" + "font" "HudFontSmallest" } "ChargeMeter" diff --git a/resource/ui/huditemeffectmeter_demoman.res b/resource/ui/huditemeffectmeter_demoman.res index 8c44d4e..e88ccc3 100644 --- a/resource/ui/huditemeffectmeter_demoman.res +++ b/resource/ui/huditemeffectmeter_demoman.res @@ -34,7 +34,7 @@ "dulltext" "0" "brighttext" "0" "font" "ItemFontAttribLarge" - "font_minmode" "Default" + "font_minmode" "Cerbetica10" } "ItemEffectMeter" @@ -61,7 +61,7 @@ "ControlName" "CExLabel" "fieldName" "ItemEffectMeterCount" "xpos" "0" - "ypos" "10" + "ypos" "12" "ypos_minmode" "8" "zpos" "2" "wide" "40" diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res index a80fd62..1ba9d8c 100644 --- a/resource/ui/hudmatchstatus.res +++ b/resource/ui/hudmatchstatus.res @@ -214,19 +214,17 @@ "tall" "50" "visible" "0" "enabled" "1" - "delta_item_x" "22" - "delta_item_start_y" "50" - "delta_item_end_y" "70" + "delta_item_x" "20" + "delta_item_start_y" "20" + "delta_item_end_y" "35" "PositiveColor" "ColorGreen" "NegativeColor" "ColorRed" "delta_lifetime" "1" - "delta_item_font" "HudFontMedium" + "delta_item_font" "HudFontMediumSmall" if_match { - "delta_item_x" "35" - "delta_item_start_y" "12" - "delta_item_end_y" "50" + "font" "HudFontSmall" } "TimePanelValue" diff --git a/resource/ui/hudminigame_base.res b/resource/ui/hudminigame_base.res index f54fe09..6966661 100644 --- a/resource/ui/hudminigame_base.res +++ b/resource/ui/hudminigame_base.res @@ -11,7 +11,7 @@ "tall" "14" "visible" "1" "enabled" "1" - "fillcolor" "70 130 180 153" + "fillcolor" "BlueSolid" "scaleImage" "1" } @@ -26,7 +26,7 @@ "tall" "14" "visible" "1" "enabled" "1" - "fillcolor" "205 50 50 153" + "fillcolor" "RedSolid" "scaleImage" "1" } diff --git a/resource/ui/hudobjectiveflagpanel.res b/resource/ui/hudobjectiveflagpanel.res index 4b08501..56782ca 100644 --- a/resource/ui/hudobjectiveflagpanel.res +++ b/resource/ui/hudobjectiveflagpanel.res @@ -29,7 +29,7 @@ "tall" "34" "visible" "1" "enabled" "1" - "fillcolor" "70 130 180 153" + "fillcolor" "Blue" "if_hybrid" { @@ -58,7 +58,7 @@ "tall" "34" "visible" "1" "enabled" "1" - "fillcolor" "205 50 50 153" + "fillcolor" "Red" "if_hybrid" { @@ -312,7 +312,7 @@ if_mvm { - "ypos" "r95" + "ypos" "r65" } "if_hybrid" diff --git a/resource/ui/hudobjectivekothtimepanel.res b/resource/ui/hudobjectivekothtimepanel.res index 10961cd..58e032c 100644 --- a/resource/ui/hudobjectivekothtimepanel.res +++ b/resource/ui/hudobjectivekothtimepanel.res @@ -39,7 +39,7 @@ "ControlName" "CExLabel" "fieldName" "TimePanelValue" "font" "HudFontMedium" - "fgcolor" "TanLight" + "fgcolor" "BlueSolid" "xpos" "15" "ypos" "0" "zpos" "3" @@ -93,7 +93,7 @@ "ControlName" "CExLabel" "fieldName" "TimePanelValue" "font" "HudFontMedium" - "fgcolor" "TanLight" + "fgcolor" "RedSolid" "xpos" "15" "ypos" "0" "zpos" "3" diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res index f36ed61..8ba5175 100644 --- a/resource/ui/hudobjectivetimepanel.res +++ b/resource/ui/hudobjectivetimepanel.res @@ -56,7 +56,7 @@ "ControlName" "CExLabel" "fieldName" "OvertimeLabel" "xpos" "15" - "ypos" "25" + "ypos" "35" "zpos" "5" "wide" "50" "tall" "15" @@ -119,7 +119,7 @@ "ControlName" "CExLabel" "fieldName" "ServerTimeLimitLabel" "xpos" "15" - "ypos" "25" + "ypos" "23" "zpos" "5" "wide" "50" "tall" "15" diff --git a/resource/ui/hudpasstimeteamscore.res b/resource/ui/hudpasstimeteamscore.res new file mode 100644 index 0000000..836a1a9 --- /dev/null +++ b/resource/ui/hudpasstimeteamscore.res @@ -0,0 +1,165 @@ +"Resource/UI/HudPasstimeTeamScore.res" +{ + "HudTeamScore" + { + "ControlName" "EditablePanel" + "fieldName" "HudPasstimeTeamScore" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "f0" + "tall" "480" + "visible" "1" + "enabled" "1" + } + + "LeftSideBG" + { + "ControlName" "ImagePanel" + "fieldName" "LeftSideBG" + "xpos" "c-35" + "ypos" "r50" + "zpos" "1" + "wide" "35" + "tall" "34" + "visible" "1" + "enabled" "1" + "fillcolor" "BlueSolid" + } + + "RightSideBG" + { + "ControlName" "ImagePanel" + "fieldName" "RightSideBG" + "xpos" "c0" + "ypos" "r50" + "zpos" "1" + "wide" "35" + "tall" "34" + "visible" "1" + "enabled" "1" + "fillcolor" "RedSolid" + } + + "OutlineBG" + { + "ControlName" "ImagePanel" + "fieldName" "OutlineBG" + "xpos" "9999" + } + + "BlueScore" + { + "ControlName" "CExLabel" + "fieldName" "BlueScore" + "xpos" "c-57" + "ypos" "r54" + "zpos" "8" + "wide" "50" + "tall" "35" + "visible" "1" + "enabled" "1" + "textAlignment" "east" + "labelText" "%bluescore%" + "font" "Cerbetica32" + "fgcolor" "TanLight" + } + "BlueScoreShadow" + { + "ControlName" "CExLabel" + "fieldName" "BlueScoreShadow" + "xpos" "-2" + "ypos" "-2" + "zpos" "7" + "wide" "50" + "tall" "35" + "visible" "1" + "enabled" "1" + "textAlignment" "east" + "labelText" "%bluescore%" + "font" "Cerbetica32" + "fgcolor" "TransparentBlack" + "pin_to_sibling" "BlueScore" + } + + "RedScore" + { + "ControlName" "CExLabel" + "fieldName" "RedScore" + "xpos" "c7" + "ypos" "r54" + "zpos" "8" + "wide" "50" + "tall" "35" + "visible" "1" + "enabled" "1" + "textAlignment" "west" + "labelText" "%redscore%" + "font" "Cerbetica32" + "fgcolor" "TanLight" + } + + "RedScoreShadow" + { + "ControlName" "CExLabel" + "fieldName" "RedScoreShadow" + "xpos" "-2" + "ypos" "-2" + "zpos" "7" + "wide" "50" + "tall" "35" + "visible" "1" + "enabled" "1" + "textAlignment" "west" + "labelText" "%redscore%" + "font" "Cerbetica32" + "fgcolor" "TransparentBlack" + "pin_to_sibling" "RedScore" + } + + "PlayingToCluster" + { + "ControlName" "EditablePanel" + "fieldName" "PlayingToCluster" + "xpos" "65" + "ypos" "0" + "zpos" "10" + "wide" "f0" + "tall" "480" + "visible" "1" + "enabled" "1" + + "PlayingTo" + { + "ControlName" "CExLabel" + "fieldName" "PlayingTo" + "xpos" "cs-0.5" + "ypos" "r50" + "zpos" "7" + "wide" "140" + "tall" "38" + "visible" "1" + "enabled" "1" + "labelText" "#TF_PlayingTo" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "font" "FontRegular12" + "fgcolor" "TanLight" + } + + "PlayingToBG" + { + "ControlName" "ImagePanel" + "fieldName" "PlayingToBG" + "xpos" "c-40" + "ypos" "r24" + "zpos" "3" + "wide" "80" + "tall" "24" + "visible" "1" + "enabled" "1" + "fillcolor" "TransparentBlack" + } + } +}
\ No newline at end of file diff --git a/resource/ui/hudspellselection.res b/resource/ui/hudspellselection.res index 8ceb60f..36a333a 100644 --- a/resource/ui/hudspellselection.res +++ b/resource/ui/hudspellselection.res @@ -36,10 +36,10 @@ "fieldName" "ActionText" "font" "Default" "labelText" "%actiontext%" - "textAlignment" "west" - "xpos" "9999" - "ypos" "9999" - "wide" "100" + "textAlignment" "center" + "xpos" "0" + "ypos" "25" + "wide" "50" "tall" "10" "fgcolor" "TanLight" "visible" "1" @@ -79,7 +79,6 @@ "textAlignment" "center" "xpos" "-2" "ypos" "-2" - "zpos" "0" "wide" "20" "tall" "20" "fgcolor" "TransparentBlack" diff --git a/resource/ui/hudteamgoal.res b/resource/ui/hudteamgoal.res deleted file mode 100644 index 21a4e76..0000000 --- a/resource/ui/hudteamgoal.res +++ /dev/null @@ -1,76 +0,0 @@ -"Resource/UI/HudTeamGoal.res" -{ - "HudTeamGoalBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "HudTeamGoalBG" - "xpos" "9999" - "ypos" "0" - "zpos" "-1" - "wide" "320" - "tall" "150" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "image" "../hud/death_panel_blue_bg" - "scaleImage" "1" - "teambg_2" "../hud/death_panel_red_bg" - "teambg_3" "../hud/death_panel_blue_bg" - } - - "SwitchLabel" - { - "ControlName" "Label" - "fieldName" "SwitchLabel" - "font" "HudFontSmallBold" - "xpos" "9999" - "ypos" "20" - "zpos" "1" - "wide" "220" - "tall" "15" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "wrap" "1" - "labelText" "#TF_teamswitch_attackers" - "textAlignment" "North" - } - - "GoalLabel" - { - "ControlName" "Label" - "fieldName" "GoalLabel" - "font" "HudFontSmall" - "xpos" "9999" - "ypos" "35" - "zpos" "1" - "wide" "220" - "tall" "55" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "wrap" "1" - "labelText" "" - "textAlignment" "North" - } - - "GoalImage" - { - "ControlName" "CTFImagePanel" - "fieldName" "GoalImage" - "xpos" "9999" - "ypos" "25" - "zpos" "1" - "wide" "45" - "tall" "45" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "image" "../hud/hud_icon_attack" - "scaleImage" "1" - } -}
\ No newline at end of file diff --git a/resource/ui/hudteamgoaltournament.res b/resource/ui/hudteamgoaltournament.res deleted file mode 100644 index 483ba66..0000000 --- a/resource/ui/hudteamgoaltournament.res +++ /dev/null @@ -1,145 +0,0 @@ -"Resource/UI/HudTeamGoalTournament.res" -{ - "HudStopWatchObjective" - { - "ControlName" "EditablePanel" - "fieldName" "HudStopWatchObjective" - "xpos" "9999" - "ypos" "105" - "zpos" "1" - "wide" "275" - "tall" "130" - "visible" "0" - "enabled" "1" - - "HudStopWatchObjectiveBG" - { - "ControlName" "ScalableImagePanel" - "fieldName" "HudStopWatchObjectiveBG" - "xpos" "0" - "ypos" "0" - "zpos" "-1" - "wide" "275" - "tall" "130" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "image" "../HUD/color_panel_browner" - - "src_corner_height" "23" // pixels inside the image - "src_corner_width" "23" - "draw_corner_width" "7" // screen size of the corners ( and sides ), proportional - "draw_corner_height" "7" - } - "HudStopWatchObjectiveBGSmall" - { - "ControlName" "ScalableImagePanel" - "fieldName" "HudStopWatchObjectiveBGSmall" - "xpos" "0" - "ypos" "0" - "zpos" "-1" - "wide" "275" - "tall" "80" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "image" "../HUD/color_panel_browner" - - "src_corner_height" "23" // pixels inside the image - "src_corner_width" "23" - "draw_corner_width" "7" // screen size of the corners ( and sides ), proportional - "draw_corner_height" "7" - } - "HudStopWatchObjectiveLabel" - { - "ControlName" "Label" - "fieldName" "HudStopWatchObjectiveLabel" - "font" "HudFontSmallBoldShadow" - "xpos" "25" - "ypos" "15" - "zpos" "1" - "wide" "275" - "tall" "15" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "wrap" "1" - "labelText" "%objectivelabel%" - "textAlignment" "west" - } - "HudStopWatchObjectiveText1" - { - "ControlName" "CExRichText" - "fieldName" "HudStopWatchObjectiveText1" - "xpos" "25" - "ypos" "35" - "wide" "225" - "tall" "150" - "wrap" "1" - "autoResize" "1" - "pinCorner" "1" - "visible" "1" - "enabled" "1" - "labelText" "" - "textAlignment" "west" - "font" "HudFontSmallestShadow" - "maxchars" "-1" - } - - "HudStopWatchObjectiveShadedBar" - { - "ControlName" "ImagePanel" - "fieldName" "HudStopWatchObjectiveShadedBar" - "xpos" "25" - "ypos" "65" - "zpos" "2" - "wide" "225" - "tall" "2" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "fillcolor" "125 125 125 125" - "PaintBackgroundType" "0" - } - - "HudStopWatchObjectiveText2" - { - "ControlName" "CExRichText" - "fieldName" "HudStopWatchObjectiveText2" - "xpos" "25" - "ypos" "75" - "wide" "225" - "tall" "150" - "wrap" "1" - "autoResize" "1" - "pinCorner" "1" - "visible" "1" - "enabled" "1" - "labelText" "" - "textAlignment" "west" - "font" "HudFontSmallestShadow" - "maxchars" "-1" - } - } - - "HudStopWatchObjectiveArrow" - { - "ControlName" "ScalableImagePanel" - "fieldName" "HudStopWatchObjectiveArrow" - "xpos" "9999" - "ypos" "9999" - "zpos" "-1" - "wide" "80" - "tall" "80" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "image" "../HUD/arrow_big" - } -}
\ No newline at end of file diff --git a/resource/ui/hudteamswitch.res b/resource/ui/hudteamswitch.res index fdbf642..82f762d 100644 --- a/resource/ui/hudteamswitch.res +++ b/resource/ui/hudteamswitch.res @@ -41,7 +41,7 @@ "wrap" "1" "labelText" "#TF_teambalanced" "textAlignment" "North" - "fgcolor_override" "White" + "fgcolor_override" "TanLight" "textinsetx" "5" } "BalanceLabel" @@ -61,7 +61,7 @@ "wrap" "1" "labelText" "" "textAlignment" "North" - "fgcolor_override" "White" + "fgcolor_override" "TanLight" "textinsetx" "5" } "SwitchImage" diff --git a/resource/ui/hudtournament.res b/resource/ui/hudtournament.res index eb7e263..fc75a4e 100644 --- a/resource/ui/hudtournament.res +++ b/resource/ui/hudtournament.res @@ -99,7 +99,7 @@ { "ControlName" "CExLabel" "fieldName" "playername" - "font" "Default" + "font" "Cerbetica10" "xpos" "1" "ypos" "25" "zpos" "5" diff --git a/resource/ui/hudtournamentsetup.res b/resource/ui/hudtournamentsetup.res index d60dc54..704213b 100644 --- a/resource/ui/hudtournamentsetup.res +++ b/resource/ui/hudtournamentsetup.res @@ -92,7 +92,7 @@ { "ControlName" "CExButton" "fieldName" "TournamentNotReadyButton" - "xpos" "90" + "xpos" "35" "ypos" "37" "wide" "55" "tall" "15" @@ -122,7 +122,7 @@ { "ControlName" "CExButton" "fieldName" "TournamentReadyButton" - "xpos" "35" + "xpos" "95" "ypos" "37" "wide" "55" "tall" "15" diff --git a/resource/ui/matchmakingcasualcriteria.res b/resource/ui/matchmakingcasualcriteria.res index 2cd0bc9..c63dfa5 100644 --- a/resource/ui/matchmakingcasualcriteria.res +++ b/resource/ui/matchmakingcasualcriteria.res @@ -36,7 +36,7 @@ "ControlName" "CPvPRankPanel" "fieldName" "RankPanel" "xpos" "0" - "ypos" "-68" + "ypos" "-65" "zpos" "100" "wide" "330" "tall" "102" diff --git a/resource/ui/matchmakingcategorypanel.res b/resource/ui/matchmakingcategorypanel.res deleted file mode 100644 index 2b9433f..0000000 --- a/resource/ui/matchmakingcategorypanel.res +++ /dev/null @@ -1,269 +0,0 @@ -"Resource/UI/MatchmakingCategoryPanel.res" -{ - "MatchmakingCategoryPanel" - { - "fieldName" "MatchmakingCategoryPanel" - "xpos" "0" - "ypos" "0" - "wide" "f0" - "tall" "50" - "proportionaltoparent" "1" - "collapsed_height" "57" - "resize_time" "0.2" - - } - - "TopContainer" - { - "Controlname" "EditablePanel" - "fieldName" "TopContainer" - "xpos" "0" - "ypos" "0" - "zpos" "2" - "wide" "f0" - "tall" "p1.17" - "visible" "1" - "enabled" "1" - "proportionaltoparent" "1" - - "BGColor" - { - "ControlName" "EditablePanel" - "fieldName" "BGColor" - "xpos" "0" - "ypos" "0" - "zpos" "-1" - "wide" "f0" - "tall" "f0" - "visible" "1" - "enabled" "1" - "mouseinputenabled" "0" - "proportionaltoparent" "1" - "bgcolor_override" "ColorBlack" - } - - "BGImage" - { - "ControlName" "ImagePanel" - "fieldName" "BGImage" - "xpos" "0" - "ypos" "0" - "zpos" "0" - "wide" "o4" - "tall" "f0" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - "proportionaltoparent" "1" - } - - "EntryToggleButton" - { - "ControlName" "CExImageButton" - "fieldName" "EntryToggleButton" - "xpos" "0" - "ypos" "rs1" - "zpos" "100" - "wide" "f0" - "tall" "9" - "proportionaltoparent" "1" - "actionsignallevel" "2" - "command" "toggle_collapse" - "labeltext" "#TF_Casual_ViewMaps" - "textAlignment" "west" - "font" "MMenuPlayListDesc" - "textinsetx" "40" - "stay_armed_on_click" "1" - "border_default" "NoBorder" - "defaultBgColor_override" "235 226 202 20" - "border_armed" "NoBorder" - "armedBgColor_override" "LightOrange" - "selectedBGColor_override" "Orange" - "sound_armed" "ui/item_info_mouseover.wav" - "sound_depressed" "UI/buttonclick.wav" - "sound_released" "UI/buttonclickrelease.wav" - "image_default" "glyph_expand" - "button_activation_type" "1" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "6" - "ypos" "cs-0.5" - "zpos" "1" - "wide" "o1" - "tall" "p.9" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - "proportionaltoparent" "1" - } - } - - "Shade" - { - "fieldName" "Shade" - "ControlName" "EditablePanel" - "xpos" "cs-0.5" - "ypos" "0" - "zpos" "0" - "wide" "f0" - "tall" "57" - "mouseinputenabled" "0" - "proportionaltoparent" "1" - "bgcolor_override" "Transparent" - } - - "Checkbutton" - { - "ControlName" "CExCheckButton" - "fieldName" "Checkbutton" - "xpos" "r27" - "ypos" "-1" - "zpos" "3" - "wide" "25" - "tall" "20" - "proportionaltoparent" "1" - "labeltext" "" - "smallcheckimage" "1" - "sound_depressed" "UI/buttonclickrelease.wav" - "button_activation_type" "1" - } - - "Title" - { - "ControlName" "CExLabel" - "fieldName" "Title" - "xpos" "rs1-24" - "ypos" "2" - "zpos" "3" - "wide" "200" - "tall" "15" - "visible" "1" - "enabled" "1" - "labelText" "%title_token%" - "textinsetx" "5" - "use_proportional_insets" "1" - "font" "HudFontSmallestBold" - "textAlignment" "east" - "dulltext" "0" - "brighttext" "0" - "default" "1" - "proportionaltoparent" "1" - "mouseinputenabled" "0" - "fgcolor" "TanLight" - } - - "TitleShadow" - { - "ControlName" "CExLabel" - "fieldName" "TitleShadow" - "xpos" "-1" - "ypos" "-1" - "zpos" "2" - "wide" "200" - "tall" "15" - "visible" "1" - "enabled" "1" - "labelText" "%title_token%" - "textinsetx" "5" - "use_proportional_insets" "1" - "font" "HudFontSmallestBold" - "textAlignment" "east" - "dulltext" "0" - "brighttext" "0" - "default" "1" - "proportionaltoparent" "1" - "mouseinputenabled" "0" - "fgcolor_override" "TransparentBlack" - - "pin_to_sibling" "Title" - "pin_corner_to_sibling" "PIN_TOPLEFT" - "pin_to_sibling_corner" "PIN_TOPLEFT" - } - - "DescLabel" - { - "ControlName" "CExLabel" - "fieldName" "DescLabel" - "font" "MMenuPlayListDesc" - "labelText" "%desc_token%" - "textAlignment" "north-west" - "xpos" "rs1-5" - "ypos" "18" - "zpos" "2" - "wide" "120" - "tall" "40" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "wrap" "1" - "fgcolor_override" "TanLight" - "proportionaltoparent" "1" - "mouseinputenabled" "0" - } - - "DescLabelShadow" - { - "ControlName" "CExLabel" - "fieldName" "DescLabelShadow" - "font" "MMenuPlayListDesc" - "labelText" "%desc_token%" - "textAlignment" "north-west" - "xpos" "-1" - "ypos" "-1" - "zpos" "1" - "wide" "120" - "tall" "40" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "wrap" "1" - "fgcolor_override" "TransparentBlack" - "proportionaltoparent" "1" - "mouseinputenabled" "0" - - "pin_to_sibling" "DescLabel" - "pin_corner_to_sibling" "PIN_TOPLEFT" - "pin_to_sibling_corner" "PIN_TOPLEFT" - } - } - - "PlayListDropShadow" - { - "ControlName" "EditablePanel" - "fieldName" "PlaylistBGPanel" - "xpos" "cs-0.5" - "ypos" "p1.17-2" - "zpos" "1" - "wide" "p1.5" - "tall" "1000" - "visible" "1" - "PaintBackgroundType" "2" - "border" "InnerShadowBorder" - "proportionaltoparent" "1" - "mouseinputenabled" "0" - } - - "MapsContainer" - { - "Controlname" "EditablePanel" - "fieldName" "MapsContainer" - "xpos" "0" - "ypos" "0" - "zpos" "0" - "wide" "f0" - "tall" "0" - "visible" "1" - "enabled" "1" - "proportionaltoparent" "1" - "border" "InnerShadowBorder" - "pinCorner" "2" - "autoResize" "1" - "skip_autoresize" "1" - "bgcolor_override" "0 0 0 150" - } -}
\ No newline at end of file diff --git a/resource/ui/matchmakingdashboard.res b/resource/ui/matchmakingdashboard.res index def114c..1d53277 100644 --- a/resource/ui/matchmakingdashboard.res +++ b/resource/ui/matchmakingdashboard.res @@ -85,7 +85,7 @@ "ControlName" "CExImageButton" "fieldName" "ToggleChatButton" "xpos" "0" - "ypos" "0" + "ypos" "3" "zpos" "100" "wide" "30" "tall" "f6" diff --git a/resource/ui/matchmakingdashboardcasualcriteria.res b/resource/ui/matchmakingdashboardcasualcriteria.res index 0d17296..e98dd43 100644 --- a/resource/ui/matchmakingdashboardcasualcriteria.res +++ b/resource/ui/matchmakingdashboardcasualcriteria.res @@ -19,14 +19,14 @@ "ControlName" "Label" "fieldName" "Title" "xpos" "8" - "ypos" "23" + "ypos" "25" "zpos" "99" "wide" "f0" "tall" "20" "proportionaltoparent" "1" "labeltext" "#TF_Matchmaking_HeaderCasual" "textAlignment" "center" - "font" "HudFontMediumSecondary" + "font" "HudFontMedium" "fgcolor_override" "White" "mouseinputenabled" "0" } diff --git a/resource/ui/matchmakingdashboardcomp.res b/resource/ui/matchmakingdashboardcomp.res index da967b3..a9e847c 100644 --- a/resource/ui/matchmakingdashboardcomp.res +++ b/resource/ui/matchmakingdashboardcomp.res @@ -4,135 +4,135 @@ { "CompStats" { - "fieldName" "CompStats" - "xpos" "r0" - "ypos" "10" - "zpos" "1002" - "wide" "270" - "tall" "f70" - "visible" "1" + "fieldName" "CompStats" + "xpos" "r0" + "ypos" "10" + "zpos" "1002" + "wide" "270" + "tall" "f70" + "visible" "1" "proportionaltoparent" "1" } "Title" { - "ControlName" "Label" - "fieldName" "Title" - "xpos" "8" - "ypos" "23" - "zpos" "99" - "wide" "f0" - "tall" "20" + "ControlName" "Label" + "fieldName" "Title" + "xpos" "8" + "ypos" "25" + "zpos" "101" + "wide" "f0" + "tall" "20" "proportionaltoparent" "1" - "labeltext" "#TF_Matchmaking_HeaderCompetitive" - "textAlignment" "center" - "font" "HudFontMediumSecondary" - "fgcolor_override" "White" - "bgcolor_override" "DarkGrey" - "mouseinputenabled" "0" + "labeltext" "#TF_Matchmaking_HeaderCompetitive" + "textAlignment" "center" + "font" "HudFontMedium" + "fgcolor_override" "White" + "bgcolor_override" "DarkGrey" + "mouseinputenabled" "0" } "ShowExplanationsButton" { - "ControlName" "CExButton" - "fieldName" "ShowExplanationsButton" - "xpos" "rs1-21" - "ypos" "20" - "zpos" "100" - "wide" "15" - "tall" "o1" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "tabPosition" "0" - "labelText" "?" - "font" "HudFontSmallBold" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "default" "0" - "Command" "show_explanations" - "sound_depressed" "UI/buttonclick.wav" - "sound_released" "UI/buttonclickrelease.wav" - "actionsignallevel" "1" + "ControlName" "CExButton" + "fieldName" "ShowExplanationsButton" + "xpos" "rs1-21" + "ypos" "20" + "zpos" "100" + "wide" "15" + "tall" "o1" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "0" + "tabPosition" "0" + "labelText" "?" + "font" "HudFontSmallBold" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "0" + "Command" "show_explanations" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "actionsignallevel" "1" "proportionaltoparent" "1" } "RankTooltipPanel" { - "ControlName" "ImagePanel" - "fieldName" "RankTooltipPanel" - "xpos" "5" - "ypos" "44" - "zpos" "1000" - "wide" "8" - "tall" "8" - "visible" "0" - "enabled" "0" + "ControlName" "ImagePanel" + "fieldName" "RankTooltipPanel" + "xpos" "5" + "ypos" "44" + "zpos" "1000" + "wide" "8" + "tall" "8" + "visible" "0" + "enabled" "0" "proportionaltoparent" "1" - "mouseinputenabled" "1" - "image" "info" - "scaleImage" "1" - "alpha" "75" + "mouseinputenabled" "1" + "image" "info" + "scaleImage" "1" + "alpha" "75" } "stats" { - "fieldName" "stats" - "xpos" "-1" - "ypos" "40" - "zpos" "100" - "wide" "305" - "tall" "340" - "visible" "1" + "fieldName" "stats" + "xpos" "-1" + "ypos" "40" + "zpos" "100" + "wide" "305" + "tall" "340" + "visible" "1" "proportionaltoparent" "1" } "ToolTipButtonHack" { - "ControlName" "EditablePanel" - "fieldName" "ToolTipButtonHack" - "xpos" "cs-0.5" - "ypos" "rs1-8" - "zpos" "101" - "wide" "f20" - "tall" "20" - "visible" "0" - "enabled" "1" - "mouseinputenabled" "1" - "eatmouseinput" "0" + "ControlName" "EditablePanel" + "fieldName" "ToolTipButtonHack" + "xpos" "cs-0.5" + "ypos" "rs1-8" + "zpos" "101" + "wide" "f20" + "tall" "20" + "visible" "0" + "enabled" "1" + "mouseinputenabled" "1" + "eatmouseinput" "0" "showtooltipswhenmousedisabled" "1" - "proportionaltoparent" "1" + "proportionaltoparent" "1" } "QueueButton" { - "ControlName" "CExButton" - "fieldName" "QueueButton" - "xpos" "cs-0.51" - "ypos" "rs1-8" - "zpos" "100" - "wide" "f20" - "tall" "20" - "autoResize" "0" - "pinCorner" "3" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "font" "HudFontMediumSmallBold" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "Command" "find_game" + "ControlName" "CExButton" + "fieldName" "QueueButton" + "xpos" "cs-0.51" + "ypos" "rs1-8" + "zpos" "100" + "wide" "f20" + "tall" "20" + "autoResize" "0" + "pinCorner" "3" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "font" "HudFontMediumSmallBold" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "Command" "find_game" "proportionaltoparent" "1" - "labeltext" "#TF_Matchmaking_StartSearch" - "mouseinputenabled" "1" + "labeltext" "#TF_Matchmaking_StartSearch" + "mouseinputenabled" "1" "keyboardinputenabled" "0" - "actionsignallevel" "1" + "actionsignallevel" "1" - "sound_depressed" "UI/buttonclick.wav" - "sound_released" "UI/buttonclickrelease.wav" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" "armedBgColor_override" "CreditsGreen" "defaultBgColor_override" "GreenSolid" diff --git a/resource/ui/matchmakingdashboardpopup_nextmapvoting.res b/resource/ui/matchmakingdashboardpopup_nextmapvoting.res new file mode 100644 index 0000000..9ae408a --- /dev/null +++ b/resource/ui/matchmakingdashboardpopup_nextmapvoting.res @@ -0,0 +1,231 @@ +"Resource/UI/MatchMakingDashboardPopup_NextMapVoting.res" +{ + "NextMapVoting" + { + "ControlName" "CExpandablePanel" + "fieldName" "NextMapVoting" + "xpos" "cs-0.5" + "ypos" "0" + "zpos" "10000" + "wide" "260" + "tall" "80" + "visible" "1" + "proportionaltoparent" "1" + "keyboardinputenabled" "0" + "mouseinputenabled" "1" + + "collapsed_height" "0" + "expanded_height" "80" + + "pinCorner" "2" + "autoResize" "1" + + "OuterShadow" + { + "ControlName" "EditablePanel" + "fieldName" "OuterShadow" + "xpos" "0" + "ypos" "rs1" + "zpos" "-2" + "wide" "f0" + "tall" "f0" + "visible" "1" + "PaintBackgroundType" "0" + "border" "OuterShadowBorder" + "proportionaltoparent" "1" + + "pinCorner" "0" + "autoResize" "2" + } + + "BGPanel" + { + "ControlName" "EditablePanel" + "fieldName" "BGPanel" + "xpos" "cs-0.5" + "ypos" "cs-0.5" + "zpos" "-1" + "wide" "f5" + "tall" "f5" + "visible" "1" + "border" "NoBorder" + "bgcolor_override" "DarkGrey" + "proportionaltoparent" "1" + "pinCorner" "2" + + "HideButton" + { + "ControlName" "CExImageButton" + "fieldName" "HideButton" + "xpos" "rs1-3" + "ypos" "rs1+3" + "zpos" "1000" + "wide" "o1" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "font" "HudFontSmallBold" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "0" + "labeltext" "" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "Command" "toggle_hide" + "proportionaltoparent" "1" + "actionsignallevel" "2" + + "paintbackground" "0" + + "image_default" "glyph_collapse" + + "image_drawcolor" "235 226 202 255" + "image_armedcolor" "200 80 60 255" + + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "p1" + "tall" "p1" + "visible" "1" + "enabled" "1" + "image" "glyph_store" + "scaleImage" "1" + "proportionaltoparent" "1" + } + } // HideButton + + "ShowButton" + { + "ControlName" "CExImageButton" + "fieldName" "ShowButton" + "xpos" "rs1-3" + "ypos" "rs1+3" + "zpos" "1000" + "wide" "o1" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "font" "HudFontSmallBold" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "0" + "labeltext" "" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "Command" "toggle_hide" + "proportionaltoparent" "1" + "actionsignallevel" "2" + + "paintbackground" "0" + + "image_default" "glyph_expand" + + "image_drawcolor" "235 226 202 255" + "image_armedcolor" "200 80 60 255" + + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "p1" + "tall" "p1" + "visible" "1" + "enabled" "1" + "image" "glyph_store" + "scaleImage" "1" + "proportionaltoparent" "1" + } + } // HideButton + + + "DescLabel" + { + "ControlName" "Label" + "fieldName" "DescLabel" + "xpos" "0" + "ypos" "3" + "wide" "f0" + "zpos" "100" + "tall" "20" + "visible" "1" + "enabled" "1" + "font" "HudFontSmallBold" + "fgcolor_override" "TanLight" + "textAlignment" "center" + "labelText" "#TF_Matchmaking_RollingQueue_MatchOver" + "proportionaltoparent" "1" + } + + "TimeRemainingProgressBar" + { + "ControlName" "CircularProgressBar" + "fieldName" "TimeRemainingProgressBar" + "xpos" "rs1-2" + "ypos" "4" + "wide" "20" + "tall" "o1" + "proportionaltoparent" "1" + "fg_image" "pve/mvm_1_progress" + "bg_image" "progress_bar_pointer_right" + } + + "MapChoice0" + { + "ControlName" "EditablePanel" + "fieldName" "MapChoice0" + "xpos" "p0.2-s0.5" + "ypos" "15" + "zpos" "-1" + "wide" "100" + "tall" "60" + "visible" "1" + "PaintBackgroundType" "2" + "proportionaltoparent" "1" + } + + "MapChoice1" + { + "ControlName" "EditablePanel" + "fieldName" "MapChoice1" + "xpos" "p0.5-s0.5" + "ypos" "15" + "zpos" "-1" + "wide" "100" + "tall" "60" + "visible" "1" + "PaintBackgroundType" "2" + "proportionaltoparent" "1" + } + + "MapChoice2" + { + "ControlName" "EditablePanel" + "fieldName" "MapChoice2" + "xpos" "p0.8-s0.5" + "ypos" "15" + "zpos" "-1" + "wide" "100" + "tall" "60" + "visible" "1" + "PaintBackgroundType" "2" + "proportionaltoparent" "1" + } + } + } +} diff --git a/resource/ui/matchmakingdashboardpopup_nextmapwinner.res b/resource/ui/matchmakingdashboardpopup_nextmapwinner.res new file mode 100644 index 0000000..a7265fa --- /dev/null +++ b/resource/ui/matchmakingdashboardpopup_nextmapwinner.res @@ -0,0 +1,122 @@ +"Resource/UI/MatchMakingDashboardPopup_NextMapWinner.res" +{ + "NextMapWinner" + { + "ControlName" "CExpandablePanel" + "fieldName" "NextMapWinner" + "xpos" "cs-0.5" + "ypos" "0" + "zpos" "10000" + "wide" "260" + "tall" "80" + "visible" "1" + "proportionaltoparent" "1" + "keyboardinputenabled" "0" + "mouseinputenabled" "1" + + "collapsed_height" "0" + "expanded_height" "80" + + "pinCorner" "2" + "autoResize" "1" + + "OuterShadow" + { + "ControlName" "EditablePanel" + "fieldName" "OuterShadow" + "xpos" "0" + "ypos" "rs1" + "zpos" "-2" + "wide" "f0" + "tall" "f0" + "visible" "1" + "PaintBackgroundType" "0" + "border" "OuterShadowBorder" + "proportionaltoparent" "1" + + "pinCorner" "0" + "autoResize" "2" + } + + "BGPanel" + { + "ControlName" "EditablePanel" + "fieldName" "BGPanel" + "xpos" "cs-0.5" + "ypos" "cs-0.5" + "zpos" "-1" + "wide" "f5" + "tall" "f5" + "visible" "1" + "PaintBackgroundType" "2" + "border" "NoBorder" + "bgcolor_override" "DarkGrey" + "proportionaltoparent" "1" + "pinCorner" "2" + + "DescLabel" + { + "ControlName" "Label" + "fieldName" "DescLabel" + "xpos" "0" + "ypos" "3" + "wide" "f0" + "zpos" "100" + "tall" "20" + "visible" "1" + "enabled" "1" + "font" "HudFontSmallBold" + "fgcolor_override" "TanLight" + "textAlignment" "center" + "labelText" "#TF_Matchmaking_RollingQueue_NextMapWinner" + "proportionaltoparent" "1" + } + + "MapImageClip" + { + "ControlName" "EditablePanel" + "fieldName" "MapImageClip" + "xpos" "cs-0.5" + "ypos" "22" + "wide" "50" + "tall" "o0.75" + "zpos" "1" + "proportionaltoparent" "1" + "mouseinputenabled" "0" + + "MapImage" + { + "ControlName" "ScalableImagePanel" + "fieldName" "MapImage" + "xpos" "cs-0.5" + "ypos" "0" + "wide" "f0" + "tall" "o1" + "zpos" "0" + "image" "..\vgui\maps\menu_thumb_pl_goldrush" + "proportionaltoparent" "1" + "mouseinputenabled" "0" + } + } + + "NameLabel" + { + "ControlName" "Label" + "fieldName" "NameLabel" + "xpos" "0" + "ypos" "rs1-2" + "wide" "f0" + "zpos" "10" + "tall" "20" + "visible" "1" + "enabled" "1" + "font" "MapVotesPercentage" + "fgcolor_override" "TanLight" + "textAlignment" "south" + "labelText" "%mapname%" + "proportionaltoparent" "1" + "mouseinputenabled" "0" + } + } + } +} diff --git a/resource/ui/pvprankpanel.res b/resource/ui/pvprankpanel.res index 09d780c..26c72f2 100644 --- a/resource/ui/pvprankpanel.res +++ b/resource/ui/pvprankpanel.res @@ -429,9 +429,9 @@ "ControlName" "EditablePanel" "fieldName" "Stats" "xpos" "0" - "ypos" "63" + "ypos" "60" "wide" "f0" - "tall" "p0.45" + "tall" "f0" "visible" "1" "enabled" "1" "proportionaltoparent" "1" @@ -461,7 +461,7 @@ "ControlName" "Label" "fieldName" "GamesLabel" "xpos" "10" - "ypos" "0" + "ypos" "5" "zpos" "0" "wide" "100" "tall" "20" @@ -478,8 +478,8 @@ { "ControlName" "Label" "fieldName" "KillsLabel" - "xpos" "10" - "ypos" "10" + "xpos" "c-20" + "ypos" "5" "zpos" "0" "wide" "100" "tall" "20" @@ -496,8 +496,8 @@ { "ControlName" "Label" "fieldName" "DeathsLabel" - "xpos" "10" - "ypos" "20" + "xpos" "c-20" + "ypos" "15" "zpos" "0" "wide" "100" "tall" "20" @@ -515,8 +515,8 @@ { "ControlName" "Label" "fieldName" "DamageLabel" - "xpos" "c-40" - "ypos" "0" + "xpos" "10" + "ypos" "15" "zpos" "0" "wide" "100" "tall" "20" @@ -533,8 +533,8 @@ { "ControlName" "Label" "fieldName" "HealingLabel" - "xpos" "c-40" - "ypos" "10" + "xpos" "rs1+20" + "ypos" "5" "zpos" "0" "wide" "100" "tall" "20" @@ -551,8 +551,8 @@ { "ControlName" "Label" "fieldName" "SupportLabel" - "xpos" "c-40" - "ypos" "20" + "xpos" "rs1+20" + "ypos" "15" "zpos" "0" "wide" "100" "tall" "20" @@ -571,11 +571,11 @@ "ControlName" "Label" "fieldName" "ScoreLabel" "xpos" "rs1+20" - "ypos" "20" + "ypos" "15" "wide" "100" "tall" "20" - "visible" "1" - "enabled" "1" + "visible" "0" + "enabled" "0" "font" "HudFontSmallest" "fgcolor_override" "White" "textAlignment" "north-west" diff --git a/resource/ui/replaybrowser/basepage.res b/resource/ui/replaybrowser/basepage.res new file mode 100644 index 0000000..4f7b93d --- /dev/null +++ b/resource/ui/replaybrowser/basepage.res @@ -0,0 +1,59 @@ +"resource/ui/basepage.res" +{ + "BasePage" + { + "ControlName" "Frame" + "fieldName" "BasePage" + "xpos" "0" + "ypos" "40" + "wide" "f0" + "tall" "480" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "settitlebarvisible" "0" + "PaintBackgroundType" "0" + "bgcolor_override" "DarkGrey" + } + + "SearchTextEntry" + { + "ControlName" "TextEntry" + "fieldName" "SearchTextEntry" + "maxchars" "255" + "textHidden" "0" + "textAlignment" "west" + "unicode" "1" + "wrap" "0" + "xpos" "c+80" + "ypos" "5" + "tall" "15" + "wide" "160" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "fgcolor_override" "White" + "bgcolor_override" "DarkerGrey" + "Font" "Cerbetica14" + } + + "ReplayList" + { + "ControlName" "PanelListPanel" + "fieldName" "ReplayList" + "xpos" "c-300" + "ypos" "20" + "wide" "605" + "tall" "350" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "paintbackground" "1" + "bgcolor_override" "Transparent" + "autohide_scrollbar" "1" + } +}
\ No newline at end of file diff --git a/resource/ui/spectator.res b/resource/ui/spectator.res index 8d772a1..2ea9a8d 100644 --- a/resource/ui/spectator.res +++ b/resource/ui/spectator.res @@ -62,10 +62,10 @@ { "ControlName" "CExLabel" "fieldName" "ReinforcementsLabel" - "xpos" "c-300" + "xpos" "0" "ypos" "50" - "wide" "600" - "tall" "24" + "wide" "f0" + "tall" "25" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -73,6 +73,11 @@ "labelText" "#game_respawntime_in_secs" "textAlignment" "center" "font" "HudFontMedium" + + if_mvm + { + "ypos" "90" + } } "BuyBackLabel" @@ -80,16 +85,16 @@ "ControlName" "CExLabel" "fieldName" "BuyBackLabel" "xpos" "0" - "ypos" "0" - "wide" "320" - "tall" "30" + "ypos" "110" + "wide" "f0" + "tall" "25" "autoResize" "0" "pinCorner" "0" "visible" "0" "enabled" "1" "labelText" "#TF_PVE_Buyback" "textAlignment" "center" - "font" "HudFontMedium" + "font" "HudFontSmall" if_mvm { diff --git a/resource/ui/spectatortournament.res b/resource/ui/spectatortournament.res index 7ba9cfd..3c89ef1 100644 --- a/resource/ui/spectatortournament.res +++ b/resource/ui/spectatortournament.res @@ -387,10 +387,10 @@ { "ControlName" "CExLabel" "fieldName" "ReinforcementsLabel" - "xpos" "c-300" + "xpos" "0" "ypos" "50" - "wide" "600" - "tall" "24" + "wide" "f0" + "tall" "25" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -398,25 +398,28 @@ "labelText" "#game_respawntime_in_secs" "textAlignment" "center" "font" "HudFontMedium" + + if_mvm + { + "ypos" "90" + } } "BuyBackLabel" { "ControlName" "CExLabel" "fieldName" "BuyBackLabel" - "xpos" "c-190" - "ypos" "360" - "wide" "380" - "tall" "24" + "xpos" "0" + "ypos" "110" + "wide" "f0" + "tall" "25" "autoResize" "0" "pinCorner" "0" "visible" "0" "enabled" "1" "labelText" "#TF_PVE_Buyback" "textAlignment" "center" - "font" "HudFontMediumSecondary" - "wrap" "1" - "centerwrap" "1" + "font" "HudFontSmall" if_mvm { diff --git a/resource/ui/stampdonationadd.res b/resource/ui/stampdonationadd.res index 445cad8..9e224cd 100644 --- a/resource/ui/stampdonationadd.res +++ b/resource/ui/stampdonationadd.res @@ -116,7 +116,7 @@ "ControlName" "CExButton" "fieldName" "Nope" "xpos" "40" - "ypos" "214" + "ypos" "210" "zpos" "20" "wide" "175" "tall" "25" diff --git a/resource/ui/targetid.res b/resource/ui/targetid.res index 8cfbe4f..8b2a286 100644 --- a/resource/ui/targetid.res +++ b/resource/ui/targetid.res @@ -18,11 +18,13 @@ { "ControlName" "CTFImagePanel" "fieldName" "TargetIDBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "-1" - "visible" "0" - "enabled" "0" + "xpos" "0" + "ypos" "48" + "zpos" "1" + "wide" "f0" + "tall" "35" + "visible" "1" + "enabled" "1" "image" "../hud/color_panel_brown" "scaleImage" "1" "teambg_1" "../hud/color_panel_brown" @@ -105,7 +107,7 @@ "xpos" "15" "ypos" "15" "zpos" "6" - "wide" "300" + "wide" "f0" "tall" "15" "visible" "1" "enabled" "1" @@ -151,7 +153,7 @@ "ControlName" "EditablePanel" "fieldName" "KillStreakAnchor" "xpos" "2" - "ypos" "18" + "ypos" "17" "wide" "8" "tall" "8" "visible" "1" @@ -224,11 +226,11 @@ { "ControlName" "ImagePanel" "fieldName" "MoveableSymbolIcon" - "xpos" "5" - "ypos" "7" - "zpos" "6" - "wide" "0" - "tall" "0" + "xpos" "16" + "ypos" "0" + "zpos" "12" + "wide" "16" + "tall" "8" "visible" "1" "enabled" "1" "image" "../hud/eng_sel_item_movable" @@ -242,7 +244,7 @@ "fieldName" "MoveableKeyLabel" "font" "HudFontSmallest" "xpos" "0" - "ypos" "29" + "ypos" "43" "zpos" "6" "wide" "12" "tall" "0" diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res index 5f2b525..390e5f6 100644 --- a/scripts/hudlayout.res +++ b/scripts/hudlayout.res @@ -123,9 +123,10 @@ "fieldName" "HudDemomanCharge" "visible" "1" "enabled" "1" - "xpos" "c-75" - "ypos" "c25" - "wide" "200" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "f0" "tall" "500" "MeterFG" "White" "MeterBG" "Gray" @@ -274,7 +275,7 @@ "visible" "0" "enabled" "1" "xpos" "c-100" - "ypos" "246" + "ypos" "250" "ypos_minmode" "c80" "wide" "600" "tall" "50" @@ -287,7 +288,7 @@ "visible" "0" "enabled" "1" "xpos" "c-100" - "ypos" "c100" + "ypos" "c120" "wide" "600" "tall" "50" "priority" "40" @@ -301,7 +302,7 @@ "visible" "0" "enabled" "1" "xpos" "c-100" - "ypos" "c130" + "ypos" "c120" "ypos_minmode" "c120" "wide" "600" "tall" "50" @@ -314,7 +315,7 @@ "visible" "1" "enabled" "1" "xpos" "5" - "ypos" "0" + "ypos" "c-100" "wide" "640" "tall" "480" "PaintBackgroundType" "2" |