Merge pull request #82 from TechnoSL/master

added closed captions + some consistency changes
Vexcenot · Aug 19, 2023 · 5f88869 · 5f88869
2 parents a27e96c + b301019
commit 5f88869
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 51 deletions.
diff --git a/#customizations/Health&Ammo Positions/Centered (Default)/scripts/hudlayout.res b/#customizations/Health&Ammo Positions/Centered (Default)/scripts/hudlayout.res
@@ -526,20 +526,16 @@
 	}
 	"HudCloseCaption"
 	{
-		"fieldName"				"HudCloseCaption"
-		"visible"				"1"
-		"enabled"				"1"
-		"xpos"					"c-250"
-		"ypos"					"276" [$WIN32]
-		"ypos"					"236" [$X360]
-		"wide"					"500"
-		"tall"					"136" [$WIN32]
-		"tall"					"176" [$X360]
-		"BgAlpha"				"128"
-		"GrowTime"				"0.25"
-		"ItemHiddenTime"		"0.2"
-		"ItemFadeInTime"		"0.15"
-		"ItemFadeOutTime"		"0.3"
+		"xpos"					"c-400"
+		"xpos_minmode"			"c-35"
+		"ypos"					"r95"
+		"wide"					"150"
+		"tall"					"50"
+		"BgAlpha"				"64"
+		"GrowTime"				"0"
+		"ItemHiddenTime"		"0"
+		"ItemFadeInTime"		"0"
+		"ItemFadeOutTime"		"0.2"
 		"topoffset"				"0"
 	}
 	"HudHistoryResource"

diff --git a/#customizations/Health&Ammo Positions/TF2 Style (Corners)/scripts/hudlayout.res b/#customizations/Health&Ammo Positions/TF2 Style (Corners)/scripts/hudlayout.res
@@ -524,20 +524,16 @@
 	}
 	"HudCloseCaption"
 	{
-		"fieldName"				"HudCloseCaption"
-		"visible"				"1"
-		"enabled"				"1"
-		"xpos"					"c-250"
-		"ypos"					"276" [$WIN32]
-		"ypos"					"236" [$X360]
-		"wide"					"500"
-		"tall"					"136" [$WIN32]
-		"tall"					"176" [$X360]
-		"BgAlpha"				"128"
-		"GrowTime"				"0.25"
-		"ItemHiddenTime"		"0.2"
-		"ItemFadeInTime"		"0.15"
-		"ItemFadeOutTime"		"0.3"
+		"xpos"					"c-200"
+		"xpos_minmode"			"c-35"
+		"ypos"					"r95"
+		"wide"					"150"
+		"tall"					"50"
+		"BgAlpha"				"64"
+		"GrowTime"				"0"
+		"ItemHiddenTime"		"0"
+		"ItemFadeInTime"		"0"
+		"ItemFadeOutTime"		"0.2"
 		"topoffset"				"0"
 	}
 	"HudHistoryResource"

diff --git a/resource/clientscheme_VEXCENOT is BASED CENTER NEWrrr.res b/resource/clientscheme_VEXCENOT is BASED CENTER NEWrrr.res
@@ -561,7 +561,7 @@
 				"weight"		"0"
 			}
 		}
-		"HudFontMediumOutline"
+		"HudFontMediumShadow"
 		{
 			"1"
 			{
@@ -570,9 +570,9 @@
 				"wide"				"23"
 				"tall_lodef"		"28"
 				"weight"			"500"
-				"additive"			"0"
-				"antialias"			"0"
-				"outline"			"1"
+				"additive"			"1"
+				"antialias"			"1"
+				"dropshadow"		"1"
 			}
 		}
 		"TFFontSmall"

diff --git a/resource/closecaption_english.dat b/resource/closecaption_english.dat
diff --git a/resource/ui/hudhealthaccount.res b/resource/ui/hudhealthaccount.res
@@ -4,13 +4,13 @@
     {
         "fieldName"             "CHealthAccountPanel"
         "delta_item_x"          "0"
-		"wide"                  "5000"
-		"tall"                  "5000"
+		"wide"                  "f0"
+		"tall"                  "f0"
         "delta_item_start_y"    "50"
         "delta_item_end_y"      "0"
         "PositiveColor"         "0 253 31 255"
         "NegativeColor"         "254 190 16 255"
         "delta_lifetime"        "1.5"
-        "delta_item_font"       "HudFontMediumOutline"
+        "delta_item_font"       "HudFontMediumShadow"
     }
-}
+}
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
@@ -526,21 +526,17 @@
 	}
 	"HudCloseCaption"
 	{
-		"fieldName"				"HudCloseCaption"
-		"visible"				"1"
-		"enabled"				"1"
-		"xpos"					"c-250"
-		"ypos"					"276" [$WIN32]
-		"ypos"					"236" [$X360]
-		"wide"					"500"
-		"tall"					"136" [$WIN32]
-		"tall"					"176" [$X360]
-		"BgAlpha"				"128"
-		"GrowTime"				"0.25"
-		"ItemHiddenTime"		"0.2"
-		"ItemFadeInTime"		"0.15"
-		"ItemFadeOutTime"		"0.3"
-		"topoffset"				"0"
+		"xpos"										"c-400"
+		"xpos_minmode"								"c-35"
+		"ypos"										"r95"
+		"wide"										"150"
+		"tall"										"50"
+		"BgAlpha"									"64"
+		"GrowTime"									"0"
+		"ItemHiddenTime"							"0"
+		"ItemFadeInTime"							"0"
+		"ItemFadeOutTime"							"0.2"
+		"topoffset"									"0"
 	}
 	"HudHistoryResource"
 	{