Miscellenaous Tweaks

1 files changed, 226 insertions, 236 deletions

diff --git a/resource/ui/spectatortournament.res b/resource/ui/spectatortournament.res
index 51be4c4..309bea5 100644
--- a/resource/ui/spectatortournament.res
+++ b/resource/ui/spectatortournament.res
@@ -2,13 +2,13 @@
 {
 	"specgui"
 	{
-		"ControlName"	"Frame"
-		"fieldName"		"specgui"
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"enabled"		"1"
+		"ControlName"			"Frame"
+		"fieldName"				"specgui"
+		"wide"					"f0"
+		"tall"					"480"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"enabled"				"1"
 
 		"team1_player_base_offset_x"	"0"
 		"team1_player_base_y"			"255"
@@ -32,182 +32,216 @@
 
 			"classimage"
 			{
-				"ControlName"	"CTFClassImage"
-				"fieldName"		"classimage"
-				"xpos"			"27"
-				"ypos"			"0"
-				"zpos"			"2"
-				"wide"			"18"
-				"tall"			"18"
-				"visible"		"1"
-				"enabled"		"1"
-				"team1_image"	"../hud/class_scoutred"
-				"scaleImage"	"1"
+				"ControlName"		"CTFClassImage"
+				"fieldName"			"classimage"
+				"xpos"				"27"
+				"ypos"				"0"
+				"zpos"				"2"
+				"wide"				"18"
+				"tall"				"18"
+				"visible"			"1"
+				"enabled"			"1"
+				"image"				"../hud/class_scoutred"
+				"scaleImage"		"1"
 			}
 
 			"classimagebg"
 			{
-				"ControlName"	"Panel"
-				"fieldName"		"classimagebg"
-				"xpos"			"9999"
-				"ypos"			"9999"
-				"zpos"			"2"
-				"wide"			"9999"
-				"tall"			"9999"
-				"visible"		"0"
-				"enabled"		"1"
-				"bgcolor_override"		"Black"
+				"ControlName"		"Panel"
+				"fieldName"			"classimagebg"
+				"xpos"				"9999"
+				"ypos"				"9999"
+				"zpos"				"2"
+				"wide"				"9999"
+				"tall"				"9999"
+				"visible"			"0"
+				"enabled"			"1"
+				"bgcolor_override"	"Black"
 				"PaintBackgroundType"	"0"
 			}
 
-			"PanelBackground"
-			{
-				"ControlName" 	"ImagePanel"
-				"fieldName" 	"PanelBackground"
-				"xpos" 			"0"
-				"ypos"			"0"
-				"zpos" 			"-1"
-				"wide" 			"160"
-				"tall" 			"0"
-				"autoResize" 	"0"
-				"pinCorner"		"0"
-				"visible" 		"1"
-				"enabled" 		"1"
-				"fillcolor" 	"15 15 15 50"
-			}
-
 			"PanelLeftFringe"
 			{
-				"ControlName" 	"ImagePanel"
-				"fieldName" 	"PanelLeftFringe"
-				"xpos" 			"0"
-				"ypos"			"0"
-				"zpos" 			"-1"
-				"wide" 			"52"
-				"tall" 			"18"
-				"autoResize" 	"0"
-				"pinCorner"		"0"
-				"visible" 		"1"
-				"enabled" 		"1"
-				"fillcolor" 	"15 15 15 64"
+				"ControlName"		"ImagePanel"
+				"fieldName"			"PanelLeftFringe"
+				"xpos"				"0"
+				"ypos"				"0"
+				"zpos"				"-1"
+				"wide"				"52"
+				"tall"				"18"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"enabled"			"1"
+				"fillcolor"			"15 15 15 64"
 			}
 
 			"PanelLeftHalf"
 			{
-				"ControlName" 	"ImagePanel"
-				"fieldName" 	"PanelLeftHalf"
-				"xpos" 			"0"
-				"ypos"			"0"
-				"zpos" 			"-1"
-				"wide" 			"49"
-				"tall" 			"18"
-				"autoResize" 	"0"
-				"pinCorner"		"0"
-				"visible" 		"1"
-				"enabled" 		"1"
-				"fillcolor" 	"15 15 15 128"
+				"ControlName"		"ImagePanel"
+				"fieldName"			"PanelLeftHalf"
+				"xpos"				"0"
+				"ypos"				"0"
+				"zpos"				"-1"
+				"wide"				"49"
+				"tall"				"18"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"enabled"			"1"
+				"fillcolor"			"15 15 15 128"
 			}
 
 			"PanelLeftFull"
 			{
-				"ControlName" 	"ImagePanel"
-				"fieldName" 	"PanelLeftFull"
-				"xpos" 			"0"
-				"ypos"			"0"
-				"zpos" 			"-1"
-				"wide" 			"26"
-				"tall" 			"18"
-				"autoResize" 	"0"
-				"pinCorner"		"0"
-				"visible" 		"1"
-				"enabled" 		"1"
-				"fillcolor" 	"15 15 15 110"
+				"ControlName"		"ImagePanel"
+				"fieldName"			"PanelLeftFull"
+				"xpos"				"0"
+				"ypos"				"0"
+				"zpos"				"-1"
+				"wide"				"26"
+				"tall"				"18"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"enabled"			"1"
+				"fillcolor"			"15 15 15 110"
 			}
 
 			"PanelFull"
 			{
-				"ControlName" 	"ImagePanel"
-				"fieldName" 	"PanelFull"
-				"xpos" 			"0"
-				"ypos"			"0"
-				"zpos" 			"-1"
-				"wide" 			"160"
-				"tall" 			"18"
-				"autoResize" 	"0"
-				"pinCorner"		"0"
-				"visible" 		"1"
-				"enabled" 		"1"
-				"fillcolor" 	"15 15 15 100"
+				"ControlName"		"ImagePanel"
+				"fieldName"			"PanelFull"
+				"xpos"				"0"
+				"ypos"				"0"
+				"zpos"				"-1"
+				"wide"				"160"
+				"tall"				"18"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"enabled"			"1"
+				"fillcolor"			"15 15 15 100"
 			}
 
 			"PanelBottom"
 			{
-				"ControlName" 	"ImagePanel"
-				"fieldName" 	"PanelBottom"
-				"xpos" 			"0"
-				"ypos"			"15"
-				"zpos" 			"-1"
-				"wide" 			"160"
-				"tall" 			"4"
-				"autoResize" 	"0"
-				"pinCorner"		"0"
-				"visible" 		"0"
-				"enabled" 		"0"
-				"fillcolor" 	"15 15 15 255"
+				"ControlName"		"ImagePanel"
+				"fieldName"			"PanelBottom"
+				"xpos"				"0"
+				"ypos"				"15"
+				"zpos"				"-1"
+				"wide"				"160"
+				"tall"				"4"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"0"
+				"enabled"			"0"
+				"fillcolor"			"15 15 15 255"
 			}
 
 			"PanelRight"
 			{
-				"ControlName" 	"ImagePanel"
-				"fieldName" 	"PanelRight"
-				"xpos" 			"157"
-				"ypos"			"0"
-				"zpos" 			"-1"
-				"wide" 			"4"
-				"tall" 			"16"
-				"autoResize" 	"0"
-				"pinCorner"		"0"
-				"visible" 		"0"
-				"enabled" 		"0"
-				"fillcolor" 	"15 15 15 255"
+				"ControlName"		"ImagePanel"
+				"fieldName"			"PanelRight"
+				"xpos"				"157"
+				"ypos"				"0"
+				"zpos"				"-1"
+				"wide"				"4"
+				"tall"				"16"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"0"
+				"enabled"			"0"
+				"fillcolor"			"15 15 15 255"
 			}
 
 			"playername"
 			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"playername"
-				"font"			"Cerbetica14"
-				"xpos"			"54"
-				"ypos"			"0"
-				"zpos"			"5"
-				"wide"			"80"
-				"tall"			"16"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%playername%"
-				"textAlignment"	"west"
-				"fgcolor"		"TanLight"
+				"ControlName"		"CExLabel"
+				"fieldName"			"playername"
+				"font"				"Cerbetica14"
+				"xpos"				"54"
+				"ypos"				"0"
+				"zpos"				"5"
+				"wide"				"80"
+				"tall"				"16"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"labelText"			"%playername%"
+				"textAlignment"		"west"
+				"fgcolor"			"TanLight"
 			}
 
 			"HealthIcon"
 			{
-				"ControlName"	"EditablePanel"
-				"fieldName"		"HealthIcon"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"3"
-				"wide"			"26"
-				"tall"			"17"
-				"visible" 		"1"
-				"enabled" 		"1"
-				"HealthBonusPosAdj" 		"10"
-				"HealthDeathWarning" 		"0.49"
+				"ControlName"		"EditablePanel"
+				"fieldName"			"HealthIcon"
+				"xpos"				"0"
+				"ypos"				"0"
+				"zpos"				"3"
+				"wide"				"26"
+				"tall"				"17"
+				"HealthBonusPosAdj"			"10"
+				"HealthDeathWarning"		"0.49"
+				"HealthDeathWarningColor"	"HUDDeathWarning"
 				"TFFont" 					"HudFontSmallest"
-				"HealthDeathWarningColor" 	"HUDDeathWarning"
 				"TextColor" 				"HudOffWhite"
 			}
 
+			"PanelBG"
+			{
+				"ControlName"		"ImagePanel"
+				"fieldName"			"PanelBG"
+				"xpos"				"0"
+				"ypos"				"0"
+				"zpos"				"-1"
+				"wide"				"160"
+				"tall"				"0"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"enabled"			"1"
+				"fillcolor"			"15 15 15 50"
+			}
+
+			"respawntime"
+			{
+				"ControlName"		"CExLabel"
+				"fieldName"			"respawntime"
+				"font"				"Cerbetica12"
+				"xpos"				"5"
+				"ypos"				"3"
+				"zpos"				"5"
+				"wide"				"23"
+				"tall"				"10"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"labelText"			"%respawntime%"
+				"textAlignment"		"west"
+				"fgcolor"			"255 20 175 255"
+			}
+
+			"respawntimeBG"
+			{
+				"ControlName"		"CExLabel"
+				"fieldName"			"respawntimeBG"
+				"font"				"Cerbetica12"
+				"xpos"				"6"
+				"ypos"				"4"
+				"zpos"				"5"
+				"wide"				"23"
+				"tall"				"10"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"labelText"			"%respawntime%"
+				"textAlignment"		"west"
+				"fgcolor"			"TransparentBlack"
+			}
+
 			"ReadyBG"
 			{
 				"ControlName"		"ScalableImagePanel"
@@ -228,76 +262,40 @@
 				"visible"			"0"
 			}
 
-			"respawntime"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"respawntime"
-				"font"			"Cerbetica12"
-				"xpos"			"5"
-				"ypos"			"3"
-				"zpos"			"5"
-				"wide"			"23"
-				"tall"			"10"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%respawntime%"
-				"textAlignment"	"west"
-				"fgcolor"		"255 20 175 255"
-			}
-
-			"respawntimeBG"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"respawntimeBG"
-				"font"			"Cerbetica12"
-				"xpos"			"6"
-				"ypos"			"4"
-				"zpos"			"5"
-				"wide"			"23"
-				"tall"			"10"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%respawntime%"
-				"textAlignment"	"west"
-				"fgcolor"		"TransparentBlack"
-			}
-
 			"chargeamount"
 			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"chargeamount"
