Merge branch 'Vexcenot:master' into master

Vexcenot · Aug 8, 2023 · bea631d · bea631d
2 parents ba3e81a + 92f2218
commit bea631d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 165 deletions.
diff --git a/resource/clientscheme.res b/resource/clientscheme.res
@@ -8,7 +8,8 @@
 //		borders			- description of all the borders
 //
 //
-#base "../resource/crosshairs/crosshair_scheme.res"
+#base 		"../resource/crosshairs/crosshair_scheme.res"
+"#base"		"clientscheme_VEXCENOT is BASED CENTER NEWrrr.res"
 Scheme
 {
 	//Name - currently overriden in code
@@ -5811,7 +5812,7 @@ Scheme
 		"2" "resource/tfd.ttf"
 		"3"
 		{
-			"font" "resource/TF2.ttf"
+			"font" "resource/fonts/TF2.ttf"
 			"name" "TF2"
 			"russian"
 			{
@@ -5824,7 +5825,7 @@ Scheme
 		}
 		"4"
 		{
-			"font" "resource/TF2Secondary.ttf"
+			"font" "resource/fonts/TF2Secondary.ttf"
 			"name" "TF2 Secondary"
 			"russian"
 			{
@@ -5837,7 +5838,7 @@ Scheme
 		}
 		"5"
 		{
-			"font" "resource/TF2Professor.ttf"
+			"font" "resource/fonts/TF2Professor.ttf"
 			"name" "TF2 Professor"
 			"russian"
 			{
@@ -5850,7 +5851,7 @@ Scheme
 		}
 		"6"
 		{
-			"font" "resource/TF2Build.ttf"
+			"font" "resource/fonts/TF2Build.ttf"
 			"name" "TF2 Build"
 			"russian"
 			{
@@ -5867,7 +5868,7 @@ Scheme
 		}
 		"7"
 		{
-			"font"	"resource/ocra.ttf"
+			"font"	"resource/fonts/ocra.ttf"
 			"name" "ocra"
 			"turkish"
 			{
@@ -5929,4 +5930,3 @@ Scheme
 	}
 }
 
-"#base"		"clientscheme_VEXCENOT is BASED CENTER NEWrrr.res"
diff --git a/resource/clientscheme_VEXCENOT is BASED CENTER NEWrrr.res b/resource/clientscheme_VEXCENOT is BASED CENTER NEWrrr.res
@@ -1199,195 +1199,51 @@
 				"tall"										"16"
 				"antialias"									"1"
 			}
-		}	
+		}
 	}
 	"CustomFontFiles"
 	{
 		"8"
 		{
 			"font"		"resource/fonts/TF2.ttf"
 			"name"		"TF2"
-			"turkish"
-			{
-				"range"		"0x0000 0x015F"
-			}
-			"swedish"
-			{
-				"range"		"0x0000 0x00F6"
-			}
-			"spanish"
-			{
-				"range"		"0x0000 0x00FC"
-			}
-			"romanian"
+			"russian"
 			{
-				"range"		"0x0000 0x021B"
+				"range" "0x0000 0xFFFF"
 			}
 			"polish"
 			{
-				"range"		"0x0000 0x017C"
-			}
-			"norwegian"
-			{
-				"range"		"0x0000 0x00F8"
-			}
-			"danish"
-			{
-				"range"		"0x0000 0x00F8"
-			}
-			"hungarian"
-			{
-				"range"		"0x0000 0x0171"
-			}
-			"german"
-			{
-				"range"		"0x0000 0x00FC"
-			}
-			"french"
-			{
-				"range"		"0x0000 0x0178"
-			}
-			"finnish"
-			{
-				"range"		"0x0000 0x017E"
-			}
-			"czech"
-			{
-				"range"		"0x0000 0x017E"
-			}
-			"bulgarian"
-			{
-				"range"		"0x0000 0x0451"
-			}
-			"russian"
-			{
-				"range"		"0x0000 0x0451"
+				"range" "0x0000 0xFFFF"
 			}
 		}
 		"9"
 		{
 			"font"		"resource/fonts/TF2Secondary.ttf"
 			"name"		"TF2 Secondary"
-			"english"
-			{
-				"range"		"0x0000 0x2014"
-			}
-			"turkish"
-			{
-				"range"		"0x0000 0x015F"
-			}
-			"swedish"
-			{
-				"range"		"0x0000 0x00F6"
-			}
-			"spanish"
-			{
-				"range"		"0x0000 0x00FC"
-			}
-			"romanian"
+			"russian"
 			{
-				"range"		"0x0000 0x021B"
+				"range" "0x0000 0xFFFF"
 			}
 			"polish"
 			{
-				"range"		"0x0000 0x017C"
-			}
-			"norwegian"
-			{
-				"range"		"0x0000 0x00F8"
-			}
-			"danish"
-			{
-				"range"		"0x0000 0x00F8"
-			}
-			"hungarian"
-			{
-				"range"		"0x0000 0x0171"
-			}
-			"german"
-			{
-				"range"		"0x0000 0x00FC"
-			}
-			"french"
-			{
-				"range"		"0x0000 0x0178"
-			}
-			"finnish"
-			{
-				"range"		"0x0000 0x017E"
-			}
-			"czech"
-			{
-				"range"		"0x0000 0x017E"
-			}
-			"bulgarian"
-			{
-				"range"		"0x0000 0x0451"
-			}
-			"russian"
-			{
-				"range"		"0x0000 0x0451"
+				"range" "0x0000 0xFFFF"
 			}
 		}
 		"10"
 		{
 			"font"		"resource/fonts/TF2Build.ttf"
 			"name"		"TF2 Build"
-			"turkish"
-			{
-				"range"		"0x0000 0x015F"
-			}
-			"swedish"
-			{
-				"range"		"0x0000 0x00F6"
-			}
-			"spanish"
-			{
-				"range"		"0x0000 0x00FC"
-			}
-			"romanian"
+			"russian"
 			{
-				"range"		"0x0000 0x021B"
+				"range" "0x0000 0xFFFF"
 			}
 			"polish"
 			{
-				"range"		"0x0000 0x017C"
-			}
-			"norwegian"
-			{
-				"range"		"0x0000 0x00F8"
-			}
-			"danish"
-			{
-				"range"		"0x0000 0x00F8"
-			}
-			"hungarian"
-			{
-				"range"		"0x0000 0x0171"
-			}
-			"german"
-			{
-				"range"		"0x0000 0x00FC"
+				"range" "0x0000 0xFFFF"
 			}
-			"french"
-			{
-				"range"		"0x0000 0x0178"
-			}
-			"finnish"
-			{
-				"range"		"0x0000 0x017E"
-			}
-			"czech"
-			{
-				"range"		"0x0000 0x017E"
-			}
-			"bulgarian"
-			{
-				"range"		"0x0000 0x0451"
-			}
-			"russian"
+			"turkish"
 			{
-				"range"		"0x0000 0x0451"
+				"range" "0x0000 0xFFFF"
 			}
 		}
 		"11"
@@ -1400,9 +1256,9 @@
 			"font"		"resource/fonts/nimbus.ttf"
 			"name"		"Nimbus Sans L Regular"
 		}
-		"13"		
+		"13"
 		{
-			"font"		"resource/fonts/ToonHUD Montserrat.ttf"	
+			"font"		"resource/fonts/ToonHUD Montserrat.ttf"
 			"name"		"ToonHUD Montserrat"
 		}
 		"14"