Merge pull request #173 from raysfire/dev

v2021.0705

1 files changed, 2 insertions, 169 deletions

diff --git a/resource/ui/disguisestatuspanel.res b/resource/ui/disguisestatuspanel.res
index 773fb15..9937824 100644
--- a/resource/ui/disguisestatuspanel.res
+++ b/resource/ui/disguisestatuspanel.res
@@ -1,169 +1,2 @@
-"Resource/UI/ItemModelPanel.res"
-{
-	"itemmodelpanel"
-	{
-		"ControlName"		"CEmbeddedItemModelPanel"
-		"fieldName"			"itemmodelpanel"
-		"xpos"				"0"
-		"ypos"				"0"
-		"zpos"				"1"
-		"wide"				"100"
-		"tall"				"100"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"useparentbg"		"1"
-		"fov"				"54"
-		"start_framed"		"1"
-		"disable_manipulation"	"1"
-
-		"model"
-		{
-			"angles_x"		"10"
-			"angles_y"		"130"
-			"angles_z"		"0"
-		}
-	}
-
-	"ShadedBar"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"ShadedBar"
-		"xpos"				"0"
-		"ypos"				"0"
-		"zpos"				"0"
-		"wide"				"150"
-		"tall"				"30"
-		"visible"			"1"
-		"enabled"			"1"
-		"bgcolor_override"	"TransparentBlack"
-		"PaintBackgroundType"	"0"
-	}
-
-	"DisguiseStatusBG"
-	{
-		"ControlName"		"CTFImagePanel"
-		"fieldName"			"DisguiseStatusBG"
-		"xpos"				"30"
-		"ypos"				"0"
-		"zpos"				"0"
-		"wide"				"150"
-		"tall"				"15"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"image"				"../hud/color_panel_brown"
-		"scaleImage"		"1"
-		"teambg_1"			"../hud/color_panel_brown"
-		"teambg_2"			"../hud/color_panel_red"
-		"teambg_3"			"../hud/color_panel_blu"
-
-		"src_corner_height"		"23"
-		"src_corner_width"		"23"
-		"draw_corner_width"		"0"
-		"draw_corner_height" 	"0"
-	}
-
-	"DisguiseNameLabel"
-	{
-		"ControlName"		"Label"
-		"fieldName"			"DisguiseNameLabel"
-		"font"				"HudFontSmall"
-		"xpos"				"35"
-		"ypos"				"0"
-		"zpos"				"1"
-		"wide"				"115"
-		"tall"				"15"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"labelText"			"%disguisename%"
-		"textAlignment"		"west"
-		"dulltext"			"0"
-		"brighttext"		"0"
-	}
-
-	"DisguiseNameLabelShadow"
-	{
-		"ControlName"		"Label"
-		"fieldName"			"DisguiseNameLabelShadow"
-		"font"				"HudFontSmall"
-		"xpos"				"-1"
-		"ypos"				"-1"
-		"zpos"				"1"
-		"wide"				"115"
-		"tall"				"15"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"0"
-		"enabled"			"0"
-		"labelText"			"%disguisename%"
-		"textAlignment"		"west"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"fgcolor_override"	"TransparentBlack"
-		"pin_to_sibling"	"DisguiseNameLabel"
-	}
-
-	"WeaponNameLabel"
-	{
-		"ControlName"		"Label"
-		"fieldName"			"WeaponNameLabel"
-		"font"				"HudFontSmallest"
-		"xpos"				"35"
-		"ypos"				"15"
-		"zpos"				"1"
-		"wide"				"115"
-		"tall"				"15"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"labelText"			"%weaponname%"
-		"textAlignment"		"west"
-		"dulltext"			"0"
-		"brighttext"		"0"
-	}
-	"WeaponNameLabelShadow"
-	{
-		"ControlName"		"Label"
-		"fieldName"			"WeaponNameLabelShadow"
-		"font"				"HudFontSmallest"
-		"xpos"				"-1"
-		"ypos"				"-1"
-		"zpos"				"1"
-		"wide"				"115"
-		"tall"				"15"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"0"
-		"enabled"			"0"
-		"labelText"			"%weaponname%"
-		"textAlignment"		"west"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"fgcolor_override"	"TransparentBlack"
-		"pin_to_sibling"	"WeaponNameLabel"
-	}
-
-	"SpectatorGUIHealth"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"SpectatorGUIHealth"
-		"xpos"				"-7"
-		"ypos"				"-10"
-		"zpos"				"1"
-		"wide"				"37"
-		"tall"				"50"
-		"visible"			"1"
-		"enabled"			"1"
-		"HealthBonusPosAdj"	"10"
-		"HealthDeathWarning"		"0.49"
-		"TFFont"					"HudFontSmall"
-		"HealthDeathWarningColor"	"HUDDeathWarning"
-		"TextColor"					"HudOffWhite"
-	}
-}
\ No newline at end of file
+"#base" "../../#customizations/streamermode/disguisestatuspanel.res"
+"#base" "disguisestatuspanel-base.res"
\ No newline at end of file