20180330 - Label Adjustments

- Fixed the objective and server timers not being positioned properly in
minmode
- Fixed the position of the casual and competitive badge level label
- Updated the size and font of the killfeed
- Updated the TargetID, added a killstreak icon
- Possibly fixed the TargetID and Cart Progress bars not being displayed
for some users

5 files changed, 37 insertions, 42 deletions

diff --git a/resource/ui/HudObjectiveTimePanel.res b/resource/ui/HudObjectiveTimePanel.res
index c514d48..3f0bde3 100644
--- a/resource/ui/HudObjectiveTimePanel.res
+++ b/resource/ui/HudObjectiveTimePanel.res
@@ -68,9 +68,7 @@
 		if_match
 		{
 			"proportionaltoparent"	"1"
-			"wide"					"36"
 			"xpos"					"37"
-			"ypos"					"22"
 			"font"					"HudFontSmallestBold"
 		}
 	}			
@@ -258,21 +256,19 @@
 		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"%servertimeleft%"
-		"textAlignment"		"center"
+		"textAlignment"	"center"
 		"dulltext"		"0"
-		"brighttext"		"0"
+		"brighttext"	"0"
 		"wrap"			"0"
-		"font"			"Cerbetica14"
+		"font"			"Cerbetica10"
 		
 		if_match
 		{
 			"proportionaltoparent"	"1"
 			"xpos"					"cs-0.5"
-			"ypos"					"17"
+			"ypos"					"22"
 			"wide"					"p1"
-			"font"					"HudFontSmallestBold"
-			"font_hidef"			"HudFontSmallestBold"
-			"font_lodef"			"HudFontSmallestBold"
+			"font"					"Cerbetica10"
 		}
 	}
 	"ServerTimeLimitLabelBG"
diff --git a/resource/ui/ObjectiveStatusEscort.res b/resource/ui/ObjectiveStatusEscort.res
index 6573b03..0bdc5f8 100644
--- a/resource/ui/ObjectiveStatusEscort.res
+++ b/resource/ui/ObjectiveStatusEscort.res
@@ -5,7 +5,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"ObjectiveStatusEscort"
 		"xpos"				"c-200"
-		"ypos"				"r150"
+		"ypos"				"330"
 		"zpos"				"1"
 		"wide"				"400"
 		"tall"				"150"
@@ -16,7 +16,7 @@
 		
 		"if_multiple_trains"
 		{
-			"ypos"				"r200"
+			"ypos"				"330"
 			"tall"				"200"
 		}
 	}
diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index 6e51c26..1d66acb 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -293,7 +293,7 @@
 
 		if_match
 		{
-			"ypos_minmode"			"0"
+			"ypos"					"0"
 			"delta_item_x"			"35"
 			"delta_item_start_y"	"12"
 			"delta_item_end_y"		"50"
@@ -326,7 +326,6 @@
 				"proportionaltoparent"	"1"
 				"xpos"			"cs-0.5"
 				"ypos"			"13"
-				"ypos_minmode"	"9"
 				"tall"			"10"
 				"font"			"HudFontSmall"
 				"font_minmode"	"HudFontSmall"
diff --git a/resource/ui/pvprankpanel.res b/resource/ui/pvprankpanel.res
index 586e8db..258cd40 100644
--- a/resource/ui/pvprankpanel.res
+++ b/resource/ui/pvprankpanel.res
@@ -250,7 +250,7 @@
 				"wide"	"f0"
 				"textAlignment"	"north-west"
 			}
