Merge branch 'master' into dev

12 files changed, 71 insertions, 18 deletions

diff --git a/materials/vgui/replay/thumbnails/mvm/bootcamp.vmt b/materials/vgui/replay/thumbnails/mvm/bootcamp.vmt
new file mode 100644
index 0000000..c07a6be
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/mvm/bootcamp.vmt
@@ -0,0 +1,7 @@
+"UnlitGeneric"
+{
+	"$baseTexture" "vgui/replay/thumbnails/mvm/bootcamp"
+	"$nolod" "1"
+	"$nomip" "1"
+	"%keywords" "tf, mvm, map"
+}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/mvm/bootcamp.vtf b/materials/vgui/replay/thumbnails/mvm/bootcamp.vtf
new file mode 100644
index 0000000..35b84df
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/mvm/bootcamp.vtf
diff --git a/materials/vgui/replay/thumbnails/mvm/mannup.vmt b/materials/vgui/replay/thumbnails/mvm/mannup.vmt
new file mode 100644
index 0000000..6742776
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/mvm/mannup.vmt
@@ -0,0 +1,7 @@
+"UnlitGeneric"
+{
+	"$baseTexture" "vgui/replay/thumbnails/mvm/mannup"
+	"$nolod" "1"
+	"$nomip" "1"
+	"%keywords" "tf, mvm, map"
+}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/mvm/mannup.vtf b/materials/vgui/replay/thumbnails/mvm/mannup.vtf
new file mode 100644
index 0000000..2bbe0f4
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/mvm/mannup.vtf
diff --git a/resource/ui/charinfoloadoutsubpanel.res b/resource/ui/charinfoloadoutsubpanel.res
index c1e14ad..77fd6f2 100644
--- a/resource/ui/charinfoloadoutsubpanel.res
+++ b/resource/ui/charinfoloadoutsubpanel.res
@@ -46,8 +46,10 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			""
+		"labelText"			"&1"
 		"textAlignment"		"south-west"
+		"textinsetx"		"-9999"
+		"textinsety"		"-9999"
 		"Command"			"loadout scout"
 		"Default"			"0"
 		"font"				"MenuKeys"
@@ -72,8 +74,10 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			""
+		"labelText"			"&2"
 		"textAlignment"		"south-west"
+		"textinsetx"		"-9999"
+		"textinsety"		"-9999"
 		"Command"			"loadout soldier"
 		"Default"			"0"
 		"font"				"MenuKeys"
@@ -98,8 +102,10 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			""
+		"labelText"			"&3"
 		"textAlignment"		"south-west"
+		"textinsetx"		"-9999"
+		"textinsety"		"-9999"
 		"Command"			"loadout pyro"
 		"Default"			"0"
 		"font"				"MenuKeys"
@@ -124,8 +130,10 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			""
+		"labelText"			"&4"
 		"textAlignment"		"south-west"
+		"textinsetx"		"-9999"
+		"textinsety"		"-9999"
 		"Command"			"loadout demoman"
 		"Default"			"0"
 		"font"				"MenuKeys"
@@ -150,8 +158,10 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			""
+		"labelText"			"&5"
 		"textAlignment"		"south-west"
+		"textinsetx"		"-9999"
+		"textinsety"		"-9999"
 		"Command"			"loadout heavy"
 		"Default"			"0"
 		"font"				"MenuKeys"
@@ -176,8 +186,10 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			""
+		"labelText"			"&6"
 		"textAlignment"		"south-west"
+		"textinsetx"		"-9999"
+		"textinsety"		"-9999"
 		"Command"			"loadout engineer"
 		"Default"			"0"
 		"font"				"MenuKeys"
@@ -202,8 +214,10 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			""
+		"labelText"			"&7"
 		"textAlignment"		"south-west"
+		"textinsetx"		"-9999"
+		"textinsety"		"-9999"
 		"Command"			"loadout medic"
 		"Default"			"0"
 		"font"				"MenuKeys"
@@ -228,8 +242,10 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			""
+		"labelText"			"&8"
 		"textAlignment"		"south-west"
+		"textinsetx"		"-9999"
+		"textinsety"		"-9999"
 		"Command"			"loadout sniper"
 		"Default"			"0"
 		"font"				"MenuKeys"
@@ -254,8 +270,10 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			""
+		"labelText"			"&9"
 		"textAlignment"		"south-west"
+		"textinsetx"		"-9999"
+		"textinsety"		"-9999"
 		"Command"			"loadout spy"
 		"Default"			"0"
 		"font"				"MenuKeys"
diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res
index b701091..ae54bc7 100644
--- a/resource/ui/charinfopanel.res
+++ b/resource/ui/charinfopanel.res
@@ -137,7 +137,7 @@
 			"font"				"Cerbetica18"
 			"selectedcolor"		"TanLight"
 			"unselectedcolor"	"TanDark"
-			"defaultBgColor_override"	"25 25 25 255"
+			"defaultBgColor_override"	"DarkGrey"
 			"paintbackground"			"1"
 			"activeborder_override"		"CyanBorderTabs"
 			"normalborder_override"		"CyanBorderTabsInactive"
