From 54aa4bb5591d5b8fc92d23f2c5911301565867d1 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 19 Apr 2024 22:07:25 -0700 Subject: [PATCH] 64bit tf2 default hud file changes --- _tf2hud/resource/chatscheme.res | 42 ++++++--- _tf2hud/resource/clientscheme.res | 17 +++- _tf2hud/resource/sourcescheme.res | 22 +++-- _tf2hud/resource/ui/hud_obj_sapper.res | 30 +++--- _tf2hud/resource/ui/mainmenuoverride.res | 97 ++++++++++++++++++++ _tf2hud/resource/ui/matchmakingpingpanel.res | 24 ++--- 6 files changed, 180 insertions(+), 52 deletions(-) diff --git a/_tf2hud/resource/chatscheme.res b/_tf2hud/resource/chatscheme.res index 25e0ed07..4fcefbb5 100644 --- a/_tf2hud/resource/chatscheme.res +++ b/_tf2hud/resource/chatscheme.res @@ -224,7 +224,8 @@ Scheme "1" { "name" "Verdana" - "tall" "12" + "tall" "12" [!$POSIX] + "tall" "14" [$POSIX] "weight" "0" "range" "0x0000 0x017F" "yres" "480 599" @@ -232,7 +233,8 @@ Scheme "2" { "name" "Verdana" - "tall" "13" + "tall" "13" [!$POSIX] + "tall" "16" [$POSIX] "weight" "0" "range" "0x0000 0x017F" "yres" "600 767" @@ -240,7 +242,8 @@ Scheme "3" { "name" "Verdana" - "tall" "14" + "tall" "14" [!$POSIX] + "tall" "16" [$POSIX] "weight" "0" "range" "0x0000 0x017F" "yres" "768 1023" @@ -249,7 +252,8 @@ Scheme "4" { "name" "Verdana" - "tall" "16" + "tall" "16" [!$POSIX] + "tall" "18" [$POSIX] "weight" "0" "range" "0x0000 0x017F" "yres" "1024 1199" @@ -258,7 +262,8 @@ Scheme "5" { "name" "Verdana" - "tall" "20" + "tall" "20" [!$POSIX] + "tall" "24" [$POSIX] "weight" "0" "range" "0x0000 0x017F" "yres" "1200 6000" @@ -361,8 +366,8 @@ Scheme "1" { "name" "Verdana" - "tall" "12" [$WIN32] - "tall" "15" [$_disabled_] + "tall" "12" [!$POSIX] + "tall" "15" [$POSIX] "weight" "700" "yres" "480 599" "dropshadow" "1" @@ -370,8 +375,8 @@ Scheme "2" { "name" "Verdana" - "tall" "14" [$WIN32] - "tall" "17" [$_disabled_] + "tall" "14" [!$POSIX] + "tall" "17" [$POSIX] "weight" "700" "yres" "600 767" "dropshadow" "1" @@ -379,8 +384,8 @@ Scheme "3" { "name" "Verdana" - "tall" "15" [$WIN32] - "tall" "18" [$_disabled_] + "tall" "15" [!$POSIX] + "tall" "18" [$POSIX] "weight" "700" "yres" "768 1023" "dropshadow" "1" @@ -388,8 +393,8 @@ Scheme "4" { "name" "Verdana" - "tall" "17" [$WIN32] - "tall" "20" [$_disabled_] + "tall" "17" [!$POSIX] + "tall" "20" [$POSIX] "weight" "700" "yres" "1024 1199" "dropshadow" "1" @@ -397,8 +402,8 @@ Scheme "5" { "name" "Verdana" - "tall" "22" [$WIN32] - "tall" "25" [$_disabled_] + "tall" "22" [!$POSIX] + "tall" "25" [$POSIX] "weight" "700" "yres" "1200 10000" "dropshadow" "1" @@ -812,5 +817,12 @@ Scheme { "1" "resource/HALFLIFE2.ttf" "2" "resource/HL2EP2.ttf" + "10" "resource/linux_fonts/DejaVuSans.ttf" + "11" "resource/linux_fonts/DejaVuSans-Bold.ttf" + "12" "resource/linux_fonts/DejaVuSans-BoldOblique.ttf" + "13" "resource/linux_fonts/DejaVuSans-Oblique.ttf" + "14" "resource/linux_fonts/LiberationSans-Regular.ttf" + "15" "resource/linux_fonts/LiberationSans-Bold.ttf" + "16" "resource/linux_fonts/LiberationMono-Regular.ttf" } } diff --git a/_tf2hud/resource/clientscheme.res b/_tf2hud/resource/clientscheme.res index 328f1013..68b776c1 100644 --- a/_tf2hud/resource/clientscheme.res +++ b/_tf2hud/resource/clientscheme.res @@ -2391,7 +2391,8 @@ Scheme "1" { "name" "Verdana" - "tall" "7" + "tall" "7" [!$POSIX] + "tall" "8" [$POSIX] "weight" "0" "additive" "1" "antialias" "1" @@ -2402,7 +2403,8 @@ Scheme "1" { "name" "Verdana" - "tall" "7" + "tall" "7" [!$POSIX] + "tall" "8" [$POSIX] "weight" "0" "antialias" "1" } @@ -2412,7 +2414,8 @@ Scheme "1" { "name" "Verdana" - "tall" "7" + "tall" "7" [!$POSIX] + "tall" "8" [$POSIX] "weight" "0" "blur" "3" "additive" "1" @@ -5839,5 +5842,13 @@ Scheme "range" "0x0000 0x007E" } } + "10" "resource/linux_fonts/DejaVuSans.ttf" + "11" "resource/linux_fonts/DejaVuSans-Bold.ttf" + "12" "resource/linux_fonts/DejaVuSans-BoldOblique.ttf" + "13" "resource/linux_fonts/DejaVuSans-Oblique.ttf" + "14" "resource/linux_fonts/LiberationSans-Regular.ttf" + "15" "resource/linux_fonts/LiberationSans-Bold.ttf" + "16" "resource/linux_fonts/LiberationMono-Regular.ttf" + "17" "resource/linux_fonts/FiraSans-Regular.ttf" } } diff --git a/_tf2hud/resource/sourcescheme.res b/_tf2hud/resource/sourcescheme.res index c25d5049..342ff266 100644 --- a/_tf2hud/resource/sourcescheme.res +++ b/_tf2hud/resource/sourcescheme.res @@ -82,7 +82,7 @@ Scheme FrameGrip.Color1 "TFTanMedium" FrameGrip.Color2 "TFDarkBrown" FrameTitleButton.FgColor "TFTanBright" - FrameTitleBar.Font "DefaultLarge" [$WIN32] + FrameTitleBar.Font "DefaultLarge" [!$_disabled_] FrameTitleBar.TextColor "TFTanBright" FrameTitleBar.DisabledTextColor "TFTanLight" @@ -99,8 +99,8 @@ Scheme ListPanel.SelectedBgColor "SelectionBG" ListPanel.SelectedOutOfFocusBgColor "SelectionBG2" - MainMenu.TextColor "TanLight" [$WIN32] - MainMenu.ArmedTextColor "117 107 94 255" [$WIN32] + MainMenu.TextColor "TanLight" [!$_disabled_] + MainMenu.ArmedTextColor "117 107 94 255" [!$_disabled_] MainMenu.Inset "32" Menu.TextInset "6" @@ -135,7 +135,7 @@ Scheme { "MainMenuFont" { - "1" [$WIN32] + "1" [!$_disabled_] { "name" "TF2 Build" "tall" "18" @@ -223,7 +223,7 @@ Scheme } - AchievementItemTitle [$WIN32] + AchievementItemTitle [!$_disabled_] { "1" { @@ -236,7 +236,7 @@ Scheme } } - AchievementItemTitleLarge [$WIN32] + AchievementItemTitleLarge [!$_disabled_] { "1" { @@ -249,7 +249,7 @@ Scheme } } - AchievementItemDescription [$WIN32] + AchievementItemDescription [!$_disabled_] { "1" { @@ -327,5 +327,13 @@ Scheme "range" "0x0000 0x0451" } } + "10" "resource/linux_fonts/DejaVuSans.ttf" + "11" "resource/linux_fonts/DejaVuSans-Bold.ttf" + "12" "resource/linux_fonts/DejaVuSans-BoldOblique.ttf" + "13" "resource/linux_fonts/DejaVuSans-Oblique.ttf" + "14" "resource/linux_fonts/LiberationSans-Regular.ttf" + "15" "resource/linux_fonts/LiberationSans-Bold.ttf" + "16" "resource/linux_fonts/LiberationMono-Regular.ttf" + "17" "resource/linux_fonts/FiraSans-Regular.ttf" } } diff --git a/_tf2hud/resource/ui/hud_obj_sapper.res b/_tf2hud/resource/ui/hud_obj_sapper.res index e7d36cb0..04f0f841 100644 --- a/_tf2hud/resource/ui/hud_obj_sapper.res +++ b/_tf2hud/resource/ui/hud_obj_sapper.res @@ -14,7 +14,7 @@ "enabled" "1" "tabPosition" "0" } - + "Background" { "ControlName" "CIconPanel" @@ -26,11 +26,11 @@ "tall" "31" "visible" "1" "enabled" "1" - "scaleImage" "1" + "scaleImage" "1" "icon" "obj_status_background_red" "iconColor" "255 255 255 255" } - + "Icon" { "ControlName" "CIconPanel" @@ -41,11 +41,11 @@ "tall" "28" "visible" "1" "enabled" "1" - "scaleImage" "1" + "scaleImage" "1" "icon" "obj_status_sapper" "iconColor" "255 255 255 255" } - + "NotBuiltPanel" { "ControlName" "EditablePanel" @@ -75,7 +75,7 @@ "brighttext" "0" } } - + "BuiltPanel" { "ControlName" "EditablePanel" @@ -87,7 +87,7 @@ "visible" "0" "Health" - { + { "ControlName" "CBuildingHealthBar" "fieldName" "Health" "font" "Default" @@ -132,16 +132,16 @@ "dulltext" "0" "brighttext" "0" } - + "BuildingProgress" - { + { "ControlName" "ContinuousProgressBar" "fieldName" "BuildingProgress" "font" "Default" "xpos" "0" "ypos" "16" "wide" "50" - "tall" "8" + "tall" "8" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -151,7 +151,7 @@ "brighttext" "0" } } - + "RunningPanel" { "ControlName" "EditablePanel" @@ -161,7 +161,7 @@ "wide" "100" "tall" "31" "visible" "0" - + "TargetIcon" { "ControlName" "CIconPanel" @@ -172,13 +172,13 @@ "tall" "20" "visible" "1" "enabled" "1" - "scaleImage" "1" + "scaleImage" "1" "icon" "obj_status_sentrygun_1" "iconColor" "255 255 255 255" } - + "TargetHealth" - { + { "ControlName" "ContinuousProgressBar" "fieldName" "TargetHealth" "font" "Default" diff --git a/_tf2hud/resource/ui/mainmenuoverride.res b/_tf2hud/resource/ui/mainmenuoverride.res index cdf1e1b5..c55827f7 100644 --- a/_tf2hud/resource/ui/mainmenuoverride.res +++ b/_tf2hud/resource/ui/mainmenuoverride.res @@ -2445,6 +2445,103 @@ } } + "SettingsButtonSDK" + { + "ControlName" "CExImageButton" + "fieldName" "SettingsButtonSDK" + "xpos" "c-34+273" + "ypos" "437" + "zpos" "4" + "wide" "25" + "tall" "25" + "autoResize" "0" + "pinCorner" "3" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "font" "HudFontSmallBold" + "textAlignment" "west" + "textinsetx" "25" + "use_proportional_insets" "1" + "dulltext" "0" + "brighttext" "0" + "default" "1" + "Command" "OpenOptionsDialog" + + "navUp" "TF2SettingsButtonSDK" + "navLeft" "TF2SettingsButtonSDK" + "navRight" "TF2SettingsButtonSDK" + + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + + "image_drawcolor" "235 226 202 255" + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "6" + "ypos" "6" + "zpos" "1" + "wide" "14" + "tall" "14" + "visible" "1" + "enabled" "1" + "scaleImage" "1" + "image" "glyph_options" + } + } + + "TF2SettingsButtonSDK" + { + "ControlName" "CExImageButton" + "fieldName" "TF2SettingsButtonSDK" + "xpos" "c-0+273" + "ypos" "437" + "zpos" "5" + "wide" "25" + "tall" "25" + "autoResize" "0" + "pinCorner" "3" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "font" "HudFontSmallBold" + "textAlignment" "east" + "dulltext" "0" + "brighttext" "0" + "default" "1" + "Command" "opentf2options" + "use_proportional_insets" "1" + "textinsetx" "25" + + "navUp" "SettingsButtonSDK" + "navLeft" "SettingsButtonSDK" + "navRight" "SettingsButtonSDK" + + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + + "image_drawcolor" "235 226 202 255" + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "6" + "ypos" "6" + "zpos" "1" + "wide" "14" + "tall" "14" + "visible" "1" + "enabled" "1" + "scaleImage" "1" + "image" "glyph_options" + "scaleImage" "1" + } + } + "SettingsButton" { "ControlName" "CExImageButton" diff --git a/_tf2hud/resource/ui/matchmakingpingpanel.res b/_tf2hud/resource/ui/matchmakingpingpanel.res index 3f54ccc6..bbd453c0 100644 --- a/_tf2hud/resource/ui/matchmakingpingpanel.res +++ b/_tf2hud/resource/ui/matchmakingpingpanel.res @@ -46,7 +46,7 @@ "textAlignment" "west" "font" "HudFontMediumBold" "fgcolor_override" "TanDark" - + "mouseinputenabled" "0" } @@ -66,7 +66,7 @@ "smallcheckimage" "1" "fgcolor_override" "TanDark" - "sound_depressed" "UI/buttonclickrelease.wav" + "sound_depressed" "UI/buttonclickrelease.wav" "button_activation_type" "1" } @@ -108,7 +108,7 @@ "font" "HudFontSmallestBold" "smallcheckimage" "1" - "sound_depressed" "UI/buttonclickrelease.wav" + "sound_depressed" "UI/buttonclickrelease.wav" "button_activation_type" "1" "cvar_name" "tf_party_ignore_invites" @@ -130,7 +130,7 @@ "smallcheckimage" "1" "enabled" "0" - "sound_depressed" "UI/buttonclickrelease.wav" + "sound_depressed" "UI/buttonclickrelease.wav" "button_activation_type" "1" } @@ -149,7 +149,7 @@ "font" "HudFontSmallestBold" "smallcheckimage" "1" - "sound_depressed" "UI/buttonclickrelease.wav" + "sound_depressed" "UI/buttonclickrelease.wav" "button_activation_type" "1" "fgcolor_override" "TanDark" } @@ -170,7 +170,7 @@ "smallcheckimage" "1" "actionsignallevel" "1" - "sound_depressed" "UI/buttonclickrelease.wav" + "sound_depressed" "UI/buttonclickrelease.wav" "button_activation_type" "1" "cvar_name" "tf_mm_custom_ping_enabled" @@ -193,7 +193,7 @@ "font" "HudFontSmallestBold" "smallcheckimage" "1" - "sound_depressed" "UI/buttonclickrelease.wav" + "sound_depressed" "UI/buttonclickrelease.wav" "button_activation_type" "1" } @@ -213,7 +213,7 @@ "wrap" "1" "fgcolor" "117 107 94 255" - "sound_depressed" "UI/buttonclickrelease.wav" + "sound_depressed" "UI/buttonclickrelease.wav" "button_activation_type" "1" } @@ -230,7 +230,7 @@ "labeltext" "" "textAlignment" "west" "font" "HudFontSmallestBold" - + "mouseinputenabled" "0" } @@ -301,14 +301,14 @@ { "fgcolor_override" "TanDark" } - + "UpButton" { "ControlName" "Button" "FieldName" "UpButton" "visible" "0" } - + "DownButton" { "ControlName" "Button" @@ -331,7 +331,7 @@ "border" "InnerShadowBorder" "mouseinputenabled" "0" } - + "Background" { "ControlName" "EditablePanel"