Merge pull request #143 from raysfire/update

v2020.0412

1 files changed, 68 insertions, 99 deletions

diff --git a/customizations/team_menu/classselection.res b/customizations/team_menu/classselection.res
index cfafccd..47e72d2 100644
--- a/customizations/team_menu/classselection.res
+++ b/customizations/team_menu/classselection.res
@@ -2,7 +2,7 @@
 {
 	"class"
 	{
-		"ControlName"	"ImagePanel"
+		"ControlName"	"Frame"
 		"fieldName"		"class"
 		"xpos"			"0"
 		"ypos"			"0"
@@ -13,7 +13,21 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"fillcolor"		"0 0 0 128"
+	}
+	
+	"SidePanelBG"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"SidePanelBG"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"1"
+		"wide"			"255"
+		"tall"			"f0"
+		"visible"		"1"
+		"enabled"		"1"
+		"scaleImage"	"1"
+		"fillcolor"		"0 0 0 120"
 	}
 	
 	"SysMenu"
@@ -34,33 +48,18 @@
 	"SelectClassLabel"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"SelectClassLabel"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"5"
+		"fieldName"		"SelectTeamLabel"
+		"xpos"			"0"
+		"ypos"			"15"
+		"zpos"			"6"
 		"wide"			"255"
 		"tall"			"30"
-		"visible"		"1"
-		"enabled"		"1"
 		"labelText"		"#TF_SelectAClass"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold28"
-		"fgcolor"		"200 187 161 255"
-	}
-	
-	"SidePanelBG"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"SidePanelBG"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"0"
-		"wide"			"255"
-		"tall"			"f0"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
-		"fillcolor"		"0 0 0 60"
+		"font"			"CerbeticaBold32"
+		"visible"		"0"
+		"enabled"		"0"
+		"fgcolor"		"TanLight"
 	}
 	
 	"scout"
@@ -77,7 +76,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&1  Scout"
+		"labelText"			"&1.  Scout"
 		"textAlignment"		"west"
 		"Command"			"joinclass scout"
 		"Default"			"1"
@@ -88,8 +87,8 @@
 		"fgcolor"					"235 226 202 255"
 		"defaultFgColor_override"	"235 226 202 255"
 		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"depressedFgColor_override"	"235 226 202 255"
+		"selectedFgColor_override"	"72 255 255 255"
 		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -114,7 +113,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&2  Soldier"
+		"labelText"			"&2.  Soldier"
 		"textAlignment"		"west"
 		"Command"			"joinclass soldier"
 		"Default"			"0"
@@ -125,8 +124,8 @@
 		"fgcolor"					"235 226 202 255"
 		"defaultFgColor_override"	"235 226 202 255"
 		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"depressedFgColor_override"	"235 226 202 255"
+		"selectedFgColor_override"	"72 255 255 255"
 		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -151,7 +150,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&3  Pyro"
+		"labelText"			"&3.  Pyro"
 		"textAlignment"		"west"
 		"Command"			"joinclass pyro"
 		"Default"			"0"
@@ -188,7 +187,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&4  Demoman"
+		"labelText"			"&4.  Demoman"
 		"textAlignment"		"west"
 		"Command"			"joinclass demoman"
 		"Default"			"0"
@@ -210,7 +209,7 @@
 		"selectonhover"			"1"
 		"keyboardinputenabled"	"0"
 	}
-
+	
 	"heavyweapons"
 	{
 		"ControlName"		"CExLabel"
@@ -225,7 +224,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&5  Heavy"
+		"labelText"			"&5.  Heavy"
 		"textAlignment"		"west"
 		"Command"			"joinclass heavyweapons"
 		"Default"			"0"
@@ -262,7 +261,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&6  Engineer"
+		"labelText"			"&6.  Engineer"
 		"textAlignment"		"west"
 		"Command"			"joinclass engineer"
 		"Default"			"0"
@@ -299,7 +298,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&7  Medic"
+		"labelText"			"&7.  Medic"
 		"textAlignment"		"west"
 		"Command"			"joinclass medic"
 		"Default"			"0"
@@ -321,7 +320,7 @@
 		"selectonhover"			"1"
 		"keyboardinputenabled"	"0"
 	}
