Bumped version number

- Centered the class selection text to fix overlaps in 1440p. - Moved the position of the sticky counter on the cornered layout. - Bumped version number.
CriticalFlaw · Dec 14, 2022 · df77a67 · df77a67
1 parent 07be851
commit df77a67
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 31 deletions.
diff --git a/resource/ui/classselection.res b/resource/ui/classselection.res
@@ -37,11 +37,10 @@
 		"enabled"					"1"
 		"tabPosition"				"0"
 		"labelText"					"#TF_Scout"
-		"textAlignment"				"west"
+		"textAlignment"				"center"
 		"Command"					"joinclass scout"
 		"Default"					"0"
 		"font"						"FontBold20"
-		"textinsetx"				"65"
 		"paintbackground"			"1"
 
 		"defaultBgColor_override" 	"TransparentBlack"
@@ -70,7 +69,7 @@
 		"xpos"						"0"
 		"ypos"						"0"
 		"zpos"						"11"
-		"wide"						"30"
+		"wide"						"25"
 		"tall"						"25"
 		"visible"					"1"
 		"enabled"					"1"
@@ -83,6 +82,8 @@
 		"mouseinputenabled"			"0"
 		"textinsety"				"-3"
 		"pin_to_sibling"			"scout"
+		"pin_corner_to_sibling"		"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"		"PIN_TOPLEFT"
 	}
 
 	"soldier"
@@ -100,11 +101,10 @@
 		"enabled"					"1"
 		"tabPosition"				"0"
 		"labelText"					"#TF_Soldier"
-		"textAlignment"				"west"
+		"textAlignment"				"center"
 		"Command"					"joinclass soldier"
 		"Default"					"0"
 		"font"						"FontBold20"
-		"textinsetx"				"65"
 		"paintbackground"			"1"
 
 		"defaultBgColor_override" 	"TransparentBlack"
@@ -150,6 +150,8 @@
 		"mouseinputenabled"			"0"
 		"textinsety"				"-3"
 		"pin_to_sibling"			"soldier"
+		"pin_corner_to_sibling"		"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"		"PIN_TOPLEFT"
 	}
 
 	"pyro"
@@ -167,11 +169,10 @@
 		"enabled"					"1"
 		"tabPosition"				"0"
 		"labelText"					"#TF_Pyro"
-		"textAlignment"				"west"
+		"textAlignment"				"center"
 		"Command"					"joinclass pyro"
 		"Default"					"0"
 		"font"						"FontBold20"
-		"textinsetx"				"65"
 		"paintbackground"			"1"
 
 		"defaultBgColor_override" 	"TransparentBlack"
@@ -217,6 +218,8 @@
 		"mouseinputenabled"			"0"
 		"textinsety"				"-3"
 		"pin_to_sibling"			"pyro"
+		"pin_corner_to_sibling"		"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"		"PIN_TOPLEFT"
 	}
 
 	"demoman"
@@ -234,11 +237,10 @@
 		"enabled"					"1"
 		"tabPosition"				"0"
 		"labelText"					"#TF_Demoman"
-		"textAlignment"				"west"
+		"textAlignment"				"center"
 		"Command"					"joinclass demoman"
 		"Default"					"0"
 		"font"						"FontBold20"
-		"textinsetx"				"65"
 		"paintbackground"			"1"
 
 		"defaultBgColor_override" 	"TransparentBlack"
@@ -284,6 +286,8 @@
 		"mouseinputenabled"			"0"
 		"textinsety"				"-3"
 		"pin_to_sibling"			"demoman"
+		"pin_corner_to_sibling"		"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"		"PIN_TOPLEFT"
 	}
 
 	"heavyweapons"
@@ -301,11 +305,10 @@
 		"enabled"					"1"
 		"tabPosition"				"0"
 		"labelText"					"#TF_HWGuy"
-		"textAlignment"				"west"
+		"textAlignment"				"center"
 		"Command"					"joinclass heavyweapons"
 		"Default"					"0"
 		"font"						"FontBold20"
-		"textinsetx"				"65"
 		"paintbackground"			"1"
 
 		"defaultBgColor_override" 	"TransparentBlack"
@@ -351,6 +354,8 @@
 		"mouseinputenabled"			"0"
 		"textinsety"				"-3"
 		"pin_to_sibling"			"heavyweapons"
+		"pin_corner_to_sibling"		"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"		"PIN_TOPLEFT"
 	}
 
 	"engineer"
@@ -368,11 +373,10 @@
 		"enabled"					"1"
 		"tabPosition"				"0"
 		"labelText"					"#TF_Engineer"
-		"textAlignment"				"west"
+		"textAlignment"				"center"
 		"Command"					"joinclass engineer"
 		"Default"					"0"
 		"font"						"FontBold20"
-		"textinsetx"				"65"
 		"paintbackground"			"1"
 
 		"defaultBgColor_override" 	"TransparentBlack"
@@ -418,6 +422,8 @@
 		"mouseinputenabled"			"0"
 		"textinsety"				"-3"
 		"pin_to_sibling"			"engineer"
+		"pin_corner_to_sibling"		"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"		"PIN_TOPLEFT"
 	}
 
 	"medic"
@@ -435,11 +441,10 @@
 		"enabled"					"1"
 		"tabPosition"				"0"
 		"labelText"					"#TF_Medic"
-		"textAlignment"				"west"
+		"textAlignment"				"center"
 		"Command"					"joinclass medic"
 		"Default"					"0"
 		"font"						"FontBold20"
