Spectator Overhaul

Redid the spectator ui
mattr0d · Sep 8, 2015 · 1ece353 · 1ece353
1 parent 68fd8db
commit 1ece353
Show file tree

Hide file tree

Showing 17 changed files with 248 additions and 295 deletions.
diff --git a/resource/ClientScheme.res b/resource/ClientScheme.res
@@ -3039,8 +3039,8 @@ Scheme
 			"image"					"../hud/color_panel_brown"
 			"src_corner_height"		"23"				// pixels inside the image
 			"src_corner_width"		"23"
-			"draw_corner_width"		"5"				// screen size of the corners ( and sides ), proportional
-			"draw_corner_height" 	"5"	
+			"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height" 	"0"	
 		}
 		TFFatLineBorderRedBGOpaque
 		{
@@ -3072,8 +3072,8 @@ Scheme
 			"image"					"../hud/color_panel_red"
 			"src_corner_height"		"23"				// pixels inside the image
 			"src_corner_width"		"23"
-			"draw_corner_width"		"5"				// screen size of the corners ( and sides ), proportional
-			"draw_corner_height" 	"5"	
+			"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height" 	"0"	
 		}
 		TFFatLineBorderBlueBG
 		{
@@ -3083,8 +3083,8 @@ Scheme
 			"image"					"../hud/color_panel_blu"
 			"src_corner_height"		"23"				// pixels inside the image
 			"src_corner_width"		"23"
-			"draw_corner_width"		"5"				// screen size of the corners ( and sides ), proportional
-			"draw_corner_height" 	"5"	
+			"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height" 	"0"	
 		}
 
 		ToolTipBorder

diff --git a/resource/ui/HudItemEffectMeter.res b/resource/ui/HudItemEffectMeter.res
@@ -24,24 +24,24 @@
 
 	"ItemEffectMeterLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ItemEffectMeterLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"27"
-		"ypos"			"35"
-		"zpos"			"6"
-		"wide"			"41"
-		"tall"			"15"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"5"
-		"labelText"		"#TF_Ball"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"fgcolor" 	"0 0 0 255"
+		"ControlName"		"CExLabel"
+		"fieldName"			"ItemEffectMeterLabel"
+		"font"				"FontStorePrice"
+		"xpos"				"10"
+		"ypos"				"25"
+		"zpos"				"6"
+		"wide"				"50"
+		"tall"				"8"
+		"autoResize"		"1"
+		"pinCorner"			"2"
+		"visible"			"0"
+		"enabled"			"1"
+		"tabPosition"		"5"
+		"labelText"			"#TF_ENERGYDRINK"
+		"textAlignment"		"center"
+		"dulltext"			"0"
+		"brighttext"		"1"
+		"fgcolor_override"	"0 0 0 255"
 	}
 
 	"ItemEffectMeter"
@@ -55,6 +55,5 @@
 		"ypos"			"25"	
 		"wide"			"50"
 		"tall"			"8"			
-
 	}	
 }
diff --git a/resource/ui/HudItemEffectMeter_Cleaver.res b/resource/ui/HudItemEffectMeter_Cleaver.res
@@ -25,24 +25,24 @@
 
 	"ItemEffectMeterLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ItemEffectMeterLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"27"
-		"ypos"			"35"
-		"zpos"			"6"
-		"wide"			"41"
-		"tall"			"15"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"5"
-		"labelText"		"#TF_Ball"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"fgcolor" 			"0 0 0 255"
+		"ControlName"		"CExLabel"
+		"fieldName"			"ItemEffectMeterLabel"
+		"font"				"FontStorePrice"
+		"xpos"				"10"
+		"ypos"				"25"
+		"zpos"				"6"
+		"wide"				"50"
+		"tall"				"8"
+		"autoResize"		"1"
+		"pinCorner"			"2"
+		"visible"			"0"
+		"enabled"			"1"
+		"tabPosition"		"5"
+		"labelText"			"#TF_ENERGYDRINK"
+		"textAlignment"		"center"
+		"dulltext"			"0"
+		"brighttext"		"1"
+		"fgcolor_override"	"0 0 0 255"
 	}
 
 	"ItemEffectMeter"
@@ -58,18 +58,4 @@
 		"tall"			"8"			
 
 	}
-
-	"ChargeMark_Cola"
-	{
-		"controlName"	"ImagePanel"
-		"fieldName"		"ChargeMark_Cola"
-		"xpos"			"25"
-		"ypos"			"25"
-		"zpos"			"4"
-		"wide"			"1"
-		"tall"			"8"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"0 0 0 255"
-	}
 }
diff --git a/resource/ui/HudItemEffectMeter_Heavy.res b/resource/ui/HudItemEffectMeter_Heavy.res
@@ -25,24 +25,24 @@
 
 	"ItemEffectMeterLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ItemEffectMeterLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"27"
-		"ypos"			"35"
-		"zpos"			"6"
-		"wide"			"41"
-		"tall"			"15"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"5"
-		"labelText"		"#TF_Ball"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"fgcolor" 			"0 0 0 255"
+		"ControlName"		"CExLabel"
+		"fieldName"			"ItemEffectMeterLabel"
+		"font"				"FontStorePrice"
+		"xpos"				"10"
+		"ypos"				"25"
+		"zpos"				"6"
+		"wide"				"50"
+		"tall"				"8"
+		"autoResize"		"1"
+		"pinCorner"			"2"
+		"visible"			"0"
+		"enabled"			"1"
+		"tabPosition"		"5"
+		"labelText"			"#TF_ENERGYDRINK"
+		"textAlignment"		"center"
+		"dulltext"			"0"
+		"brighttext"		"1"
+		"fgcolor_override"	"0 0 0 255"
 	}
 
 	"ItemEffectMeter"