-	
+			
 			"fonts"
 			{
 				"0"		"HudFontSmallestBold"
@@ -263,16 +263,16 @@
 		{
 			"ControlName"	"CAutoFittingLabel"
 			"fieldName"		"DescLine2"
-			"xpos"			"65"
-			"ypos"			"29"
-			"wide"			"195"
+			"xpos"			"0"
+			"ypos"			"32"
+			"wide"			"170"
 			"zpos"			"100"
 			"tall"			"20"
 			"visible"		"1"
 			"enabled"		"1"
 			"font"			"HudFontSmallestBold"
-			"fgcolor_override"	"TanLight"
-			"textAlignment"	"north-west"
+			"fgcolor_override"	"White"
+			"textAlignment"	"center"
 			"labelText"		"%desc2%"
 			"proportionaltoparent"	"1"
 
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index 5b72aed..d5c157a 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -7,7 +7,7 @@
 	//--------------------------------------------------------------
 	// KNUCKLESCROSSES
 	//--------------------------------------------------------------
-	KnucklesCrosses
+	"KnucklesCrosses"
 	{
 		"visible" 			"0"
 		"enabled" 			"0"
@@ -26,7 +26,7 @@
 	//--------------------------------------------------------------
 	// RAYSHUD CROSSHAIRS
 	//--------------------------------------------------------------
-	xHairCircle
+	"xHairCircle"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"xHairCircle"
@@ -44,7 +44,7 @@
 		"fgcolor"		"255 255 255 100"
 	}
 	
-	ScatterSpread
+	"ScatterSpread"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"ScatterSpread"
@@ -62,7 +62,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	BasicCross
+	"BasicCross"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"BasicCross"
@@ -79,7 +79,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	BasicCrossSmall
+	"BasicCrossSmall"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"BasicCrossSmall"
@@ -96,7 +96,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	BasicCrossLarge
+	"BasicCrossLarge"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"BasicCrossLarge"
@@ -113,7 +113,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	BasicDot
+	"BasicDot"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"BasicDot"
@@ -130,7 +130,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 
-	CircleDot
+	"CircleDot"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"CircleDot"
@@ -147,7 +147,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	ThinCircle
+	"ThinCircle"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"ThinCircle"
@@ -164,7 +164,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	WingsPlus
+	"WingsPlus"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"WingsPlus"
@@ -181,7 +181,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	Wings
+	"Wings"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"Wings"
@@ -198,7 +198,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	WingsSmallDot
+	"WingsSmallDot"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"WingsSmallDot"
@@ -215,7 +215,7 @@
 		"fgcolor"		"0 0 0 0"
 	}
 	
-	WingsSmall
+	"WingsSmall"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"WingsSmall"
@@ -232,7 +232,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	OpenCross
+	"OpenCross"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"OpenCross"
@@ -249,7 +249,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	OpenCrossDot
+	"OpenCrossDot"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"OpenCrossDot"
@@ -266,7 +266,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	ThinCross
+	"ThinCross"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"ThinCross"
@@ -283,7 +283,7 @@
 		"fgcolor"		"255 255 255 255"
 	}
 	
-	KonrWings
+	"KonrWings"
 	{
 		"controlName"	"CExLabel"
 		"fieldName"	 	"KonrWings"
@@ -920,8 +920,8 @@
 		"visible" 	"0"
 		"enabled" 	"1"
 		"xpos"		"c-100"
-		"ypos"		"c25"
-		"ypos_minmode"	"c105"
+		"ypos"		"265"
+		"ypos_minmode"	"345"
 		"zpos"		"1"
 		"wide"	 	"600"
 		"tall"	 	"45"
@@ -934,7 +934,7 @@
 		"visible" 	"0"
 		"enabled" 	"1"
 		"xpos"		"c-100"
-		"ypos"		"c25"
+		"ypos"		"270"
 		"zpos"		"1"
 		"wide"	 	"600"
 		"tall"	 	"45"
@@ -950,7 +950,7 @@
 		"visible" 	"0"
 		"enabled" 	"1"
 		"xpos" 		"c-100"
-		"ypos" 		"c65"
+		"ypos"		"305"
 		"zpos"		"1"
 		"wide" 		"600"
 		"tall" 		"45"
@@ -1141,7 +1141,7 @@
 		"visible" "1"
 		"enabled" "1"
 		"xpos"	 "r592"	[$WIN32]
-		"ypos"	 "12"	[$WIN32]
+		"ypos"	 "20"	[$WIN32]
 		"wide"	 "580"
 		"tall"	 "468"
 
@@ -1152,7 +1152,7 @@
 		"CornerRadius"	  "0"
 		"RightJustify"	  "1"	// If 1, draw notices from the right
 		
-		"TextFont"		"CerbeticaBold14"
+		"TextFont"		"CerbeticaBold12"
 		
 		"TeamBlue"		"HUDBlueTeamSolid"
 		"TeamRed"		"HUDRedTeamSolid"