-
+	
 	"sniper"
 	{
 		"ControlName"		"CExImageButton"
@@ -336,7 +335,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&8  Sniper"
+		"labelText"			"&8.  Sniper"
 		"textAlignment"		"west"
 		"Command"			"joinclass sniper"
 		"Default"			"0"
@@ -373,7 +372,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&9  Spy"
+		"labelText"			"&9.  Spy"
 		"textAlignment"		"west"
 		"Command"			"joinclass spy"
 		"Default"			"0"
@@ -398,24 +397,22 @@
 
 	"random"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"		"CExButton"
 		"fieldName"			"random"
 		"xpos"				"30"
-		"ypos"				"419"
+		"ypos"				"r58"
 		"zpos"				"6"
-		"wide"				"150"
+		"wide"				"80"
 		"tall"				"16"
 		"autoResize"		"0"
 		"pinCorner"			"2"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&R  Random"
+		"labelText"			"(&R)  RANDOM"
 		"textAlignment"		"west"
 		"Command"			"joinclass random"
-		"Default"			"0"
 		"font"				"CerbeticaBold16"
-		"scaleImage"		"1"
 		"paintbackground"	"0"
 		
 		"fgcolor"					"235 226 202 255"
@@ -427,31 +424,27 @@
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
-		
-		"stayselectedonclick"	"1"
-		"selectonhover"			"1"
-		"keyboardinputenabled"	"0"
 	}
 	
-	"EditLoadoutButton" [$WIN32]
+	"CancelButton" [$WIN32]
 	{
 		"ControlName"	"CExButton"
-		"fieldName"		"EditLoadoutButton"
-		"xpos"			"135"
+		"fieldName"		"CancelButton"
+		"xpos"			"30"
 		"ypos"			"r38"
 		"zpos"			"6"
-		"wide"			"100"
-		"tall"			"25"
+		"wide"			"80"
+		"tall"			"16"
 		"autoResize"	"0"
 		"pinCorner"		"2"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"paintbackground" "0"
-		"labelText"		"(&E)  EDIT LOADOUT"
+		"labelText"		"(&Q)  CANCEL"
 		"textAlignment"	"west"
-		"Command"		"openloadout"
-		"font"			"CerbeticaBold14"
+		"Command"		"vguicancel"
+		"font"			"CerbeticaBold16"
+		"paintbackground" "0"
 		
 		"fgcolor"					"235 226 202 255"
 		"defaultFgColor_override"	"235 226 202 255"
@@ -464,26 +457,25 @@
 		"sound_armed"		"UI/buttonrollover.wav"
 	}
 	
-	"CancelButton" [$WIN32]
+	"EditLoadoutButton" [$WIN32]
 	{
 		"ControlName"	"CExButton"
-		"fieldName"		"CancelButton"
-		"xpos"			"30"
+		"fieldName"		"EditLoadoutButton"
+		"xpos"			"125"
 		"ypos"			"r38"
 		"zpos"			"6"
-		"wide"			"75"
-		"tall"			"25"
+		"wide"			"110"
+		"tall"			"16"
 		"autoResize"	"0"
 		"pinCorner"		"2"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"(&C)  CANCEL"
-		"textAlignment"	"west"
-		"Command"		"vguicancel"
-		"font"			"CerbeticaBold14"
 		"paintbackground" "0"
-		"fgcolor"		"235 226 202 255"
+		"labelText"		"(&E)  EDIT LOADOUT"
+		"textAlignment"	"west"
+		"Command"		"openloadout"
+		"font"			"CerbeticaBold16"
 		
 		"fgcolor"					"235 226 202 255"
 		"defaultFgColor_override"	"235 226 202 255"
@@ -553,42 +545,19 @@
 		}
 	}
 	
-	"Hint"
-	{	
-		"ControlName"	"CExLabel"
-		"fieldName"		"Hint"
-		"xpos"			"c-300"
-		"ypos"			"95"
-		"zpos"			"2"
-		"wide"			"600"
-		"tall"			"50"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"%hint%"
-		"textAlignment"	"left"
-		"wrap"			"1"
-		"font"			"HudFontMediumSmallSecondary"
-		"fgcolor"		"212 160 23 255"
-	}
-	
 	"ShadedBar"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"ShadedBar"
-		"xpos"			"9999"
-		"ypos"			"r50"
-		"zpos"			"4"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"0"
 		"wide"			"f0"
-		"tall"			"50"
+		"tall"			"f0"
 		"visible"		"1"
 		"enabled"		"1"
-		"tabPosition"	"0"	
-		"image"			"loadout_bottom_gradient"
-		"tileImage"		"1"
 		"PaintBackgroundType"	"0"
+		"fillcolor"		"0 0 0 50"
 	}
 	
 	"countImage0" [$WIN32]
@@ -1084,10 +1053,10 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
+		"render_texture" "0"
 		"fov"			"25"
-		"allow_rot"		"0"
+		"allow_rot"		"1"
 		"paintbackground"	"1"
-		"render_texture"	"0"
 		"paintbackgroundenabled" "1"
 		"bgcolor_override" "255 255 255 0"