Merge pull request #173 from raysfire/dev

v2021.0705

4 files changed, 92 insertions, 93 deletions

diff --git a/resource/scheme/clientscheme_borders.res b/resource/scheme/clientscheme_borders.res
index b0522f4..02f7784 100644
--- a/resource/scheme/clientscheme_borders.res
+++ b/resource/scheme/clientscheme_borders.res
@@ -126,27 +126,27 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 1"
 				}
 				"2"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "1 1"
 				}
 				"3"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "2 1"
 				}
 				"4"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "3 1"
 				}
 				"5"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "4 1"
 				}
 			}
@@ -154,27 +154,27 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 1"
 				}
 				"2"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "1 1"
 				}
 				"3"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "2 1"
 				}
 				"4"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "3 1"
 				}
 				"5"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "4 1"
 				}
 			}
@@ -182,27 +182,27 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 1"
 				}
 				"2"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "1 1"
 				}
 				"3"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "2 1"
 				}
 				"4"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "3 1"
 				}
 				"5"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "4 1"
 				}
 			}
@@ -214,27 +214,27 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "0 1"
 				}
 				"2"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "1 1"
 				}
 				"3"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "2 1"
 				}
 				"4"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "3 1"
 				}
 				"5"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "4 1"
 				}
 			}
@@ -242,27 +242,27 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "0 1"
 				}
 				"2"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "1 1"
 				}
 				"3"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "2 1"
 				}
 				"4"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "3 1"
 				}
 				"5"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "4 1"
 				}
 			}
@@ -270,27 +270,27 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "0 1"
 				}
 				"2"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "1 1"
 				}
 				"3"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "2 1"
 				}
 				"4"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "3 1"
 				}
 				"5"
 				{
-					"color" "15 100 100 255"
+					"color" "ColorCyanFade"
 					"offset" "4 1"
 				}
 			}
@@ -303,7 +303,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 4"
 				}
 			}
@@ -311,7 +311,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -319,7 +319,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -327,7 +327,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -340,17 +340,17 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 				"2"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "1 0"
 				}
 				"3"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "2 0"
 				}
 			}
@@ -358,17 +358,17 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 				"2"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "1 0"
 				}
 				"3"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "2 0"
 				}
 			}
@@ -376,17 +376,17 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 				"2"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "1 0"
 				}
 				"3"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "2 0"
 				}
 			}
@@ -394,17 +394,17 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 				"2"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "1 0"
 				}
 				"3"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "2 0"
 				}
 			}
@@ -909,7 +909,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -917,7 +917,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -925,7 +925,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -933,7 +933,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -946,7 +946,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -954,7 +954,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -962,7 +962,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -970,7 +970,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "15 255 255 255"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
index 5660969..2511b38 100644
--- a/resource/scheme/clientscheme_colors.res
+++ b/resource/scheme/clientscheme_colors.res
@@ -6,22 +6,15 @@
 		// HUD COLORS
 		//---------------------------------------------
 		"ColorRed"					"255 0 0 255"
-		"ColorVermillion"			"255 64 0 255"
-		"ColorOrange"				"255 128 0 255"
 		"ColorYellow"				"255 255 0 255"
-		"ColorLime"					"128 255 0 255"
-		"ColorGreen"				"0 255 0 255"
-		"ColorTeal"					"0 255 128 255"
+		"ColorGreen"				"48 255 48 255"
 		"ColorCyan"					"72 255 255 255"
-		"ColorAqua"					"0 128 255 255"
+		"ColorCyanFade"				"72 100 100 255"
 		"ColorBlue"					"0 0 255 255"
 		"ColorPurple"				"128 0 255 255"
 		"ColorMagenta"				"255 0 255 255"
-		"ColorRuby"					"255 0 128 255"
 		"ColorBlack"				"0 0 0 255"
-		"ColorGreyDark"				"64 64 64 255"
 		"ColorGreyMid"				"128 128 128 255"
-		"ColorGreyLight"			"192 192 192 255"
 		"ColorWhite"				"255 255 255 255"
 		"DullWhite"					"132 132 132 255"
 		"Grey"						"51 47 46 255"
@@ -38,7 +31,7 @@
 		"Health Buff"				"48 255 48 255"
 		"Health Hurt"				"255 153 0 255"
 		"Heal Numbers"				"48 255 48 255"
-		"Last DamageHeal Info"		"72 255 255 255"
+		"Damage Numbers"			"72 255 255 255"
 		"ItemPanelBG"				"50 50 50 255"
 		"Button Color"				"72 255 255 255"
 		//---------------------------------------------
