64bit tf2 default hud file changes

rbjaxter · Apr 20, 2024 · 54aa4bb · 54aa4bb
1 parent 5d820df
commit 54aa4bb
Show file tree

Hide file tree

Showing 6 changed files with 180 additions and 52 deletions.
diff --git a/_tf2hud/resource/chatscheme.res b/_tf2hud/resource/chatscheme.res
@@ -224,23 +224,26 @@ Scheme
 			"1"
 			{
 				"name"		"Verdana"
-				"tall"		"12"
+				"tall"		"12" [!$POSIX]
+				"tall"		"14" [$POSIX]
 				"weight"	"0"
 				"range"		"0x0000 0x017F"
 				"yres"	"480 599"
 			}
 			"2"
 			{
 				"name"		"Verdana"
-				"tall"		"13"
+				"tall"		"13" [!$POSIX]
+				"tall"		"16" [$POSIX]
 				"weight"	"0"
 				"range"		"0x0000 0x017F"
 				"yres"	"600 767"
 			}
 			"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,44 +366,44 @@ Scheme
 			"1"
 			{
 				"name"		"Verdana"
-				"tall"		"12"	[$WIN32]
-				"tall"		"15"	[$_disabled_]
+				"tall"		"12"	[!$POSIX]
+				"tall"		"15"	[$POSIX]
 				"weight"	"700"
 				"yres"		"480 599"
 				"dropshadow"	"1"
 			}
 			"2"
 			{
 				"name"		"Verdana"
-				"tall"		"14"	[$WIN32]
-				"tall"		"17"	[$_disabled_]
+				"tall"		"14"	[!$POSIX]
+				"tall"		"17"	[$POSIX]
 				"weight"	"700"
 				"yres"		"600 767"
 				"dropshadow"	"1"
 			}
 			"3"
 			{
 				"name"		"Verdana"
-				"tall"		"15"	[$WIN32]
-				"tall"		"18"	[$_disabled_]
+				"tall"		"15"	[!$POSIX]
+				"tall"		"18"	[$POSIX]
 				"weight"	"700"
 				"yres"		"768 1023"
 				"dropshadow"	"1"
 			}
 			"4"
 			{
 				"name"		"Verdana"
-				"tall"		"17"	[$WIN32]
-				"tall"		"20"	[$_disabled_]
+				"tall"		"17"	[!$POSIX]
+				"tall"		"20"	[$POSIX]
 				"weight"	"700"
 				"yres"		"1024 1199"
 				"dropshadow"	"1"
 			}
 			"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
@@ -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
@@ -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
@@ -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"