treadmil work update

conchkritz · Jul 6, 2024 · b2e15f2 · b2e15f2
1 parent 22c6ea7
commit b2e15f2
Show file tree

Hide file tree

Showing 28 changed files with 477 additions and 169 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # ckHUD
 
-**this hud is kinda not actively maintained cuz i go on steam on a monthly basis**
+**THIS HUD IS A WORK IN PROGRESS!!**
 
 ![Main Menu V.0.3.5](https://user-images.githubusercontent.com/76109782/171527344-b8f2b9c0-ad1f-432f-8aa6-d1b086e3aa19.png)
 

diff --git a/_ckHUD/resource/fonts/extended/Blocks.ttf b/_ckHUD/resource/fonts/extended/Blocks.ttf
diff --git a/_ckHUD/resource/fonts/extended/TF2Build.ttf b/_ckHUD/resource/fonts/extended/TF2Build.ttf
diff --git a/_ckHUD/resource/fonts/extended/TF2Secondary_original_letter_t.ttf b/_ckHUD/resource/fonts/extended/TF2Secondary_original_letter_t.ttf
diff --git a/_ckHUD/resource/ui/hudbowcharge.res b/_ckHUD/resource/ui/hudbowcharge.res
diff --git a/_test/resource/ui/hudplayerhealth_alt.res b/_test/resource/ui/hudplayerhealth_alt.res
diff --git a/_tf2/resource/chatscheme.res b/_tf2/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"	[$X360]
+				"tall"		"12"	[!$POSIX]
+				"tall"		"15"	[$POSIX]
 				"weight"	"700"
 				"yres"		"480 599"
 				"dropshadow"	"1"
 			}
 			"2"
 			{
 				"name"		"Verdana"
-				"tall"		"14"	[$WIN32]
-				"tall"		"17"	[$X360]
+				"tall"		"14"	[!$POSIX]
+				"tall"		"17"	[$POSIX]
 				"weight"	"700"
 				"yres"		"600 767"
 				"dropshadow"	"1"
 			}
 			"3"
 			{
 				"name"		"Verdana"
-				"tall"		"15"	[$WIN32]
-				"tall"		"18"	[$X360]
+				"tall"		"15"	[!$POSIX]
+				"tall"		"18"	[$POSIX]
 				"weight"	"700"
 				"yres"		"768 1023"
 				"dropshadow"	"1"
 			}
 			"4"
 			{
 				"name"		"Verdana"
-				"tall"		"17"	[$WIN32]
-				"tall"		"20"	[$X360]
+				"tall"		"17"	[!$POSIX]
+				"tall"		"20"	[$POSIX]
 				"weight"	"700"
 				"yres"		"1024 1199"
 				"dropshadow"	"1"
 			}
 			"5"
 			{
 				"name"		"Verdana"
-				"tall"		"22"	[$WIN32]
-				"tall"		"25"	[$X360]
+				"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/_tf2/resource/clientscheme.res b/_tf2/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/_tf2/resource/sourcescheme.res b/_tf2/resource/sourcescheme.res
@@ -82,7 +82,7 @@ Scheme
 		FrameGrip.Color1				"TFTanMedium"
 		FrameGrip.Color2				"TFDarkBrown"
 		FrameTitleButton.FgColor		"TFTanBright"
-		FrameTitleBar.Font			"DefaultLarge"		[$WIN32]
+		FrameTitleBar.Font			"DefaultLarge"		[!$OSX]
 		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"			[!$OSX]
+		MainMenu.ArmedTextColor		"117 107 94 255"	[!$OSX]
 		MainMenu.Inset				"32"
 
 		Menu.TextInset					"6"
@@ -135,7 +135,7 @@ Scheme
 	{
 		"MainMenuFont"
 		{
-			"1"	[$WIN32]
+			"1"	[!$OSX]
 			{
 				"name"		"TF2 Build"
 				"tall"		"18"
@@ -223,7 +223,7 @@ Scheme
 		}
 
 
-		AchievementItemTitle	[$WIN32]
+		AchievementItemTitle	[!$OSX]
 		{
 			"1"
 			{
@@ -236,7 +236,7 @@ Scheme
 			}
 		}
 
-		AchievementItemTitleLarge	[$WIN32]
+		AchievementItemTitleLarge	[!$OSX]
 		{
 			"1"
 			{
@@ -249,7 +249,7 @@ Scheme
 			}
 		}
 
-		AchievementItemDescription	[$WIN32]
+		AchievementItemDescription	[!$OSX]
 		{
 			"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/_tf2/resource/ui/hudarenaplayercount.res b/_tf2/resource/ui/hudarenaplayercount.res
@@ -4,8 +4,8 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"blueteam"
-		"xpos"			"c-30"
-		"ypos"			"0"
+		"xpos"			"c-57"
+		"ypos"			"28"
 		"zpos"			"0"
 		"wide"			"60"
 		"tall"			"30"
@@ -90,8 +90,8 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"redteam"
-		"xpos"			"c-30"
-		"ypos"			"21"
+		"xpos"			"c-3"
+		"ypos"			"28"
 		"zpos"			"0"
 		"wide"			"60"
 		"tall"			"30"