@@ -54,22 +54,8 @@
 		"zpos"			"2"		
 		"xpos"			"10"		
 		"ypos"			"25"	
-		"wide"			"55"
+		"wide"			"50"
 		"tall"			"8"			
 
 	}
-
-	"ChargeMark_Cola"
-	{
-		"controlName"	"ImagePanel"
-		"fieldName"		"ChargeMark_Cola"
-		"xpos"			"25"
-		"ypos"			"25"
-		"zpos"			"4"
-		"wide"			"1"
-		"tall"			"8"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"0 0 0 255"
-	}
 }
diff --git a/resource/ui/HudItemEffectMeter_ParticleCannon.res b/resource/ui/HudItemEffectMeter_ParticleCannon.res
@@ -24,24 +24,24 @@
 
 	"ItemEffectMeterLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ItemEffectMeterLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"27"
-		"ypos"			"35"
-		"zpos"			"6"
-		"wide"			"41"
-		"tall"			"15"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"5"
-		"labelText"		"#TF_Ball"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"fgcolor" 		"0 0 0 255"
+		"ControlName"		"CExLabel"
+		"fieldName"			"ItemEffectMeterLabel"
+		"font"				"FontStorePrice"
+		"xpos"				"10"
+		"ypos"				"25"
+		"zpos"				"6"
+		"wide"				"50"
+		"tall"				"8"
+		"autoResize"		"1"
+		"pinCorner"			"2"
+		"visible"			"0"
+		"enabled"			"1"
+		"tabPosition"		"5"
+		"labelText"			"#TF_ENERGYDRINK"
+		"textAlignment"		"center"
+		"dulltext"			"0"
+		"brighttext"		"1"
+		"fgcolor_override"	"0 0 0 255"
 	}
 
 	"ItemEffectMeter"

diff --git a/resource/ui/HudItemEffectMeter_Pomson.res b/resource/ui/HudItemEffectMeter_Pomson.res
@@ -24,24 +24,24 @@
 
 	"ItemEffectMeterLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ItemEffectMeterLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"27"
-		"ypos"			"35"
-		"zpos"			"6"
-		"wide"			"41"
-		"tall"			"15"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"5"
-		"labelText"		"#TF_ENERGYDRINK"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"fgcolor" 			"0 0 0 255"
+		"ControlName"		"CExLabel"
+		"fieldName"			"ItemEffectMeterLabel"
+		"font"				"FontStorePrice"
+		"xpos"				"10"
+		"ypos"				"25"
+		"zpos"				"6"
+		"wide"				"50"
+		"tall"				"8"
+		"autoResize"		"1"
+		"pinCorner"			"2"
+		"visible"			"0"
+		"enabled"			"1"
+		"tabPosition"		"5"
+		"labelText"			"#TF_ENERGYDRINK"
+		"textAlignment"		"center"
+		"dulltext"			"0"
+		"brighttext"		"1"
+		"fgcolor_override"	"0 0 0 255"
 	}
 
 	"ItemEffectMeter"

diff --git a/resource/ui/HudItemEffectMeter_Raygun.res b/resource/ui/HudItemEffectMeter_Raygun.res
@@ -24,26 +24,26 @@
 
 	"ItemEffectMeterLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ItemEffectMeterLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"27"
-		"ypos"			"35"
-		"zpos"			"6"
-		"wide"			"41"
-		"tall"			"15"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"5"
-		"labelText"		"#TF_Ball"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"fgcolor" 			"0 0 0 255"
+		"ControlName"		"CExLabel"
+		"fieldName"			"ItemEffectMeterLabel"
+		"font"				"FontStorePrice"
+		"xpos"				"10"
+		"ypos"				"25"
+		"zpos"				"6"
+		"wide"				"50"
+		"tall"				"8"
+		"autoResize"		"1"
+		"pinCorner"			"2"
+		"visible"			"0"
+		"enabled"			"1"
+		"tabPosition"		"5"
+		"labelText"			"#TF_ENERGYDRINK"
+		"textAlignment"		"center"
+		"dulltext"			"0"
+		"brighttext"		"1"
+		"fgcolor_override"	"0 0 0 255"
 	}
-
+	
 	"ItemEffectMeter"
 	{		
 		"ControlName"	"ContinuousProgressBar"

diff --git a/resource/ui/HudItemEffectMeter_Sapper.res b/resource/ui/HudItemEffectMeter_Sapper.res
@@ -24,24 +24,24 @@
 
 	"ItemEffectMeterLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ItemEffectMeterLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"27"
-		"ypos"			"35"
-		"zpos"			"6"
-		"wide"			"41"
-		"tall"			"15"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"5"
-		"labelText"		"#TF_ENERGYDRINK"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"fgcolor" 			"0 0 0 255"
+		"ControlName"		"CExLabel"
+		"fieldName"			"ItemEffectMeterLabel"
+		"font"				"FontStorePrice"
+		"xpos"				"10"
+		"ypos"				"25"
+		"zpos"				"6"
+		"wide"				"50"
+		"tall"				"8"
+		"autoResize"		"1"
+		"pinCorner"			"2"
+		"visible"			"0"
+		"enabled"			"1"
+		"tabPosition"		"5"
+		"labelText"			"#TF_ENERGYDRINK"
+		"textAlignment"		"center"
+		"dulltext"			"0"
+		"brighttext"		"1"
+		"fgcolor_override"	"0 0 0 255"
 	}
 
 	"ItemEffectMeter"