Merge pull request #173 from raysfire/dev

v2021.0705

1 files changed, 2 insertions, 277 deletions

diff --git a/resource/ui/targetid.res b/resource/ui/targetid.res
index 8b2a286..127405e 100644
--- a/resource/ui/targetid.res
+++ b/resource/ui/targetid.res
@@ -1,277 +1,2 @@
-"Resource/UI/TargetID.res"
-{
-	"TargetBG"
-	{
-		"ControlName"		"ImagePanel"
-		"fieldName"			"TargetBG"
-		"xpos"				"0"
-		"ypos"				"29"
-		"zpos"				"6"
-		"wide"				"600"
-		"tall"				"19"
-		"visible"			"1"
-		"enabled"			"1"
-		"fillcolor"			"TransparentBlack"
-	}
-
-	"TargetIDBG"
-	{
-		"ControlName"		"CTFImagePanel"
-		"fieldName"			"TargetIDBG"
-		"xpos"				"0"
-		"ypos"				"48"
-		"zpos"				"1"
-		"wide"				"f0"
-		"tall"	 			"35"
-		"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"
-	}
-
-	"TargetIDBG_Spec_Blue"
-	{
-		"ControlName"		"ImagePanel"
-		"fieldName"			"TargetIDBG_Spec_Blue"
-		"xpos"				"0"
-		"ypos"				"47"
-		"zpos"				"0"
-		"wide"				"5"
-		"tall"	 			"5"
-		"visible"			"0"
-		"enabled"			"1"
-		"fillcolor"			"72 112 125 255"
-	}
-
-	"TargetIDBG_Spec_Red"
-	{
-		"ControlName"		"ImagePanel"
-		"fieldName"			"TargetIDBG_Spec_Red"
-		"xpos"				"0"
-		"ypos"				"47"
-		"zpos"				"0"
-		"wide"				"5"
-		"tall"	 			"5"
-		"visible"			"0"
-		"enabled"			"1"
-		"fillcolor"			"158 64 61 255"
-	}
-
-	"TargetNameLabel"
-	{
-		"ControlName"		"Label"
-		"fieldName"			"TargetNameLabel"
-		"font"				"HudFontMediumSmall"
-		"xpos"				"45"
-		"ypos"				"29"
-		"zpos"				"7"
-		"wide"				"300"
-		"tall"				"19"
-		"visible"			"1"
-		"enabled"			"1"
-		"labelText"			"%targetname%"
-		"textAlignment"		"west"
-	}
-
-	"TargetNameLabelShadow"
-	{
-		"ControlName"		"Label"
-		"fieldName"			"TargetNameLabelShadow"
-		"font"				"HudFontMediumSmall"
-		"xpos"				"-1"
-		"ypos"				"-1"
-		"zpos"				"1"
-		"wide"				"300"
-		"tall"				"19"
-		"visible"			"1"
-		"enabled"			"1"
-		"labelText"			"%targetname%"
-		"textAlignment"		"west"
-		"fgcolor_override"	"TransparentBlack"
-		"pin_to_sibling"	"TargetNameLabel"
-	}
-
-	"TargetDataLabel"
-	{
-		"ControlName"		"Label"
-		"fieldName"			"TargetDataLabel"
-		"font"				"HudFontSmall"
-		"xpos"				"15"
-		"ypos"				"15"
-		"zpos"				"6"
-		"wide"				"f0"
-		"tall"				"15"
-		"visible"			"1"
-		"enabled"			"1"
-		"labelText"			"%targetdata%"
-		"textAlignment"		"west"
-	}
-
-	"SpectatorGUIHealth"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"SpectatorGUIHealth"
-		"xpos"				"-2"
-		"ypos"				"14"
-		"zpos"				"10"
-		"wide"				"38"
-		"tall"				"42"
-		"visible"			"1"
-		"enabled"			"1"
-		"HealthBonusPosAdj"	"10"
-		"HealthDeathWarning"		"0.49"
-		"TFFont"					"HudFontSmall"
-		"HealthDeathWarningColor"	"HUDDeathWarning"
-		"TextColor"					"HudOffWhite"
-	}
-
-	"AmmoIcon"
-	{
-		"ControlName"		"ImagePanel"
-		"fieldName"			"AmmoIcon"
-		"xpos"				"43"
-		"ypos"				"16"
-		"zpos"				"12"
-		"wide"				"12"
-		"tall"				"12"
-		"visible"			"0"
-		"enabled"			"1"
-		"image"				"../hud/leaderboard_class_heavy"
-		"scaleImage"		"1"
-	}
-
-	"KillStreakAnchor"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"KillStreakAnchor"
-		"xpos"				"2"
-		"ypos"				"17"
-		"wide"				"8"
-		"tall"				"8"
-		"visible"			"1"
-		"enabled"			"1"
-	}
-
-	"KillStreakIcon"
-	{
-		"ControlName"		"ImagePanel"
-		"fieldName"			"KillStreakIcon"
-		"xpos"				"0"
-		"ypos"				"1"
-		"zpos"				"12"
-		"wide"				"12"
-		"tall"				"12"
-		"visible"			"0"
-		"enabled"			"1"
-		"image"				"../hud/leaderboard_streak"
-		"scaleImage"		"1"
-
-		"pin_to_sibling"		"KillStreakAnchor"
-		"pin_corner_to_sibling" "PIN_TOPRIGHT"
-		"pin_to_sibling_corner" "PIN_TOPRIGHT"
-	}
-
-	"MoveableSubPanel"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"MoveableSubPanel"
-		"xpos"				"0"
-		"ypos"				"0"
-		"zpos"				"6"
-		"wide"				"32"
-		"tall"				"36"
-		"visible"			"1"
-		"enabled"			"1"
-
-		"MoveableIconBG"
-		{
-			"ControlName"	"CIconPanel"
-			"fieldName"		"MoveableIconBG"
-			"xpos"			"9999"
-			"ypos"			"9999"
-			"zpos"			"0"
-			"wide"			"0"
-			"tall"			"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"icon"			"obj_status_alert_background_tall_nocolor"
-			"iconColor"		"TransparentBlack"
-			"scaleImage"	"1"
-		}
-
-		"MoveableIcon"
-		{
-			"ControlName"	"CIconPanel"
-			"fieldName"		"MoveableIcon"
-			"xpos"			"5"
-			"ypos"			"7"
-			"zpos"			"6"
-			"wide"			"0"
-			"tall"			"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"icon"			"obj_status_sentrygun_1"
-			"drawcolor"		"ProgressOffWhite"
-			"scaleImage"	"1"
-		}
-		"MoveableSymbolIcon"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"MoveableSymbolIcon"
-			"xpos"			"16"
-			"ypos"			"0"
-			"zpos"			"12"
-			"wide"			"16"
-			"tall"			"8"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"../hud/eng_sel_item_movable"
-			"drawcolor"		"ProgressOffWhite"
-			"scaleImage"	"1"
-		}
-
-		"MoveableKeyLabel"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"MoveableKeyLabel"
-			"font"			"HudFontSmallest"
-			"xpos"			"0"
-			"ypos"			"43"
-			"zpos"			"6"
-			"wide"			"12"
-			"tall"			"0"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		""
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-	}
-
-	"AvatarImage"
-	{
-		"ControlName"		"CAvatarImagePanel"
-		"fieldName"			"AvatarImage"
-		"xpos"				"0"
-		"ypos"				"28"
-		"zpos"				"99"
-		"wide"				"17"
-		"tall"				"17"
-		"visible"			"1"
-		"enabled"			"1"
-		"image"				""
-		"scaleImage"		"1"
-		"color_outline"		"HudTimerProgressInActive"
-	}
-}
\ No newline at end of file
+"#base" "../../#customizations/streamermode/targetid.res"
+"#base" "targetid-base.res"
\ No newline at end of file