@@ -102,7 +95,7 @@
 
 		"Black"									"29 29 29 255"
 		"Transparent"							"0 0 0 0"
-		"TransparentBlack"						"0 0 0 200"
+		"TransparentBlack"						"0 0 0 230"
 		"TransparentLightBlack"					"0 0 0 90"
 		"FooterBGBlack"							"52 48 55 255"
 
@@ -114,7 +107,7 @@
 		"HUDDeathWarning"						"255 0 0 255"
 		"HudWhite"								"255 255 255 255"
 		"HudOffWhite"							"200 187 161 255"
-		"HudBlack"								"0 0 0 230"
+		"HudBlack"								"16 16 16 230"
 		"ProgressBarBlue"						"91 122 142 255"
 		"CreditsGreen"							"94 150 49 255"
 
@@ -162,11 +155,11 @@
 		"DisguiseMenuIconBlue"					"92 128 166 255"
 
 		"ProgressOffWhiteTransparent"			"251 235 202 128"
- 		"MatchmakingDialogTitleColor"			"15 255 255 255"
+ 		"MatchmakingDialogTitleColor"			"200 184 151 255"
  		"MatchmakingMenuItemBackground"			"46 43 42 255"
- 		"MatchmakingMenuItemBackgroundActive"	"15 255 255 255"
-		"MatchmakingMenuItemTitleColor"			"15 255 255 255"
-		"MatchmakingMenuItemDescriptionColor"	"15 255 255 255"
+ 		"MatchmakingMenuItemBackgroundActive"	"150 71 0 255"
+		"MatchmakingMenuItemTitleColor"			"200 184 151 255"
+		"MatchmakingMenuItemDescriptionColor"	"200 184 151 255"
 
 		"HTMLBackground"						"95 92 101 255"
 
diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index d68cae3..4f44134 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -7,7 +7,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica"
 				"tall"			"56"
 				"additive"		"0"
 				"antialias"		"1"
@@ -17,7 +17,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica"
 				"tall"			"40"
 				"additive"		"0"
 				"antialias"		"1"
@@ -27,7 +27,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica"
 				"tall"			"32"
 				"additive"		"0"
 				"antialias"		"1"
@@ -37,7 +37,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica"
 				"tall"			"28"
 				"additive"		"0"
 				"antialias"		"1"
@@ -47,7 +47,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"additive"		"0"
 				"antialias"		"1"
@@ -57,7 +57,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"additive"		"0"
 				"antialias"		"1"
@@ -68,7 +68,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica"
 				"tall"			"20"
 				"additive"		"0"
 				"antialias"		"1"
@@ -78,7 +78,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"additive"		"0"
 				"antialias"		"1"
@@ -88,7 +88,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica"
 				"tall"			"16"
 				"additive"		"0"
 				"antialias"		"1"
@@ -98,7 +98,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"additive"		"0"
 				"antialias"		"1"
@@ -108,7 +108,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"additive"		"0"
 				"antialias"		"1"
@@ -471,7 +471,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica"
-				"tall"			"36"
+				"tall"			"35"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -695,7 +695,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica"
-				"tall"			"10"
+				"tall"			"9"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -706,7 +706,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica"
-				"tall"			"6"
+				"tall"			"9"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2703,13 +2703,8 @@ Scheme
 		}
 		"8"
 		{
-			"font"	"resource/fonts/Cerbetica.otf"
-			"name"	"Cerbetica"
-		}
-		"9"
-		{
-			"font"	"resource/fonts/Cerbetica_bold.otf"
-			"name"	"Cerbetica_bold"
+			"font" 	"resource/fonts/Cerbetica.ttf"
+			"name" 	"Cerbetica"
 		}
 	}
 }
\ No newline at end of file
diff --git a/resource/scheme/clientscheme_icons.res b/resource/scheme/clientscheme_icons.res
index 4933bd1..8283466 100644
--- a/resource/scheme/clientscheme_icons.res
+++ b/resource/scheme/clientscheme_icons.res
@@ -14,18 +14,29 @@ Scheme
 			}
 		}
 
-		"ClassIcons"
+		"NormalIcons"
 		{
 			"1"
 			{
 				"name"			"TF2Icons"
-				"tall"			"62"
+				"tall"			"25"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
 
+		"MediumIcons"
+		{
+			"1"
+			{
+				"name"			"TF2Icons"
+				"tall"			"20"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+
 		"CustomIcons"
 		{
 			"1"