diff options
23 files changed, 269 insertions, 266 deletions
diff --git a/#customizations/hudplayerhealth-broesel.res b/#customizations/hudplayerhealth-broesel.res index 6351d22..1146df3 100644 --- a/#customizations/hudplayerhealth-broesel.res +++ b/#customizations/hudplayerhealth-broesel.res @@ -96,7 +96,7 @@ "fillcolor" "0 0 0 0" } - "PlayerStatusHealthValue" + "PlayerHealthValue" { "xpos" "-18" "ypos" "12" @@ -104,7 +104,7 @@ "font_minmode" "Cerbetica24" } - "PlayerStatusHealthValueShadow" + "PlayerHealthValueShadow" { "font" "Cerbetica24" "font_minmode" "Cerbetica24" diff --git a/materials/logo/tf2_logo_lt-blu.vtf b/materials/logo/tf2_logo_lt-blu.vtf Binary files differnew file mode 100644 index 0000000..2eb2e91 --- /dev/null +++ b/materials/logo/tf2_logo_lt-blu.vtf diff --git a/resource/fonts/Cerbetica.otf b/resource/fonts/Cerbetica.otf Binary files differdeleted file mode 100644 index 67349e4..0000000 --- a/resource/fonts/Cerbetica.otf +++ /dev/null diff --git a/resource/fonts/Cerbetica.ttf b/resource/fonts/Cerbetica.ttf Binary files differnew file mode 100644 index 0000000..e0f4b49 --- /dev/null +++ b/resource/fonts/Cerbetica.ttf diff --git a/resource/fonts/Cerbetica_bold.otf b/resource/fonts/Cerbetica_bold.otf Binary files differdeleted file mode 100644 index f6f0b39..0000000 --- a/resource/fonts/Cerbetica_bold.otf +++ /dev/null diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res index 5660969..34655ff 100644 --- a/resource/scheme/clientscheme_colors.res +++ b/resource/scheme/clientscheme_colors.res @@ -6,22 +6,14 @@ // HUD COLORS //--------------------------------------------- "ColorRed" "255 0 0 255" - "ColorVermillion" "255 64 0 255" - "ColorOrange" "255 128 0 255" "ColorYellow" "255 255 0 255" - "ColorLime" "128 255 0 255" - "ColorGreen" "0 255 0 255" - "ColorTeal" "0 255 128 255" + "ColorGreen" "76 107 34 150" "ColorCyan" "72 255 255 255" - "ColorAqua" "0 128 255 255" "ColorBlue" "0 0 255 255" "ColorPurple" "128 0 255 255" "ColorMagenta" "255 0 255 255" - "ColorRuby" "255 0 128 255" "ColorBlack" "0 0 0 255" - "ColorGreyDark" "64 64 64 255" "ColorGreyMid" "128 128 128 255" - "ColorGreyLight" "192 192 192 255" "ColorWhite" "255 255 255 255" "DullWhite" "132 132 132 255" "Grey" "51 47 46 255" @@ -38,7 +30,7 @@ "Health Buff" "48 255 48 255" "Health Hurt" "255 153 0 255" "Heal Numbers" "48 255 48 255" - "Last DamageHeal Info" "72 255 255 255" + "Damage Numbers" "72 255 255 255" "ItemPanelBG" "50 50 50 255" "Button Color" "72 255 255 255" //--------------------------------------------- @@ -102,7 +94,7 @@ "Black" "29 29 29 255" "Transparent" "0 0 0 0" - "TransparentBlack" "0 0 0 200" + "TransparentBlack" "0 0 0 230" "TransparentLightBlack" "0 0 0 90" "FooterBGBlack" "52 48 55 255" @@ -114,7 +106,7 @@ "HUDDeathWarning" "255 0 0 255" "HudWhite" "255 255 255 255" "HudOffWhite" "200 187 161 255" - "HudBlack" "0 0 0 230" + "HudBlack" "16 16 16 230" "ProgressBarBlue" "91 122 142 255" "CreditsGreen" "94 150 49 255" @@ -162,11 +154,11 @@ "DisguiseMenuIconBlue" "92 128 166 255" "ProgressOffWhiteTransparent" "251 235 202 128" - "MatchmakingDialogTitleColor" "15 255 255 255" + "MatchmakingDialogTitleColor" "200 184 151 255" "MatchmakingMenuItemBackground" "46 43 42 255" - "MatchmakingMenuItemBackgroundActive" "15 255 255 255" - "MatchmakingMenuItemTitleColor" "15 255 255 255" - "MatchmakingMenuItemDescriptionColor" "15 255 255 255" + "MatchmakingMenuItemBackgroundActive" "150 71 0 255" + "MatchmakingMenuItemTitleColor" "200 184 151 255" + "MatchmakingMenuItemDescriptionColor" "200 184 151 255" "HTMLBackground" "95 92 101 255" diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res index d68cae3..072ef8e 100644 --- a/resource/scheme/clientscheme_fonts.res +++ b/resource/scheme/clientscheme_fonts.res @@ -7,7 +7,7 @@ Scheme { "1" { - "name" "Cerbetica_bold" + "name" "Cerbetica" "tall" "56" "additive" "0" "antialias" "1" @@ -17,7 +17,7 @@ Scheme { "1" { - "name" "Cerbetica_bold" + "name" "Cerbetica" "tall" "40" "additive" "0" "antialias" "1" @@ -27,7 +27,7 @@ Scheme { "1" { - "name" "Cerbetica_bold" + "name" "Cerbetica" "tall" "32" "additive" "0" "antialias" "1" @@ -37,7 +37,7 @@ Scheme { "1" { - "name" "Cerbetica_bold" + "name" "Cerbetica" "tall" "28" "additive" "0" "antialias" "1" @@ -47,7 +47,7 @@ Scheme { "1" { - "name" "Cerbetica_bold" + "name" "Cerbetica" "tall" "24" "additive" "0" "antialias" "1" @@ -57,7 +57,7 @@ Scheme { "1" { - "name" "Cerbetica_bold" + "name" "Cerbetica" "tall" "24" "additive" "0" "antialias" "1" @@ -68,7 +68,7 @@ Scheme { "1" { - "name" "Cerbetica_bold" + "name" "Cerbetica" "tall" "20" "additive" "0" "antialias" "1" @@ -78,7 +78,7 @@ Scheme { "1" { - "name" "Cerbetica_bold" + "name" "Cerbetica" "tall" "18" "additive" "0" "antialias" "1" @@ -88,7 +88,7 @@ Scheme { "1" { - "name" "Cerbetica_bold" + "name" "Cerbetica" "tall" "16" "additive" "0" "antialias" "1" @@ -98,7 +98,7 @@ Scheme { "1" { - "name" "Cerbetica_bold" + "name" "Cerbetica" "tall" "14" "additive" "0" "antialias" "1" @@ -108,7 +108,7 @@ Scheme { "1" { - "name" "Cerbetica_bold" + "name" "Cerbetica" "tall" "12" "additive" "0" "antialias" "1" @@ -2703,13 +2703,8 @@ Scheme } "8" { - "font" "resource/fonts/Cerbetica.otf" - "name" "Cerbetica" - } - "9" - { - "font" "resource/fonts/Cerbetica_bold.otf" - "name" "Cerbetica_bold" + "font" "resource/fonts/Cerbetica.ttf" + "name" "Cerbetica" } } }
\ No newline at end of file diff --git a/resource/tools.res b/resource/tools.res index 39535a9..79f0053 100644 --- a/resource/tools.res +++ b/resource/tools.res @@ -188,7 +188,7 @@ "ControlName" "CExImageButton" "fieldname" "ClosedCaptionsON" "xpos" "0" - "ypos" "-30" + "ypos" "5" "zpos" "16" "wide" "130" "tall" "26" @@ -203,6 +203,8 @@ "sound_released" "UI/buttonclickrelease.wav" "pin_to_sibling" "ReloadScheme" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_BOTTOMLEFT" } "ClosedCaptionsOFF" @@ -234,7 +236,7 @@ "ControlName" "CExImageButton" "fieldname" "SoundFix" "xpos" "0" - "ypos" "-30" + "ypos" "5" "zpos" "16" "wide" "130" "tall" "26" @@ -247,7 +249,10 @@ "textAlignment" "center" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" + "pin_to_sibling" "ClosedCaptionsON" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_BOTTOMLEFT" } "InviliblePlayersFix" @@ -279,7 +284,7 @@ "ControlName" "CExImageButton" "fieldname" "NetgraphToggle" "xpos" "0" - "ypos" "-30" + "ypos" "5" "zpos" "16" "wide" "130" "tall" "26" @@ -292,7 +297,10 @@ "textAlignment" "center" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" + "pin_to_sibling" "SoundFix" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_BOTTOMLEFT" } "MatchStatusToggle" @@ -313,6 +321,7 @@ "textAlignment" "center" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" + "pin_to_sibling" "NetgraphToggle" "pin_corner_to_sibling" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_TOPRIGHT" @@ -334,6 +343,7 @@ "font" "Cerbetica12" "textAlignment" "center" "fgcolor_override" "TanLight" + "pin_to_sibling" "NetgraphToggle" "pin_corner_to_sibling" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_BOTTOMLEFT" @@ -518,5 +528,29 @@ "armedFgColor_override" "128 0 128 255" "depressedFgColor_override" "255 0 255 255" } + + "VersionLabel" + { + "ControlName" "CExLabel" + "fieldName" "VersionLabel" + "xpos" "-30" + "ypos" "5" + "wide" "100" + "tall" "24" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "labelText" "rayshud version: v2021.0700" + "font" "Cerbetica12" + "textAlignment" "center" + "fgcolor_override" "TanLight" + "wrap" "1" + "allcaps" "1" + + "pin_to_sibling" "MatchStatusToggle" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_BOTTOMLEFT" + } } } diff --git a/resource/ui/classselection-base.res b/resource/ui/classselection-base.res index fc413d4..9275cb4 100644 --- a/resource/ui/classselection-base.res +++ b/resource/ui/classselection-base.res @@ -84,11 +84,11 @@ "scaleImage" "1" "paintbackground" "0" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -121,11 +121,11 @@ "scaleImage" "1" "paintbackground" "0" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -158,11 +158,11 @@ "scaleImage" "1" "paintbackground" "0" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -195,11 +195,11 @@ "scaleImage" "1" "paintbackground" "0" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -232,11 +232,11 @@ "scaleImage" "1" "paintbackground" "0" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -269,11 +269,11 @@ "scaleImage" "1" "paintbackground" "0" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -306,11 +306,11 @@ "scaleImage" "1" "paintbackground" "0" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -343,11 +343,11 @@ "scaleImage" "1" "paintbackground" "0" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -380,11 +380,11 @@ "scaleImage" "1" "paintbackground" "0" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -415,11 +415,11 @@ "font" "Cerbetica16" "paintbackground" "0" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -450,11 +450,11 @@ "font" "Cerbetica16" "paintbackground" "0" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -481,11 +481,11 @@ "Command" "openloadout" "font" "Cerbetica16" - "fgcolor" "235 226 202 255" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" - "selectedFgColor_override" "72 255 255 255" + "fgcolor" "TanLight" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "ColorCyan" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -746,7 +746,7 @@ "labelText" "%numScout%" "textAlignment" "west" "font" "Cerbetica16" - "fgcolor" "235 226 202 255" + "fgcolor" "TanLight" } "numSoldier" @@ -766,7 +766,7 @@ "labelText" "%numSoldier%" "textAlignment" "west" "font" "Cerbetica16" - "fgcolor" "235 226 202 255" + "fgcolor" "TanLight" } "numPyro" @@ -786,7 +786,7 @@ "labelText" "%numPyro%" "textAlignment" "west" "font" "Cerbetica16" - "fgcolor" "235 226 202 255" + "fgcolor" "TanLight" } "numDemoman" @@ -806,7 +806,7 @@ "labelText" "%numDemoman%" "textAlignment" "west" "font" "Cerbetica16" - "fgcolor" "235 226 202 255" + "fgcolor" "TanLight" } "numHeavy" @@ -826,7 +826,7 @@ "labelText" "%numHeavy%" "textAlignment" "west" "font" "Cerbetica16" - "fgcolor" "235 226 202 255" + "fgcolor" "TanLight" } "numEngineer" @@ -846,7 +846,7 @@ "labelText" "%numEngineer%" "textAlignment" "west" "font" "Cerbetica16" - "fgcolor" "235 226 202 255" + "fgcolor" "TanLight" } "numMedic" @@ -866,7 +866,7 @@ "labelText" "%numMedic%" "textAlignment" "west" "font" "Cerbetica16" - "fgcolor" "235 226 202 255" + "fgcolor" "TanLight" } "numSniper" @@ -886,7 +886,7 @@ "labelText" "%numSniper%" "textAlignment" "west" "font" "Cerbetica16" - "fgcolor" "235 226 202 255" + "fgcolor" "TanLight" } "numSpy" @@ -906,7 +906,7 @@ "labelText" "%numSpy%" "textAlignment" "west" "font" "Cerbetica16" - "fgcolor" "235 226 202 255" + "fgcolor" "TanLight" } "MvMUpgradeImageScout" @@ -1142,7 +1142,7 @@ "visible" "1" "enabled" "1" "wrap" "1" - "fgcolor_override" "46 43 42 255" + "fgcolor_override" "TanDarker" } "ClassHighlightText" @@ -1161,7 +1161,7 @@ "visible" "1" "enabled" "1" "wrap" "1" - "fgcolor_override" "46 43 42 255" + "fgcolor_override" "TanDarker" } "CloseButton" @@ -1189,11 +1189,11 @@ "Command" "close" "paintbackground" "0" - "defaultFgColor_override" "46 43 42 255" - "armedFgColor_override" "235 226 202 255" - "depressedFgColor_override" "46 43 42 255" + "defaultFgColor_override" "TanDarker" + "armedFgColor_override" "TanLight" + "depressedFgColor_override" "TanDarker" - "image_drawcolor" "117 107 94 255" + "image_drawcolor" "TanDark" "image_armedcolor" "200 80 60 255" "SubImage" { diff --git a/resource/ui/econ/confirmcustomizetexturedialog.res b/resource/ui/econ/confirmcustomizetexturedialog.res index 69d2783..3857c25 100644 --- a/resource/ui/econ/confirmcustomizetexturedialog.res +++ b/resource/ui/econ/confirmcustomizetexturedialog.res @@ -201,7 +201,7 @@ "tall" "160" "visible" "1" "bgcolor_override" "0 0 0 0" - "noitem_textcolor" "117 107 94 255" + "noitem_textcolor" "TanDark" //"PaintBackgroundType" "2" "paintborder" "0" "model_xpos" "00" @@ -353,12 +353,12 @@ "editable" "0" "font" "HudFontSmall" - //"fgcolor_override" "235 226 202 255" + //"fgcolor_override" "TanLight" "bgcolor_override" "0 0 0 255" - //"disabledFgColor_override" "235 226 202 255" + //"disabledFgColor_override" "TanLight" "disabledBgColor_override" "0 0 0 255" "selectionColor_override" "0 0 0 255" - "selectionTextColor_override" "235 226 202 255" + "selectionTextColor_override" "TanLight" "defaultSelectionBG2Color_override" "0 0 0 0" } } @@ -464,12 +464,12 @@ "font" "HudFontSmall" "visible" "0" - //"fgcolor_override" "235 226 202 255" + //"fgcolor_override" "TanLight" "bgcolor_override" "0 0 0 255" - //"disabledFgColor_override" "235 226 202 255" + //"disabledFgColor_override" "TanLight" "disabledBgColor_override" "0 0 0 255" "selectionColor_override" "0 0 0 255" - "selectionTextColor_override" "235 226 202 255" + "selectionTextColor_override" "TanLight" "defaultSelectionBG2Color_override" "0 0 0 0" } @@ -593,12 +593,12 @@ "editable" "0" "font" "HudFontSmall" - //"fgcolor_override" "235 226 202 255" + //"fgcolor_override" "TanLight" "bgcolor_override" "0 0 0 255" - //"disabledFgColor_override" "235 226 202 255" + //"disabledFgColor_override" "TanLight" "disabledBgColor_override" "0 0 0 255" "selectionColor_override" "0 0 0 255" - "selectionTextColor_override" "235 226 202 255" + "selectionTextColor_override" "TanLight" "defaultSelectionBG2Color_override" "0 0 0 0" } } diff --git a/resource/ui/freezepanelkillerhealth.res b/resource/ui/freezepanelkillerhealth.res index 796aa7b..9f35900 100644 --- a/resource/ui/freezepanelkillerhealth.res +++ b/resource/ui/freezepanelkillerhealth.res @@ -40,10 +40,10 @@ "enabled" "0" } - "GuiPlayerHealth" + "SpecHealthValue" { "ControlName" "CExLabel" - "fieldName" "GuiPlayerHealth" + "fieldName" "SpecHealthValue" "xpos" "3" "ypos" "3" "zpos" "5" @@ -56,10 +56,10 @@ "labeltext" "%Health%" } - "GuiPlayerHealthShadow" + "SpecHealthValueShadow" { "ControlName" "CExLabel" - "fieldName" "GuiPlayerHealthShadow" + "fieldName" "SpecHealthValueShadow" "xpos" "4" "ypos" "4" "zpos" "5" diff --git a/resource/ui/huddamageaccount.res b/resource/ui/huddamageaccount.res index 2e8ee7c..3bf30b4 100644 --- a/resource/ui/huddamageaccount.res +++ b/resource/ui/huddamageaccount.res @@ -7,7 +7,7 @@ "text_y" "0" "delta_item_end_y" "0" "PositiveColor" "Heal Numbers" - "NegativeColor" "" // Unused + "NegativeColor" "Damage Numbers" "delta_lifetime" "2" "delta_item_font" "Cerbetica24Outline" "delta_item_font_big" "Cerbetica24Outline" @@ -30,7 +30,7 @@ "textAlignment" "center" "font" "Cerbetica28" "font_minmode" "Cerbetica20" - "fgcolor" "Last DamageHeal Info" + "fgcolor" "Damage Numbers" } "DamageAccountValueShadow" diff --git a/resource/ui/hudplayerhealth-base.res b/resource/ui/hudplayerhealth-base.res index 7b6daf6..2e6572d 100644 --- a/resource/ui/hudplayerhealth-base.res +++ b/resource/ui/hudplayerhealth-base.res @@ -141,7 +141,7 @@ "enabled" "1" "scaleImage" "1" "image" "../vgui/bleed_drop" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -160,7 +160,7 @@ "enabled" "1" "scaleImage" "1" "image" "../vgui/bleed_drop" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -179,7 +179,7 @@ "enabled" "1" "scaleImage" "1" "image" "../vgui/covered_in_gas" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -198,7 +198,7 @@ "enabled" "1" "scaleImage" "1" "image" "../vgui/marked_for_death" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -217,7 +217,7 @@ "enabled" "1" "scaleImage" "1" "image" "../vgui/marked_for_death" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -236,7 +236,7 @@ "enabled" "1" "scaleImage" "1" "image" "../HUD/defense_buff_bullet_blue" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -255,7 +255,7 @@ "enabled" "1" "scaleImage" "1" "image" "../HUD/defense_buff_explosion_blue" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -274,7 +274,7 @@ "enabled" "1" "scaleImage" "1" "image" "../HUD/defense_buff_fire_blue" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -293,7 +293,7 @@ "enabled" "1" "scaleImage" "1" "image" "../HUD/defense_buff_bullet_blue" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -312,7 +312,7 @@ "enabled" "1" "scaleImage" "1" "image" "../HUD/defense_buff_explosion_blue" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -331,7 +331,7 @@ "enabled" "1" "scaleImage" "1" "image" "../HUD/defense_buff_fire_blue" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -350,7 +350,7 @@ "enabled" "1" "scaleImage" "1" "image" "../signs/death_wheel_whammy" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -369,7 +369,7 @@ "enabled" "1" "scaleImage" "1" "image" "../HUD/defense_buff_bullet_blue" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -388,7 +388,7 @@ "enabled" "1" "scaleImage" "1" "image" "../HUD/defense_buff_bullet_blue" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -407,7 +407,7 @@ "enabled" "1" "scaleImage" "1" "image" "../HUD/defense_buff_bullet_blue" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -425,7 +425,7 @@ "visible" "1" "enabled" "1" "scaleImage" "1" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -444,7 +444,7 @@ "enabled" "1" "scaleImage" "1" "image" "" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -463,7 +463,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_strength_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -482,7 +482,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_haste_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -501,7 +501,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_regen_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -520,7 +520,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_resist_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -539,7 +539,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_vampire_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -558,7 +558,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_reflect_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -577,7 +577,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_precision_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -596,7 +596,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_agility_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -615,7 +615,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_knockout_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -634,7 +634,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_king_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -653,7 +653,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_plague_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -672,7 +672,7 @@ "enabled" "1" "scaleImage" "1" "image" "../Effects/powerup_supernova_hud" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -691,7 +691,7 @@ "enabled" "1" "scaleImage" "1" "image" "../vgui/slowed" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" @@ -710,7 +710,7 @@ "enabled" "1" "scaleImage" "1" "image" "../vgui/bleed_drop_grapple" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" diff --git a/resource/ui/importfiledialog.res b/resource/ui/importfiledialog.res index 22f7638..a4d1997 100644 --- a/resource/ui/importfiledialog.res +++ b/resource/ui/importfiledialog.res @@ -767,7 +767,7 @@ "enabled" "0" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "117 107 94 255" + "disabledfgcolor2_override" "TanDark" "command" "UpdateBodygroup" "border" "NoBorder" } @@ -789,7 +789,7 @@ "enabled" "0" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "117 107 94 255" + "disabledfgcolor2_override" "TanDark" "command" "UpdateBodygroup" "border" "NoBorder" } @@ -811,7 +811,7 @@ "enabled" "0" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "117 107 94 255" + "disabledfgcolor2_override" "TanDark" "command" "UpdateBodygroup" "border" "NoBorder" } @@ -833,7 +833,7 @@ "enabled" "0" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "117 107 94 255" + "disabledfgcolor2_override" "TanDark" "command" "UpdateBodygroup" "border" "NoBorder" } @@ -855,7 +855,7 @@ "enabled" "0" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "117 107 94 255" + "disabledfgcolor2_override" "TanDark" "command" "UpdateBodygroup" "border" "NoBorder" } @@ -877,7 +877,7 @@ "enabled" "0" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "117 107 94 255" + "disabledfgcolor2_override" "TanDark" "command" "UpdateBodygroup" "border" "NoBorder" } @@ -899,7 +899,7 @@ "enabled" "0" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "117 107 94 255" + "disabledfgcolor2_override" "TanDark" "command" "UpdateBodygroup" "border" "NoBorder" } @@ -921,7 +921,7 @@ "enabled" "0" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "117 107 94 255" + "disabledfgcolor2_override" "TanDark" "command" "UpdateBodygroup" "border" "NoBorder" } @@ -943,7 +943,7 @@ "enabled" "0" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "117 107 94 255" + "disabledfgcolor2_override" "TanDark" "command" "UpdateBodygroup" "border" "NoBorder" } @@ -1723,7 +1723,7 @@ "enabled" "1" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "117 107 94 255" + "disabledfgcolor2_override" "TanDark" "command" "UpdatePaintable0" "border" "NoBorder" } @@ -1745,7 +1745,7 @@ "enabled" "1" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "117 107 94 255" + "disabledfgcolor2_override" "TanDark" "command" "UpdatePaintable1" "border" "NoBorder" } diff --git a/resource/ui/mainmenuoverride-base.res b/resource/ui/mainmenuoverride-base.res index b6b14ee..6f09bd7 100644 --- a/resource/ui/mainmenuoverride-base.res +++ b/resource/ui/mainmenuoverride-base.res @@ -53,9 +53,9 @@ "border_armed" "" "paintbackground" "0" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "72 255 255 255" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "ColorCyan" } } @@ -114,7 +114,7 @@ "tall" "300" "visible" "0" "bgcolor_override" "Transparent" - "noitem_textcolor" "117 107 94 255" + "noitem_textcolor" "TanDark" "PaintBackgroundType" "2" "paintborder" "1" "border" "MainMenuBGBorder" @@ -139,7 +139,7 @@ "enabled" "1" "labelText" "%attriblist%" "textAlignment" "center" - "fgcolor" "117 107 94 255" + "fgcolor" "TanDark" "centerwrap" "1" } } @@ -198,25 +198,25 @@ "sound_depressed" "" "sound_released" "UI/wooo_tree.wav" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "72 255 255 255" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "ColorCyan" - "image_drawcolor" "235 226 202 255" - "image_armedcolor" "72 255 255 255" + "image_drawcolor" "TanLight" + "image_armedcolor" "ColorCyan" } "TFLogoImage" { "ControlName" "ImagePanel" "fieldName" "TFLogoImage" - "xpos" "30" - "ypos" "35" + "xpos" "r180" + "ypos" "r45" "wide" "179" "tall" "45" - "visible" "0" - "enabled" "0" - "image" "../logo/tf2_logo_black" + "visible" "1" + "enabled" "1" + "image" "../logo/tf2_logo_lt-blu" "scaleImage" "1" "command" "engine play vo/heavy_battlecry02.mp3" } @@ -263,9 +263,9 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" - "depressedFgColor_override" "235 226 202 255" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" + "depressedFgColor_override" "TanLight" } "RankTooltipPanel" @@ -452,8 +452,8 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" } } diff --git a/resource/ui/mainmenuoverride.res b/resource/ui/mainmenuoverride.res index ce6889c..fdb6afa 100644 --- a/resource/ui/mainmenuoverride.res +++ b/resource/ui/mainmenuoverride.res @@ -5,24 +5,6 @@ "Resource/UI/MainMenuOverride.res" { - "VersionLabel" - { - "ControlName" "CExLabel" - "fieldName" "VersionLabel" - "font" "HudFontSmall" - "labelText" "v2021.0415" - "xpos" "r135" - "ypos" "r15" - "wide" "130" - "tall" "10" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "east" - "fgcolor_override" "TanLight" - } - "TFCharacterImage" { "ControlName" "ImagePanel" @@ -71,8 +53,8 @@ "paintborder" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" } } @@ -115,8 +97,8 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" } } @@ -157,8 +139,8 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "defaultFgColor_override" "235 226 202 255" - "armedFgColor_override" "72 255 255 255" + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "ColorCyan" } } }
\ No newline at end of file diff --git a/resource/ui/matchmakingdashboardpopup_nextmapvoting.res b/resource/ui/matchmakingdashboardpopup_nextmapvoting.res index 0cd4cc1..4e23a44 100644 --- a/resource/ui/matchmakingdashboardpopup_nextmapvoting.res +++ b/resource/ui/matchmakingdashboardpopup_nextmapvoting.res @@ -83,7 +83,7 @@ "image_default" "glyph_collapse" - "image_drawcolor" "235 226 202 255" + "image_drawcolor" "TanLight" "image_armedcolor" "200 80 60 255" "SubImage" @@ -133,7 +133,7 @@ "image_default" "glyph_expand" - "image_drawcolor" "235 226 202 255" + "image_drawcolor" "TanLight" "image_armedcolor" "200 80 60 255" "SubImage" diff --git a/resource/ui/scoreboard-base.res b/resource/ui/scoreboard-base.res index ad97352..e142a55 100644 --- a/resource/ui/scoreboard-base.res +++ b/resource/ui/scoreboard-base.res @@ -712,7 +712,7 @@ "tall" "36" "visible" "1" "PaintBackgroundType" "2" - "bgcolor_override" "117 107 94 255" + "bgcolor_override" "TanDark" } "AvatarImage" { @@ -733,7 +733,7 @@ { "ControlName" "CExLabel" "fieldName" "AvatarTextLabel" - "fgcolor" "235 226 202 255" + "fgcolor" "TanLight" "xpos" "50" "ypos" "7" "zpos" "2" @@ -791,7 +791,7 @@ "tall" "36" "visible" "1" "PaintBackgroundType" "2" - "bgcolor_override" "117 107 94 255" + "bgcolor_override" "TanDark" } "AvatarImage" { @@ -812,7 +812,7 @@ { "ControlName" "CExLabel" "fieldName" "AvatarTextLabel" - "fgcolor" "235 226 202 255" + "fgcolor" "TanLight" "xpos" "50" "ypos" "7" "zpos" "2" @@ -916,7 +916,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" } "DeathsLabel" @@ -969,7 +969,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" } "GameType" { @@ -1039,7 +1039,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" } "DestructionLabel" @@ -1092,7 +1092,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" } "RevengeLabel" @@ -1163,7 +1163,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" } "DefensesLabel" @@ -1216,7 +1216,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" } "DominationLabel" { @@ -1268,7 +1268,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" } "Revenge" { @@ -1303,7 +1303,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" } "HealingLabel" { @@ -1355,7 +1355,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" } "InvulnLabel" { @@ -1407,7 +1407,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" } "TeleportsLabel" { @@ -1663,7 +1663,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" } "DamageLabel" { diff --git a/resource/ui/spectatorguihealth.res b/resource/ui/spectatorguihealth.res index 4a12c68..bdca9a2 100644 --- a/resource/ui/spectatorguihealth.res +++ b/resource/ui/spectatorguihealth.res @@ -42,7 +42,7 @@ "scaleImage" "1" } - "GuiPlayerHealth" + "SpecHealthValue" { "ControlName" "CExLabel" "fieldName" "GuiPlayerHealth" @@ -59,10 +59,10 @@ "fgcolor" "Health Normal" } - "GuiPlayerHealthShadow" + "SpecHealthValueShadow" { "ControlName" "CExLabel" - "fieldName" "GuiPlayerHealthShadow" + "fieldName" "SpecHealthValueShadow" "xpos" "-1" "ypos" "-2" "zpos" "5" @@ -75,7 +75,7 @@ "font" "Cerbetica18" "fgcolor" "TransparentBlack" - "pin_to_sibling" "GuiPlayerHealth" + "pin_to_sibling" "SpecHealthValue" "pin_corner_to_sibling" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_TOPLEFT" } diff --git a/resource/ui/spectatortournamentguihealth.res b/resource/ui/spectatortournamentguihealth.res index 0a58663..802031d 100644 --- a/resource/ui/spectatortournamentguihealth.res +++ b/resource/ui/spectatortournamentguihealth.res @@ -38,10 +38,10 @@ "image" "" } - "GuiPlayerHealth" + "SpecHealthValue" { "ControlName" "CExLabel" - "fieldName" "GuiPlayerHealth" + "fieldName" "SpecHealthValue" "xpos" "0" "ypos" "0" "zpos" "5" @@ -55,10 +55,10 @@ "fgcolor" "Spec Health Normal" } - "GuiPlayerHealthShadow" + "SpecHealthValueShadow" { "ControlName" "CExLabel" - "fieldName" "GuiPlayerHealthShadow" + "fieldName" "SpecHealthValueShadow" "xpos" "-1" "ypos" "-2" "zpos" "4" @@ -71,7 +71,7 @@ "font" "Cerbetica16" "fgcolor" "TransparentBlack" - "pin_to_sibling" "GuiPlayerHealth" + "pin_to_sibling" "SpecHealthValue" "pin_corner_to_sibling" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_TOPLEFT" } diff --git a/resource/ui/testitemroot.res b/resource/ui/testitemroot.res index 56ee3ba..85bf9d7 100644 --- a/resource/ui/testitemroot.res +++ b/resource/ui/testitemroot.res @@ -753,12 +753,12 @@ "NumericInputOnly" "0" "unicode" "0" - "fgcolor_override" "235 226 202 255" + "fgcolor_override" "TanLight" "bgcolor_override" "251 235 202 0" "disabledFgColor_override" "117 107 94 0" "disabledBgColor_override" "251 235 202 0" "selectionColor_override" "Transparent" - "selectionTextColor_override" "235 226 202 255" + "selectionTextColor_override" "TanLight" "defaultSelectionBG2Color_override" "251 235 202 255" } @@ -964,9 +964,9 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "image_armedcolor" "235 226 202 255" - "image_drawcolor" "235 226 202 255" - "image_selectedcolor" "46 43 42 255" + "image_armedcolor" "TanLight" + "image_drawcolor" "TanLight" + "image_selectedcolor" "TanDarker" "SubImage" { diff --git a/resource/ui/tfadvancedoptionsdialog.res b/resource/ui/tfadvancedoptionsdialog.res index 4abe61e..d0c130a 100644 --- a/resource/ui/tfadvancedoptionsdialog.res +++ b/resource/ui/tfadvancedoptionsdialog.res @@ -42,7 +42,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "TanLight" + "fgcolor_override" "ColorCyan" "allcaps" "1" } diff --git a/scripts/hudanimations_custom.txt b/scripts/hudanimations_custom.txt index 4acd00a..6d484a7 100644 --- a/scripts/hudanimations_custom.txt +++ b/scripts/hudanimations_custom.txt @@ -4,8 +4,8 @@ event HudHealthBonusPulse Animate PlayerStatusHealthBonusImage Alpha "255" Linear 0.0 0.2 Animate PlayerStatusHealthBonusImage Alpha "0" Linear 0.2 0.4 - Animate PlayerStatusHealthValue FgColor "Health Buff" Accel 0.0 0.0 - Animate GuiPlayerHealth FgColor "Health Buff" Accel 0.0 0.0 + Animate PlayerHealthValue FgColor "Health Buff" Accel 0.0 0.0 + Animate SpecHealthValue FgColor "Health Buff" Accel 0.0 0.0 RunEvent HudHealthBonusPulseLoop 0.4 } @@ -15,8 +15,8 @@ event HudHealthBonusPulseStop StopEvent HudHealthBonusPulse 0.0 StopEvent HudHealthBonusPulseLoop 0.0 - Animate PlayerStatusHealthValue FgColor "Health Normal" Accel 0.0 0.0 - Animate GuiPlayerHealth FgColor "Health Normal" Accel 0.0 0.0 + Animate PlayerHealthValue FgColor "Health Normal" Accel 0.0 0.0 + Animate SpecHealthValue FgColor "Health Normal" Accel 0.0 0.0 } //================================================================================== // Low Health Pulse @@ -25,8 +25,8 @@ event HudHealthDyingPulse Animate PlayerStatusHealthBonusImage Alpha "255" Linear 0.0 0.2 Animate PlayerStatusHealthBonusImage Alpha "0" Linear 0.2 0.2 - Animate PlayerStatusHealthValue FgColor "Health Hurt" Accel 0.0 0.0 - Animate GuiPlayerHealth FgColor "Health Hurt" Accel 0.0 0.0 + Animate PlayerHealthValue FgColor "Health Hurt" Accel 0.0 0.0 + Animate SpecHealthValue FgColor "Health Hurt" Accel 0.0 0.0 RunEvent HudHealthDyingPulseLoop 0.4 } @@ -36,8 +36,8 @@ event HudHealthDyingPulseStop StopEvent HudHealthDyingPulse 0.0 StopEvent HudHealthDyingPulseLoop 0.0 - Animate PlayerStatusHealthValue FgColor "Health Normal" Accel 0.0 0.0 - Animate GuiPlayerHealth FgColor "Health Normal" Accel 0.0 0.0 + Animate PlayerHealthValue FgColor "Health Normal" Accel 0.0 0.0 + Animate SpecHealthValue FgColor "Health Normal" Accel 0.0 0.0 } //================================================================================== // Low Ammo Pulse @@ -67,7 +67,7 @@ event HudLowAmmoPulseStop event HudMedicCharged { RunEvent HudMedicOrangePulseCharge 0.0 - //RunEvent HudMedicSolidColorCharge 0.0 + //RunEvent HudMedicSolidColorCharge 0.0 //RunEvent HudMedicRainbowCharged 0.0 RunEvent HudMedicChargedLoop 0.6 @@ -133,21 +133,21 @@ event DamagedPlayer event HitMarker { - Animate CustomCrosshair FgColor "CrosshairDamage" Linear 0.0 0.00001 - Animate CustomCrosshair FgColor "Crosshair" Linear 0.10 0.10001 + Animate CustomCrosshair FgColor "CrosshairDamage" Linear 0.0 0.0 + Animate CustomCrosshair FgColor "Crosshair" Linear 0.15 0.0 } //================================================================================== // Spy Disguise event HudSpyDisguiseFadeIn { - //RunEvent HudSpyDisguiseChanged 0.0 + //RunEvent HudSpyDisguiseChanged 0.0 //Animate PlayerStatusSpyImage Alpha "255" Linear 0.9 0.1 } event HudSpyDisguiseFadeOut { - //RunEvent HudSpyDisguiseChanged 0.0 + //RunEvent HudSpyDisguiseChanged 0.0 //Animate PlayerStatusSpyImage Alpha "0" Linear 0.9 0.1 } @@ -163,10 +163,10 @@ event HudSpyDisguiseChanged event HudSnapShotReminderIn { - RunEvent HudHealthDyingPulseStop 10.0 - RunEvent HudHealthBonusPulseStop 10.0 - RunEvent HudLowAmmoPulseStop 10.0 - RunEvent HudMedicChargedStop 10.0 + RunEvent HudHealthDyingPulseStop 10.0 + RunEvent HudHealthBonusPulseStop 10.0 + RunEvent HudLowAmmoPulseStop 10.0 + RunEvent HudMedicChargedStop 10.0 } //================================================================================== @@ -184,4 +184,4 @@ event TeamStatus_PlayerAlive event CompetitiveGame_LowerChatWindow { } event CompetitiveGame_RestoreChatWindow { } -event HudTournament_MoveChatWindow { }
\ No newline at end of file +event HudTournament_MoveChatWindow { } |