Merge pull request #143 from raysfire/update

v2020.0412

2 files changed, 49 insertions, 69 deletions

diff --git a/customizations/scoreboards/scoreboard-minimal.res b/customizations/scoreboards/scoreboard-minimal.res
index c7731b6..cfde065 100644
--- a/customizations/scoreboards/scoreboard-minimal.res
+++ b/customizations/scoreboards/scoreboard-minimal.res
@@ -24,7 +24,6 @@
 	{
 		"ypos"			"304"
 	}
-	
 	"Red6sBackground"
 	{
 		"xpos"			"c65"
@@ -36,41 +35,38 @@
 		"xpos"			"c65"
 		"ypos"			"121"
 	}
-	"BlueTeamLabel1"
+	"BlueTeamName"
 	{
-		"ypos"			"273"
+		"ypos"			"279"
 	}
 	"BlueTeamScore"
 	{
-		"ypos"			"263"
+		"ypos"			"278"
 	}
 	"BlueTeamScoreDropshadow"
 	{
-		"fgcolor"		"Black"
-		"ypos"			"264"
+		"ypos"			"280"
 	}
 	"BlueTeamPlayerCount"
 	{
-		"ypos"			"257"
+		"ypos"			"265"
 	}
-	"RedTeamLabel1"
+	"RedTeamName"
 	{
-		"ypos"			"273"
+		"ypos"			"279"
 	}
 	"RedTeamScore"
 	{
-		"ypos"			"263"
+		"ypos"			"278"
 	}
 	"RedTeamScoreDropshadow"
 	{
-		"ypos"			"264"
+		"ypos"			"280"
 	}
-	
 	"RedTeamPlayerCount"
 	{
-		"ypos"			"257"
+		"ypos"			"265"
 	}
-	
 	"BluePlayerList"
 	{
 		"ypos"			"304"
diff --git a/customizations/scoreboards/scoreboard.res b/customizations/scoreboards/scoreboard.res
index 4e2f7dc..2249361 100644
--- a/customizations/scoreboards/scoreboard.res
+++ b/customizations/scoreboards/scoreboard.res
@@ -191,17 +191,17 @@
 			"visible"	"0"
 		}
 	}
-	"BlueTeamLabel1"
+	"BlueTeamName"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"BlueTeamLabel1"
+		"fieldName"		"BlueTeamName"
 		"font"			"Cerbetica32"
 		"labelText"		"%blueteamname%"
 		"textAlignment"	"west"
-		"xpos"			"c-268"
-		"ypos"			"138"
-		"wide"			"200"
-		"tall"			"37"
+		"xpos"			"c-265"
+		"ypos"			"144"
+		"wide"			"220"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -216,14 +216,14 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueTeamScore"
-		"font"			"CerbeticaBold36"
+		"font"			"CerbeticaBold32"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"	"east"
 		"xpos"			"c-106"
-		"ypos"			"128"
+		"ypos"			"143"
 		"zpos"			"4"
 		"wide"			"100"
-		"tall"			"55"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -238,15 +238,15 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueTeamScoreDropshadow"
-		"font"			"CerbeticaBold36"
+		"font"			"CerbeticaBold32"
 		"fgcolor"		"0 0 0 200"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"	"east"
-		"xpos"			"c-105"
-		"ypos"			"129"
+		"xpos"			"c-104"
+		"ypos"			"145"
 		"zpos"			"4"
 		"wide"			"100"
-		"tall"			"55"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -265,9 +265,9 @@
 		"labelText"		"%blueteamplayercount%"
 		"textAlignment"	"west"
 		"xpos"			"c-270"
-		"ypos"			"122"
+		"ypos"			"130"
 		"wide"			"100"
-		"tall"			"29"
+		"tall"			"12"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -278,17 +278,17 @@
 			"visible"	"0"
 		}
 	}
-	"RedTeamLabel1"
+	"RedTeamName"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"RedTeamLabel1"
+		"fieldName"		"RedTeamName"
 		"font"			"Cerbetica32"
 		"labelText"		"%redteamname%"
 		"textAlignment"	"east"
-		"xpos"			"c68"
-		"ypos"			"138"
-		"wide"			"200"
-		"tall"			"37"
+		"xpos"			"c45"
+		"ypos"			"144"
+		"wide"			"220"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -303,14 +303,14 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedTeamScore"
-		"font"			"CerbeticaBold36"
+		"font"			"CerbeticaBold32"
 		"labelText"		"%redteamscore%"
 		"textAlignment"	"west"
 		"xpos"			"c6"
-		"ypos"			"128"
+		"ypos"			"143"
 		"zpos"			"4"
 		"wide"			"100"
-		"tall"			"55"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -321,19 +321,20 @@
 			"visible"	"0"
 		}
 	}
+	
 	"RedTeamScoreDropshadow"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"RedTeamScoreDropshadow"
-		"font"				"CerbeticaBold36"
+		"font"				"CerbeticaBold32"
 		"fgcolor"			"0 0 0 200"
 		"labelText"			"%redteamscore%"
 		"textAlignment"		"west"
-		"xpos"				"c7"
-		"ypos"				"129"
+		"xpos"				"c8"
+		"ypos"				"145"
 		"zpos"				"4"
 		"wide"				"100"
-		"tall"				"55"
+		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -352,10 +353,10 @@
 		"font"			"Cerbetica14"
 		"labelText"		"%redteamplayercount%"
 		"textAlignment"	"east"
-		"xpos"			"c140"
-		"ypos"			"122"
-		"wide"			"130"
-		"tall"			"29"
+		"xpos"			"c170"
+		"ypos"			"130"
+		"wide"			"100"
+		"tall"			"12"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -407,10 +408,10 @@
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"BluePlayerList"
 		"xpos"			"c-270"
-		"ypos"			"166"
+		"ypos"			"168"
 		"zpos"			"20"
 		"wide"			"270"
-		"tall"			"236"
+		"tall"			"240"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -431,10 +432,10 @@
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"RedPlayerList"
 		"xpos"			"c0"
-		"ypos"			"166"
+		"ypos"			"168"
 		"zpos"			"20"
 		"wide"			"270"
-		"tall"			"236"
+		"tall"			"240"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -512,23 +513,6 @@
 			"visible"		"0"
 		}
 	}
-	"SpecBackground"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"SpecBackground"
-		"xpos"			"c-270"
-		"ypos"			"405"
-		"zpos"			"2"
-		"wide"			"540"
-		"tall"			"84"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"	
-		"fillcolor"		"32 32 32 125"
-		"PaintBackgroundType"	"0"
-	}
 	"StatsBackground"
 	{
 		"ControlName"	"ImagePanel"
@@ -543,7 +527,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"	
-		"fillcolor"		"32 32 32 125"
+		"fillcolor"		"HudBlack"	//"32 32 32 125"
 		"PaintBackgroundType"	"0"
 	}
 	
@@ -1752,4 +1736,4 @@
 			"visible"		"1"
 		}
 	}
-}
\ No newline at end of file
+}