-				"font"			"Cerbetica12"
-				"xpos"			"126"
-				"ypos"			"2"
-				"zpos"			"6"
-				"wide"			"25"
-				"tall"			"13"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%chargeamount%"
-				"textAlignment"	"east"
-				"fgcolor"		"0 255 255 255"
+				"ControlName"		"CExLabel"
+				"fieldName"			"chargeamount"
+				"font"				"Cerbetica12"
+				"xpos"				"126"
+				"ypos"				"2"
+				"zpos"				"6"
+				"wide"				"25"
+				"tall"				"13"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"labelText"			"%chargeamount%"
+				"textAlignment"		"east"
+				"fgcolor"			"0 255 255 255"
 			}
 
 			"chargeamountBG"
 			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"chargeamountBG"
-				"font"			"Cerbetica12"
-				"xpos"			"127"
-				"ypos"			"3"
-				"zpos"			"6"
-				"wide"			"25"
-				"tall"			"13"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%chargeamount%"
-				"textAlignment"	"east"
-				"fgcolor"		"TransparentBlack"
+				"ControlName"		"CExLabel"
+				"fieldName"			"chargeamountBG"
+				"font"				"Cerbetica12"
+				"xpos"				"127"
+				"ypos"				"3"
+				"zpos"				"6"
+				"wide"				"25"
+				"tall"				"13"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"labelText"			"%chargeamount%"
+				"textAlignment"		"east"
+				"fgcolor"			"TransparentBlack"
 			}
 		}
 	}
