Merge pull request #173 from raysfire/dev

v2021.0705

1 files changed, 31 insertions, 183 deletions

diff --git a/resource/ui/spectatortournament.res b/resource/ui/spectatortournament.res
index 3c89ef1..aecdc24 100644
--- a/resource/ui/spectatortournament.res
+++ b/resource/ui/spectatortournament.res
@@ -65,42 +65,11 @@
 				"proportionaltoparent"	"1"
 			}
 
-			"LoadoutIconsActiveItemRed"
-			{
-				"ControlName"		"ImagePanel"
-				"fieldName"			"LoadoutIconsActiveItemRed"
-				"xpos"				"135"
-				"ypos"				"3"
-				"zpos"				"200"
-				"wide"				"24"
-				"tall"				"11"
-				"visible"			"1"
-				"enabled"			"1"
-				"scaleImage"		"1"
-				"proportionalToParent"	"1"
-				//fillcolor_override 	"255 0 0 32"
-			}
-			"LoadoutIconsActiveItemBlue"
-			{
-				"ControlName"		"ImagePanel"
-				"fieldName"			"LoadoutIconsActiveItemBlue"
-				"xpos"				"135"
-				"ypos"				"3"
-				"zpos"				"200"
-				"wide"				"24"
-				"tall"				"11"
-				"visible"			"1"
-				"enabled"			"1"
-				"scaleImage"		"1"
-				"proportionalToParent"	"1"
-				//fillcolor_override 	"255 0 0 32"
-			}
-
 			"StatusEffectIconRed"
 			{
 				"ControlName"			"ImagePanel"
 				"fieldName"				"StatusEffectIconRed"
-				"xpos"					"27"
+				"xpos"					"29"
 				"ypos"					"1"
 				"zpos"					"200"
 				"wide"					"14"
@@ -116,8 +85,8 @@
 			{
 				"ControlName"			"ImagePanel"
 				"fieldName"				"StatusEffectIconBlue"
-				"xpos"					"27"
-				"ypos"					"1"
+				"xpos"					"29"
+				"ypos"					"2"
 				"zpos"					"200"
 				"wide"					"14"
 				"tall"					"14"
@@ -137,8 +106,6 @@
 				"zpos"				"-1"
 				"wide"				"52"
 				"tall"				"18"
-				"autoResize"		"0"
-				"pinCorner"			"0"
 				"visible"			"1"
 				"enabled"			"1"
 				"fillcolor"			"15 15 15 64"
@@ -153,8 +120,6 @@
 				"zpos"				"-1"
 				"wide"				"49"
 				"tall"				"18"
-				"autoResize"		"0"
-				"pinCorner"			"0"
 				"visible"			"1"
 				"enabled"			"1"
 				"fillcolor"			"15 15 15 128"
@@ -169,8 +134,6 @@
 				"zpos"				"-1"
 				"wide"				"26"
 				"tall"				"18"
-				"autoResize"		"0"
-				"pinCorner"			"0"
 				"visible"			"1"
 				"enabled"			"1"
 				"fillcolor"			"15 15 15 110"
@@ -182,7 +145,7 @@
 				"fieldName"			"PanelFull"
 				"xpos"				"0"
 				"ypos"				"0"
-				"zpos"				"-1"
+				"zpos"				"0"
 				"wide"				"160"
 				"tall"				"18"
 				"autoResize"		"0"
@@ -192,38 +155,6 @@
 				"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"
-			}
-
-			"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"
-			}
-
 			"playername"
 			{
 				"ControlName"		"CExLabel"
@@ -234,8 +165,6 @@
 				"zpos"				"5"
 				"wide"				"80"
 				"tall"				"16"
-				"autoResize"		"0"
-				"pinCorner"			"0"
 				"visible"			"1"
 				"labelText"			"%playername%"
 				"textAlignment"		"west"
@@ -249,13 +178,13 @@
 				"xpos"				"0"
 				"ypos"				"0"
 				"zpos"				"3"
-				"wide"				"26"
-				"tall"				"17"
-				"HealthBonusPosAdj"			"10"
-				"HealthDeathWarning"		"0.49"
+				"wide"				"f0"
+				"tall"				"f0"
+				"bgcolor_override"			"Transparent"
+				"proportionaltoparent"		"1"
+				"HealthBonusPosAdj"			"-240"
+				"HealthDeathWarning"		"1.001"
 				"HealthDeathWarningColor"	"HUDDeathWarning"
-				"TFFont" 					"HudFontSmallest"
-				"TextColor" 				"HudOffWhite"
 			}
 
 			"PanelBG"