diff --git a/resource/ui/craftingpanel.res b/resource/ui/craftingpanel.res
index 5874fdf..05b5207 100644
--- a/resource/ui/craftingpanel.res
+++ b/resource/ui/craftingpanel.res
@@ -111,7 +111,7 @@
 			"defaultBgColor_override"	"Transparent"
 			"armedFgColor_override"		"TanLight"
 			"armedBgColor_override"		"Transparent"
-			"depressedFgColor_override"	"178 82 22 255"
+			"depressedFgColor_override"	"15 255 255 255"
 			"depressedBgColor_override"	"Transparent"
 		}
 
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index eb0545a..97c26a6 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -138,7 +138,7 @@
 			"font"				"Cerbetica14"
 			"selectedcolor"		"TanLight"
 			"unselectedcolor"	"TanDark"
-			"defaultBgColor_override"	"25 25 25 255"
+			"defaultBgColor_override"	"DarkGrey"
 			"paintbackground"		"1"
 			"activeborder_override"	"CyanBorderTabs"
 			"normalborder_override" "CyanBorderTabsInactive"
diff --git a/resource/ui/matchmakingcasualcriteria.res b/resource/ui/matchmakingcasualcriteria.res
index 62453a4..b0857c7 100644
--- a/resource/ui/matchmakingcasualcriteria.res
+++ b/resource/ui/matchmakingcasualcriteria.res
@@ -53,7 +53,7 @@
 		{
 			"ControlName"	"CExImageButton"
 			"fieldName"		"RestoreCasualSearchCriteria"
-			"xpos"			"rs1-29"
+			"xpos"			"rs1-27"
 			"ypos"			"38"
 			"zpos"			"100"
 			"wide"			"15"
@@ -97,7 +97,7 @@
 		{
 			"ControlName"	"CExImageButton"
 			"fieldName"		"SaveCasualSearchCriteria"
-			"xpos"			"rs1-9"
+			"xpos"			"rs1-7"
 			"ypos"			"38"
 			"zpos"			"100"
 			"wide"			"15"
diff --git a/resource/ui/matchmakingdashboardcomp.res b/resource/ui/matchmakingdashboardcomp.res
index 6481e27..da967b3 100644
--- a/resource/ui/matchmakingdashboardcomp.res
+++ b/resource/ui/matchmakingdashboardcomp.res
@@ -133,5 +133,8 @@
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
+
+		"armedBgColor_override"		"CreditsGreen"
+		"defaultBgColor_override"	"GreenSolid"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/matchmakingdashboardmvmmodeselect.res b/resource/ui/matchmakingdashboardmvmmodeselect.res
index 950cbe0..dd30655 100644
--- a/resource/ui/matchmakingdashboardmvmmodeselect.res
+++ b/resource/ui/matchmakingdashboardmvmmodeselect.res
@@ -23,13 +23,30 @@
 		"zpos"					"2"
 		"wide"					"o2"
 		"tall"					"100"
-		"visible"				"1"
-		"enabled"				"1"
+		"visible"				"0"
+		"enabled"				"0"
 		"mouseinputenabled"		 "0"
 		"image"					"mvm/mvm_logo"
 		"scaleImage"			"1"
 	}
 
+	"Title"
+	{
+		"ControlName"			"Label"
+		"fieldName"				"Title"
+		"xpos"					"8"
+		"ypos"					"23"
+		"zpos"					"99"
+		"wide"					"f0"
+		"tall"					"20"
+		"proportionaltoparent"	"1"
+		"labeltext"				"#TF_Matchmaking_HeaderMvM"
+		"textAlignment"			"center"
+		"font"					"CerbeticaBold24"
+		"fgcolor_override"		"White"
+		"mouseinputenabled"		"0"
+	}
+
 	"MannUpGroupBox"
 	{
 		//"ControlName"			"EditablePanel"
@@ -70,7 +87,7 @@
 			"visible"				"1"
 			"enabled"				"1"
 			"mouseinputenabled" 	"0"
-			"image"					"mvm/mannup"
+			"image"					"replay/thumbnails/mvm/mannup"
 			"scaleImage"			"1"
 			"proportionaltoparent"	"1"
 		}
@@ -188,7 +205,7 @@
 			"visible"				"1"
 			"enabled"				"1"
 			"mouseinputenabled" 	"0"
-			"image"					"mvm/bootcamp"
+			"image"					"replay/thumbnails/mvm/bootcamp"
 			"scaleImage"			"1"
 			"proportionaltoparent"	"1"
 		}
diff --git a/resource/ui/pvprankpanel.res b/resource/ui/pvprankpanel.res
index b76491c..2dda030 100644
--- a/resource/ui/pvprankpanel.res
+++ b/resource/ui/pvprankpanel.res
@@ -409,6 +409,7 @@
 						"progress"		"0"
 
 						"fgcolor_override"	"CreditsGreen"
+						"bgcolor_override"	"0 0 0 0"
 					}
 
 					"Frame"