@@ -309,14 +307,6 @@
 		"visible"		"0"
 		"tall"			"0"
 	}
-	"BottomBar"
-	{
-		"ControlName"	"Frame"
-		"fieldName"		"BottomBar"
-		"visible"		"0"
-		"ypos"			"100"
-		"tall"			"0"
-	}
 	"bottombarblank"
 	{
 		"ControlName"	"Panel"
@@ -425,31 +415,31 @@
 	}
 	"itempanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"itempanel"
-		"xpos"			"r249"
-		"ypos"			"c50"
-		"zpos"			"10"
-		"wide"			"240"
-		"tall"			"100"
-		"visible"		"0"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"itempanel"
+		"xpos"					"r249"
+		"ypos"					"c50"
+		"zpos"					"10"
+		"wide"					"240"
+		"tall"					"100"
+		"visible"				"0"
 		"bgcolor_override"		"255 255 255 0"
 		"PaintBackgroundType"	"0"
 
-		"model_ypos"		"20"
-		"model_center_x"	"1"
-		"model_wide"		"90"
-		"model_tall"		"60"
+		"model_ypos"			"20"
+		"model_center_x"		"1"
+		"model_wide"			"90"
+		"model_tall"			"60"
 
-		"text_xpos"			"10"
-		"text_ypos"			"10"
-		"text_wide"			"220"
-		"text_center"		"1"
+		"text_xpos"				"10"
+		"text_ypos"				"10"
+		"text_wide"				"220"
+		"text_center"			"1"
 
-		"max_text_height"	"100"
-		"padding_height"	"10"
-		"resize_to_text"	"1"
-		"text_forcesize"	"2"
+		"max_text_height"		"100"
+		"padding_height"		"10"
+		"resize_to_text"		"1"
+		"text_forcesize"		"2"
 
 		"ItemBackground"
 		{
@@ -485,9 +475,9 @@
 
 		"itemmodelpanel"
 		{
-			"fieldName"		"itemmodelpanel"
-			"useparentbg"	"1"
+			"fieldName"				"itemmodelpanel"
 			"use_item_rendertarget" "0"
+			"useparentbg"			"1"
 			"inventory_image_type"	"1"
 		}