@@ -264,50 +193,45 @@
 				"fieldName"			"PanelBG"
 				"xpos"				"0"
 				"ypos"				"0"
-				"zpos"				"-1"
+				"zpos"				"0"
 				"wide"				"160"
-				"tall"				"0"
-				"autoResize"		"0"
-				"pinCorner"			"0"
-				"visible"			"1"
-				"enabled"			"1"
+				"tall"				"22"
 				"fillcolor"			"15 15 15 50"
+				"proportionaltoparent"	"1"
 			}
-
+			
 			"respawntime"
 			{
 				"ControlName"		"CExLabel"
 				"fieldName"			"respawntime"
-				"font"				"HudFontSmallest"
-				"xpos"				"5"
-				"ypos"				"3"
+				"xpos"				"0"
+				"ypos"				"0"
 				"zpos"				"5"
-				"wide"				"23"
-				"tall"				"10"
-				"autoResize"		"0"
-				"pinCorner"			"0"
+				"wide"				"26"
+				"tall"				"18"
+				"font"				"HudFontSmallest"
+				"fgcolor"			"ColorMagenta"
 				"visible"			"1"
+				"textAlignment"		"center"
 				"labelText"			"%respawntime%"
-				"textAlignment"		"west"
-				"fgcolor"			"255 20 175 255"
+				"proportionaltoparent"	"1"
 			}
 
-			"respawntimeBG"
+			"respawntimeShadow"
 			{
 				"ControlName"		"CExLabel"
-				"fieldName"			"respawntimeBG"
+				"fieldName"			"respawntimeShadow"
 				"font"				"HudFontSmallest"
-				"xpos"				"6"
-				"ypos"				"4"
-				"zpos"				"5"
-				"wide"				"23"
-				"tall"				"10"
-				"autoResize"		"0"
-				"pinCorner"			"0"
+				"xpos"				"-1"
+				"ypos"				"-2"
+				"zpos"				"4"
+				"wide"				"26"
+				"tall"				"18"
 				"visible"			"1"
 				"labelText"			"%respawntime%"
-				"textAlignment"		"west"
+				"textAlignment"		"center"
 				"fgcolor"			"TransparentBlack"
+				"pin_to_sibling"	"respawntime"
 			}
 
 			"ReadyBG"
@@ -347,25 +271,6 @@
 				"textAlignment"		"east"
 				"fgcolor"			"0 255 255 255"
 			}
-
-			"chargeamountBG"
-			{
-				"ControlName"		"CExLabel"
-				"fieldName"			"chargeamountBG"
-				"font"				"HudFontSmallest"
-				"xpos"				"-1"
-				"ypos"				"-1"
-				"zpos"				"6"
-				"wide"				"25"
-				"tall"				"13"
-				"autoResize"		"0"
-				"pinCorner"			"0"
-				"visible"			"1"
-				"labelText"			"%chargeamount%"
-				"textAlignment"		"east"
-				"fgcolor"			"TransparentBlack"
-				"pin_to_sibling"	"chargeamount"
-			}
 		}
 	}
 
@@ -451,61 +356,4 @@
 		"fieldName"		"CycleTargetRevKeyLabel"
 		"visible"		"0"
 	}
-
-	"itempanel"
-	{
-		"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"
-
-		"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"
-
-		"itemmodelpanel"
-		{
-			"fieldName"				"itemmodelpanel"
-			"use_item_rendertarget" "0"
-			"useparentbg"			"1"
-			"inventory_image_type"	"1"
-		}
-
-		"ItemLabel"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ItemLabel"
-			"font"			"HudFontSmallest"
-			"xpos"			"10"
-			"ypos"			"3"
-			"zpos"			"1"
-			"wide"			"270"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#FreezePanel_Item"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-	}
 }
\ No newline at end of file