Merge pull request #173 from raysfire/dev

v2021.0705

1 files changed, 3 insertions, 173 deletions

diff --git a/resource/ui/spectator.res b/resource/ui/spectator.res
index 2ea9a8d..93e1551 100644
--- a/resource/ui/spectator.res
+++ b/resource/ui/spectator.res
@@ -1,173 +1,3 @@
-#base "hudinspectpanel.res"
-
-"Resource/UI/Spectator.res"
-{
-	"Spectator"
-	{
-		"ControlName"	"Frame"
-		"fieldName"		"Spectator"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-	}
-
-	"specgui" { }
-
-	"topbar"
-	{
-		"ControlName"	"Panel"
-		"fieldName"		"TopBar"
-		"xpos"			"0"
-		"ypos"			"0"
-		"tall"			"0"
-		"wide"			"f0"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-	}
-
-	"BottomBar"
-	{
-		"ControlName"	"Frame"
-		"fieldName"		"BottomBar"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"		"0"
-		"enabled"		"0"
-	}
-
-	"bottombarblank"
-	{
-		"ControlName"	"Panel"
-		"fieldName"		"bottombarblank"
-		"xpos"			"0"
-		"ypos"			"r0"
-		"tall"			"0"
-		"wide"			"f0"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-	}
-
-	"ReinforcementsLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ReinforcementsLabel"
-		"xpos"			"0"
-		"ypos"			"50"
-		"wide"			"f0"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#game_respawntime_in_secs"
-		"textAlignment"	"center"
-		"font"			"HudFontMedium"
-
-		if_mvm
-		{
-			"ypos"		"90"
-		}
-	}
-
-	"BuyBackLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"BuyBackLabel"
-		"xpos"			"0"
-		"ypos"			"110"
-		"wide"			"f0"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"labelText"		"#TF_PVE_Buyback"
-		"textAlignment"	"center"
-		"font"			"HudFontSmall"
-
-		if_mvm
-		{
-			"visible"		"1"
-		}
-	}
-
-	"MapLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"MapLabel"
-		"xpos"			"9999"
-	}
-	"ClassOrTeamLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ClassOrTeamLabel"
-		"xpos"			"9999"
-	}
-	"SwitchCamModeKeyLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"SwitchCamModeKeyLabel"
-		"xpos"			"9999"
-	}
-	"SwitchCamModeLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"SwitchCamModeLabel"
-		"xpos"			"9999"
-	}
-	"CycleTargetFwdKeyLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CycleTargetFwdKeyLabel"
-		"xpos"			"9999"
-	}
-	"CycleTargetFwdLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CycleTargetFwdLabel"
-		"xpos"			"9999"
-	}
-	"CycleTargetRevKeyLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CycleTargetRevKeyLabel"
-		"xpos"			"9999"
-	}
-	"CycleTargetRevLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CycleTargetRevLabel"
-		"xpos"			"9999"
-	}
-	"TipLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TipLabel"
-		"xpos"			"9999"
-	}
-
-	"spectator_extras"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"spectator_extras"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-	}
-}
\ No newline at end of file
+"#base" "hudinspectpanel.res"
+"#base" "../../#customizations/streamermode/spectator.res"
+"#base" "spectator-base.res"
\ No newline at end of file