-		"textinsetx"				"65"
 		"paintbackground"			"1"
 
 		"defaultBgColor_override" 	"TransparentBlack"
@@ -485,6 +490,8 @@
 		"mouseinputenabled"			"0"
 		"textinsety"				"-3"
 		"pin_to_sibling"			"medic"
+		"pin_corner_to_sibling"		"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"		"PIN_TOPLEFT"
 	}
 
 	"sniper"
@@ -502,11 +509,10 @@
 		"enabled"					"1"
 		"tabPosition"				"0"
 		"labelText"					"#TF_Sniper"
-		"textAlignment"				"west"
+		"textAlignment"				"center"
 		"Command"					"joinclass sniper"
 		"Default"					"0"
 		"font"						"FontBold20"
-		"textinsetx"				"65"
 		"paintbackground"			"1"
 
 		"defaultBgColor_override" 	"TransparentBlack"
@@ -552,6 +558,8 @@
 		"mouseinputenabled"			"0"
 		"textinsety"				"-3"
 		"pin_to_sibling"			"sniper"
+		"pin_corner_to_sibling"		"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"		"PIN_TOPLEFT"
 	}
 
 	"spy"
@@ -569,11 +577,10 @@
 		"enabled"					"1"
 		"tabPosition"				"0"
 		"labelText"					"#TF_Spy"
-		"textAlignment"				"west"
+		"textAlignment"				"center"
 		"Command"					"joinclass spy"
 		"Default"					"0"
 		"font"						"FontBold20"
-		"textinsetx"				"65"
 		"paintbackground"			"1"
 
 		"defaultBgColor_override" 	"TransparentBlack"
@@ -619,6 +626,8 @@
 		"mouseinputenabled"			"0"
 		"textinsety"				"-3"
 		"pin_to_sibling"			"spy"
+		"pin_corner_to_sibling"		"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"		"PIN_TOPLEFT"
 	}
 
 	// I believe Valve hardcoded part of this control for some reason.

diff --git a/resource/ui/huddemomanpipes.res b/resource/ui/huddemomanpipes.res
@@ -42,8 +42,8 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"PipesPresentPanel"
-		"xpos"				"300"
-		"ypos"				"c91"
+		"xpos"				"125"
+		"ypos"				"r70"
 		"zpos"				"1"
 		"wide"				"f0"
 		"tall"				"480"
@@ -53,7 +53,7 @@
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"			"NumPipesLabel"
-			"xpos"				"-37"
+			"xpos"				"0"
 			"ypos"				"0"
 			"zpos"				"2"
 			"wide"				"18"
@@ -64,7 +64,7 @@
 			"enabled"			"1"
 			"tabPosition"		"0"
 			"labelText"			"%activepipes%"
-			"textAlignment"		"east"
+			"textAlignment"		"west"
 			"dulltext"			"0"
 			"brighttext"		"0"
 			"font"				"FontBold20"
@@ -89,7 +89,7 @@
 			"enabled"			"1"
 			"tabPosition"		"0"
 			"labelText"			"%activepipes%"
-			"textAlignment"		"east"
+			"textAlignment"		"west"
 			"dulltext"			"0"
 			"brighttext"		"0"
 			"font"				"FontBold20"
@@ -100,15 +100,15 @@
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"			"StickyIcon"
-			"xpos"				"c-13"
-			"ypos"				"21"
+			"xpos"				"0"
+			"ypos"				"0"
 			"zpos"				"20"
 			"wide"				"20"
 			"tall"				"14"
 			"visible"			"1"
 			"enabled"			"1"
 			"labelText"			"4"
-			"textAlignment"		"center"
+			"textAlignment"		"west"
 			"font"				"SmallIcons"
 			"fgcolor_override"	"TanLight"
 			"fgcolor"			"TanLight"
@@ -125,7 +125,7 @@
 			"visible"			"1"
 			"enabled"			"1"
 			"labelText"			"4"
-			"textAlignment"		"center"
+			"textAlignment"		"west"
 			"font"				"SmallIcons"
 			"fgcolor"			"Black"
 			"fgcolor_override"	"Black"

diff --git a/resource/ui/huditemeffectmeter_killstreak.res b/resource/ui/huditemeffectmeter_killstreak.res
@@ -3,7 +3,7 @@
 {
 	"HudItemEffectMeter"
 	{
-		"ypos"				"r52"
+		"ypos"				"r50"
 	}
 
 	"StreakIcon"

diff --git a/resource/ui/mainmenuoverride.res b/resource/ui/mainmenuoverride.res
@@ -279,6 +279,10 @@
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
+
+		"defaultFgColor_override" 	"TanLight"
+		"armedFgColor_override" 	"TanDark"
+		"depressedFgColor_override" "TanLight"
 
 		"pin_to_sibling"			"BGPanel1"
 		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
@@ -1283,7 +1287,7 @@
 		"ControlName"		"CExImageButton"
 		"fieldName"			"VersionLabel"
 		"font"				"FontRegular12"
-		"labelText"			"FlawHUD v2022.1112"
+		"labelText"			"FlawHUD v2022.1214"
 		"labelText_minmode"	"#FH_streamer_mode_active"
 		"xpos"				"rs1-5"
 		"ypos"				"r13"

diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
@@ -1002,7 +1002,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"xpos"				"0"
-		"ypos"				"50"
+		"ypos"				"0"
 		"wide"				"f0"
 		"tall"				"480"
 	}