From ff348d625bc18045151da09c351090fd6a290624 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Wed, 5 Aug 2020 14:39:00 -0400
Subject: Updated Icons, Main Menu, Client Scheme

- Replaced multiple images with fonts to reduce space.
- Updated the main menu and the client scheme.
- Removed certain cp_icon files to correct visual glitches.
- Removed unused files.
---
 resource/scheme/clientscheme_fonts.res | 111 ++++++++++++++++++++++-----------
 1 file changed, 74 insertions(+), 37 deletions(-)

(limited to 'resource/scheme/clientscheme_fonts.res')

diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index dbf13dd..4578dd8 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -807,10 +807,9 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"10"
-				"weight"		"0"
-				"additive"		"0"
-				"antialias"		"1"
+				"tall"			"12"
+				"weight"		"700"
+				"yres"			"480 599"
 			}
 			"2"
 			{
@@ -850,7 +849,7 @@ Scheme
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
-				"antialias" 	"1"
+				"antialias"		"1"
 				"yres"			"480 599"
 			}
 			"2"
@@ -2056,8 +2055,8 @@ Scheme
 			"1"
 			{
 				"name"			"Verdana"
-				"tall"			"11"  	[!$OSX]
-				"tall"			"9"  	[$OSX]
+				"tall"			"11"	[!$OSX]
+				"tall"			"9"		[$OSX]
 				"weight"		"800"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2339,7 +2338,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"8"
+				"tall"			"10"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2367,17 +2366,6 @@ Scheme
 				"antialias" 	"1"
 			}
 		}
-		"ItemMeterFontSmall"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"6"
-				"weight"		"500"
-				"additive"		"0"
-				"antialias" 	"1"
-			}
-		}
 
 		"AchievementTracker_Name"
 		{
@@ -2527,7 +2515,7 @@ Scheme
 				"tall"			"16"
 				"weight"		"400"
 				"additive"		"0"
-				"antialias" 	"1"
+				"antialias"		"1"
 			}
 		}
 		"QuestStickyText"
@@ -2642,7 +2630,7 @@ Scheme
 				"tall"			"13"
 				"weight"		"400"
 				"additive"		"0"
-				"antialias" 	"1"
+				"antialias"		"1"
 			}
 		}
 		"QuestLargeText_Merasmus"
@@ -2653,7 +2641,7 @@ Scheme
 				"tall"			"16"
 				"weight"		"400"
 				"additive"		"0"
-				"antialias" 	"1"
+				"antialias"		"1"
 			}
 		}
 
@@ -2676,7 +2664,7 @@ Scheme
 				"tall"			"8"
 				"weight"		"400"
 				"additive"		"0"
-				"antialias"	 	"1"
+				"antialias"		"1"
 			}
 		}
 		"AdFont_PurchaseButton"
@@ -2866,7 +2854,7 @@ Scheme
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
-				"antialias" 	"1"
+				"antialias"		"1"
 			}
 		}
 		"ReplayLarger"
@@ -2967,18 +2955,6 @@ Scheme
 			}
 		}
 
-		"TF2ComboBox"
-		{
-			"1"
-			{
-				"name"			"TF2 Secondary"
-				"tall"			"11"
-				"weight"		"500"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-
 		"QuestMap_Small_Blur"
 		{
 			"1"
@@ -3104,11 +3080,72 @@ Scheme
 			}
 		}
 		"7"
+		{
+			"font"	"resource/ocra.ttf"
+			"name"	"ocra"
+			"turkish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"swedish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"spanish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"romanian"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"polish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"norwegian"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"danish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"hungarian"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"german"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"french"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"finnish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"czech"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"bulgarian"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"russian"
+			{
+				"range" "0x0000 0x007E"
+			}
+		}
+		"8"
 		{
 			"font"	"resource/fonts/Cerbetica_bold.ttf"
 			"name"	"Cerbetica Bold"
 		}
-		"8"
+		"9"
 		{
 			"font"	"resource/fonts/Cerbetica_edited.ttf"
 			"name"	"Cerbetica_edited"
-- 
cgit v1.2.3


From 736d6ccdbb4380a71c95b2d74e45d88bbfdc64b3 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Wed, 5 Aug 2020 22:37:29 -0400
Subject: Visual Tweaks, Bug Fixes (see notes)

- Added the missing player effect and health cluster icons
- Visual tweaks to the scoreboard, team/class select, freezecam, item test
- Updated the main menu to use the new Player Mute menu
- Fixed the Overtime label overlapping with the server time limit
- Removed unused font definitions
---
 resource/scheme/clientscheme_fonts.res | 367 ++++++---------------------------
 1 file changed, 62 insertions(+), 305 deletions(-)

(limited to 'resource/scheme/clientscheme_fonts.res')

diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index 4578dd8..fab7d55 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -3,22 +3,22 @@ Scheme
 	Fonts
 	{
 		// CUSTOM
-		"CerbeticaBold72"
+		"Cerbetica72"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"72"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold64"
+		"CerbeticaBold72"
 		{
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall" 		 	"64"
+				"tall"			"72"
 				"additive"		"0"
 				"antialias"		"1"
 			}
@@ -44,72 +44,42 @@ Scheme
 				"outline"	 	"1"
 			}
 		}
-		"CerbeticaBold50"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall" 		 	"50"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold48"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall" 		 	"48"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold46"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall" 		 	"46"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold44"
+		"Cerbetica48"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
-				"tall" 		 	"44"
+				"name"			"Cerbetica_edited"
+				"tall"			"48"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold42"
+		"CerbeticaBold40"
 		{
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall"			"42"
+				"tall"			"40"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold37"
+		"Cerbetica40"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
-				"tall"			"37"
+				"name"			"Cerbetica_edited"
+				"tall"			"40"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold36"
+		"Cerbetica32"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
-				"tall"			"36"
+				"name"			"Cerbetica_edited"
+				"tall"			"32"
 				"additive"		"0"
 				"antialias"		"1"
 			}
@@ -145,375 +115,172 @@ Scheme
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold27"
+		"Cerbetica26"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
-				"tall"			"27"
+				"name"			"Cerbetica_edited"
+				"tall"			"26"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold24"
+		"Cerbetica24"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBoldOutline24"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall" 		 	"24"
-				"additive"	 	"0"
-				"antialias"	 	"1"
-				"outline"	 	"1"
-			}
-		}
-		"CerbeticaBold22"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"22"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold20"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"20"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold18"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"18"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold17"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"17"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold16"
+		"CerbeticaBold24"
 		{
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall"			"16"
+				"tall"			"24"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBoldOutline16"
+		"CerbeticaBoldOutline24"
 		{
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall"			"16"
+				"tall" 		 	"24"
 				"additive"	 	"0"
 				"antialias"	 	"1"
 				"outline"	 	"1"
 			}
 		}
-		"CerbeticaBold15"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"15"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold14"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"14"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold13"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"13"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold12"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"12"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold10"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"10"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold8"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"8"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica72"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"72"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica60"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"60"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica56"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"56"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica55"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"55"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-
-		"Cerbetica54"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"54"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica52"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"52"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica48"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"48"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica44"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"44"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica40"
+		"Cerbetica22"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"40"
+				"tall"			"22"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica36"
+		"CerbeticaBold22"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"36"
+				"name"			"Cerbetica Bold"
+				"tall"			"22"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica32"
+		"Cerbetica20"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"32"
+				"tall"			"20"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica28"
+		"CerbeticaBold20"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"26"
+				"name"			"Cerbetica Bold"
+				"tall"			"20"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica26"
+		"Cerbetica18"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"26"
+				"tall"			"18"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica24"
+		"CerbeticaBold18"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"24"
+				"name"			"Cerbetica Bold"
+				"tall"			"18"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaOutline24"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"24"
-				"additive"	 	"0"
-				"antialias"	 	"1"
-				"outline"	 	"1"
-			}
-		}
-		"Cerbetica22"
+		"Cerbetica16"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"22"
+				"tall"			"16"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica20"
+		"CerbeticaBold16"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"20"
+				"name"			"Cerbetica Bold"
+				"tall"			"16"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica18"
+		"CerbeticaBold15"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"18"
+				"name"			"Cerbetica Bold"
+				"tall"			"15"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica16"
+		"Cerbetica14"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"16"
+				"tall"			"14"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica15"
+		"CerbeticaBold14"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"15"
+				"name"			"Cerbetica Bold"
+				"tall"			"14"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica14"
+		"Cerbetica12"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"14"
+				"tall"			"12"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica12"
+		"CerbeticaBold12"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica Bold"
 				"tall"			"12"
 				"additive"		"0"
 				"antialias"		"1"
@@ -559,16 +326,6 @@ Scheme
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica7"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"7"
-				"additive"		"0"
-				"antialias" 	"1"
-			}
-		}
 
 		// DEFAULT
 		"Default"
@@ -1060,7 +817,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1071,7 +828,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1082,8 +839,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"name"			"Cerbetica Bold"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1095,7 +852,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"4"
+				"tall"			"6"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias"		"1"
@@ -1617,7 +1374,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"8"
+				"tall"			"9"
 				"weight"		"400"
 				"additive"		"0"
 				"antialias" 	"1"
-- 
cgit v1.2.3


From 72d9ca48e7bc508e1609c0897b689943808a4870 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Thu, 6 Aug 2020 13:20:59 -0400
Subject: Fixed Ubercharge Drop Shadow

- Updated the Mann Co. Catalogue page - fixed text description overlap.
- Fixed the Ubercharge not displaying a drop shadow
---
 resource/scheme/clientscheme_fonts.res | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'resource/scheme/clientscheme_fonts.res')

diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index fab7d55..216ba3c 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -727,7 +727,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica Bold"
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
-- 
cgit v1.2.3


From 72289557fe993da654a16dff30d39b3304cd85d5 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Thu, 6 Aug 2020 23:13:59 -0400
Subject: Main Menu Updates, More Bug Fixes

- Updated various main menu and store pages.
- Updated the look of the TargetID and Friends list.
- Fixed the position of the count of players on the payload
- Fixed the size of the badge seen on the post match screen.
- Fixed the item effect meter not being properly centered in minmode.
- Removed icons from the abandon panels.
- Updated font definitions throughout the hud.
---
 resource/scheme/clientscheme_fonts.res | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'resource/scheme/clientscheme_fonts.res')

diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index 216ba3c..e9c6cf5 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -717,7 +717,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"24"
+				"tall"			"20"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1192,7 +1192,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"500"
@@ -1203,7 +1203,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"500"
@@ -1215,7 +1215,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"900"
@@ -1226,7 +1226,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"900"
@@ -1238,7 +1238,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"16"
 				"antialias" 	"1"
 				"weight"		"900"
@@ -2152,7 +2152,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"7"
+				"tall"			"8"
 				"weight"		"0"
 				"additive"		"1"
 				"antialias" 	"1"
-- 
cgit v1.2.3


From efba2d7f8d7c68205331fcc3accad683649faed8 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Fri, 7 Aug 2020 18:49:07 -0400
Subject: Visual Tweaks

- Increased the size of the item names on the loadout screen.
- Updated the tournament and building panels
- Added a panel shown when the player auto-switches teams.
- Fixed the reserve ammo sometimes being cutoff.
- Added additional panels, visual tweaks to multiple others.
---
 resource/scheme/clientscheme_fonts.res | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'resource/scheme/clientscheme_fonts.res')

diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index e9c6cf5..361a539 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -339,7 +339,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"			"Cerbetica_bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"12"
 				"range"			"0x0000 0x00FF"
 				"weight"		"800"
@@ -727,7 +727,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
@@ -839,7 +839,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
@@ -1374,7 +1374,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"9"
+				"tall"			"10"
 				"weight"		"400"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1527,7 +1527,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"36"
 				"weight"		"500"
 				"range"			"0x0000 0x007F"
@@ -1851,7 +1851,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"22"
 				"weight"		"900"
 			}
@@ -1860,7 +1860,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"18"
 				"weight"		"900"
 			}
@@ -1951,7 +1951,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"14"
 				"weight"		"900"
 				"antialias" 	"1"
@@ -2030,7 +2030,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"8"
+				"tall"			"10"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2041,7 +2041,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"10"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2052,7 +2052,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"14"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2631,7 +2631,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"14"
 				"weight"		"500"
 				"additive"		"0"
@@ -2642,7 +2642,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
@@ -2776,6 +2776,12 @@ Scheme
 		"Buttons"		"materials/vgui/fonts/buttons_32.vbf"
 	}
 
+	//////////////////////// CUSTOM FONT FILES /////////////////////////////
+	//
+	// specifies all the custom (non-system) font files that need to be loaded to service the above described fonts
+	// Range specificies the characters to be used from the custom font before falling back to a default font
+	// characters in the range not specificed in the font will appear empty
+	// For TF2: Any special character will need to be added to our font file
 	CustomFontFiles
 	{
 		"1" "resource/tf.ttf"
-- 
cgit v1.2.3


From e391ac81598292127c356fcb6adbd83db72c5888 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Fri, 7 Aug 2020 20:38:01 -0400
Subject: Font Update

- Converted Cerbetica fonts from TTF to OTF
- Removed unused font definitions to reduce loading times
---
 resource/scheme/clientscheme_fonts.res | 550 +++++++++++----------------------
 1 file changed, 174 insertions(+), 376 deletions(-)

(limited to 'resource/scheme/clientscheme_fonts.res')

diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index 361a539..d069ee3 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -3,72 +3,21 @@ Scheme
 	Fonts
 	{
 		// CUSTOM
-		"Cerbetica72"
+		"Cerbetica56"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"72"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold72"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"72"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold56"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_bold"
 				"tall" 		 	"56"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBoldOutline56"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall" 			"56"
-				"additive"	 	"0"
-				"antialias"	 	"1"
-				"outline"	 	"1"
-			}
-		}
-		"Cerbetica48"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"48"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold40"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"40"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
 		"Cerbetica40"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica_bold"
 				"tall"			"40"
 				"additive"		"0"
 				"antialias"		"1"
@@ -78,119 +27,48 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"32"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold32"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_bold"
 				"tall"			"32"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBoldOutline32"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"32"
-				"additive"	 	"0"
-				"antialias"	 	"1"
-				"outline"		"1"
-			}
-		}
-		"CerbeticaBold28"
+		"Cerbetica28"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_bold"
 				"tall"			"28"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica26"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"26"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
 		"Cerbetica24"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"24"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold24"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_bold"
 				"tall"			"24"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBoldOutline24"
+		"Cerbetica24Outline"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_bold"
 				"tall" 		 	"24"
 				"additive"	 	"0"
 				"antialias"	 	"1"
 				"outline"	 	"1"
 			}
 		}
-		"Cerbetica22"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"22"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold22"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"22"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
 		"Cerbetica20"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"20"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold20"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_bold"
 				"tall"			"20"
 				"additive"		"0"
 				"antialias"		"1"
@@ -200,17 +78,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"18"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold18"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_bold"
 				"tall"			"18"
 				"additive"		"0"
 				"antialias"		"1"
@@ -220,47 +88,17 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica_bold"
 				"tall"			"16"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold16"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"16"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold15"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"15"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
 		"Cerbetica14"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"14"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold14"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_bold"
 				"tall"			"14"
 				"additive"		"0"
 				"antialias"		"1"
@@ -270,76 +108,36 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"12"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold12"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_bold"
 				"tall"			"12"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica11"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"11"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
 		"Cerbetica10"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica_bold"
 				"tall"			"10"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica9"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"9"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica8"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"8"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
 
 		// DEFAULT
 		"Default"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"10"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 			"2"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"range"			"0x0000 0x00FF"
 				"weight"		"800"
@@ -349,7 +147,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"10"
 				"weight"		"900"
 				"range"			"0x0000 0x017F"
@@ -360,7 +158,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"500"
 				"underline"		"1"
@@ -368,7 +166,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"11"
 				"range" 		"0x0000 0x00FF"
 				"weight"		"800"
@@ -378,7 +176,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"0"
 				"range"			"0x0000 0x017F"
@@ -386,7 +184,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"13"
 				"weight"		"0"
 				"range"			"0x0000 0x017F"
@@ -394,7 +192,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"0"
 				"range"			"0x0000 0x017F"
@@ -403,7 +201,7 @@ Scheme
 			}
 			"4"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"20"
 				"weight"		"0"
 				"range"			"0x0000 0x017F"
@@ -412,7 +210,7 @@ Scheme
 			}
 			"5"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"22"
 				"weight"		"0"
 				"range"			"0x0000 0x017F"
@@ -421,7 +219,7 @@ Scheme
 			}
 			"6"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"range" 		"0x0000 0x00FF"
 				"weight"		"0"
@@ -431,7 +229,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"0"
 				"range"			"0x0000 0x017F"
@@ -439,7 +237,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"0"
 				"range"			"0x0000 0x017F"
@@ -447,7 +245,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"0"
 				"range"			"0x0000 0x017F"
@@ -456,7 +254,7 @@ Scheme
 			}
 			"4"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"0"
 				"range"			"0x0000 0x017F"
@@ -465,7 +263,7 @@ Scheme
 			}
 			"5"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"16"
 				"weight"		"0"
 				"range"			"0x0000 0x017F"
@@ -477,7 +275,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"900"
 				"range"			"0x0000 0x017F"
@@ -485,7 +283,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"21"
 				"weight"		"900"
 				"range"			"0x0000 0x017F"
@@ -493,7 +291,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"22"
 				"weight"		"900"
 				"range"			"0x0000 0x017F"
@@ -502,7 +300,7 @@ Scheme
 			}
 			"4"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"28"
 				"weight"		"900"
 				"range"			"0x0000 0x017F"
@@ -511,7 +309,7 @@ Scheme
 			}
 			"5"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"30"
 				"weight"		"900"
 				"range"			"0x0000 0x017F"
@@ -520,14 +318,14 @@ Scheme
 			}
 			"6"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"20"
 				"range" 		"0x0000 0x00FF"
 				"weight"		"900"
 			}
 			"7"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"20"
 				"range" 		"0x0000 0x00FF"
 				"weight"		"800"
@@ -538,7 +336,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"name"			"Helvetica" [$OSX]
 				"tall"			"18"
 				"weight"		"900"
@@ -551,7 +349,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"6"
 				"weight"		"500"
 				"additive"		"0"
@@ -563,7 +361,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"700"
 				"yres"			"480 599"
@@ -602,7 +400,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
@@ -611,7 +409,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"32"
 				"weight"		"500"
 				"additive"		"0"
@@ -620,7 +418,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"44"
 				"weight"		"500"
 				"additive"		"0"
@@ -629,7 +427,7 @@ Scheme
 			}
 			"4"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"48"
 				"weight"		"500"
 				"additive"		"0"
@@ -638,7 +436,7 @@ Scheme
 			}
 			"5"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"52"
 				"weight"		"500"
 				"additive"		"0"
@@ -650,7 +448,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"44"
 				"weight"		"500"
 				"additive"		"0"
@@ -661,7 +459,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"35"
 				"weight"		"500"
 				"additive"		"0"
@@ -672,7 +470,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"36"
 				"weight"		"500"
 				"additive"		"0"
@@ -683,7 +481,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"30"
 				"weight"		"500"
 				"additive"		"0"
@@ -694,7 +492,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"30"
 				"weight"		"500"
 				"additive"		"0"
@@ -705,7 +503,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
@@ -716,7 +514,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"20"
 				"weight"		"500"
 				"additive"		"0"
@@ -727,7 +525,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
@@ -738,7 +536,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"500"
 				"additive"		"0"
@@ -749,7 +547,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"500"
 				"additive"		"0"
@@ -760,7 +558,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"500"
 				"additive"		"0"
@@ -771,7 +569,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"500"
 				"additive"		"0"
@@ -782,7 +580,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"16"
 				"weight"		"500"
 				"additive"		"0"
@@ -793,7 +591,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"500"
 				"additive"		"0"
@@ -804,7 +602,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"500"
 				"additive"		"0"
@@ -816,7 +614,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
@@ -827,7 +625,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
@@ -839,7 +637,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
@@ -851,7 +649,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"6"
 				"weight"		"500"
 				"additive"		"0"
@@ -863,7 +661,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"10"
 				"additive"		"0"
 				"antialias"		"1"
@@ -874,7 +672,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"16"
 				//"weight"		"500"
 				"additive"		"0"
@@ -885,8 +683,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"9"
+				"name"			"Cerbetica"
+				"tall"			"10"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -896,8 +694,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"9"
+				"name"			"Cerbetica"
+				"tall"			"10"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -907,7 +705,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"6"
 				"weight"		"0"
 				"additive"		"0"
@@ -918,7 +716,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"400"
 				"additive"		"0"
@@ -930,8 +728,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"name"			"Cerbetica"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1002,7 +800,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"500"
 				"additive"		"0"
@@ -1014,7 +812,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"16"
 				"weight"		"500"
 				"additive"		"0"
@@ -1072,7 +870,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"15"
 				"weight"		"700"
 				"antialias" 	"1"
@@ -1082,7 +880,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"15"
 				"weight"		"700"
 				"antialias" 	"1"
@@ -1092,7 +890,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"900"
 				"antialias" 	"1"
@@ -1101,7 +899,7 @@ Scheme
 			}
 			"4"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"21"
 				"weight"		"900"
 				"antialias" 	"1"
@@ -1110,7 +908,7 @@ Scheme
 			}
 			"5"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"weight"		"1000"
 				"antialias" 	"1"
@@ -1192,7 +990,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"500"
@@ -1203,7 +1001,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"500"
@@ -1215,7 +1013,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"900"
@@ -1226,7 +1024,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"900"
@@ -1238,7 +1036,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"16"
 				"antialias" 	"1"
 				"weight"		"900"
@@ -1273,7 +1071,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"500"
@@ -1283,8 +1081,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"name"			"Cerbetica"
+				"tall"			"12"
 				"antialias" 	"1"
 				"weight"		"500"
 			}
@@ -1293,7 +1091,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"antialias" 	"1"
 				"weight"		"500"
@@ -1316,7 +1114,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"28"
 				"antialias"		"1"
 				"custom"		"1" [$OSX]
@@ -1327,7 +1125,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"40"
 				"antialias"		"1"
 				"custom"		"1" [$OSX]
@@ -1338,7 +1136,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"antialias" 	"1"
 				"custom"		"1" [$OSX]
@@ -1349,7 +1147,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14" [!$OSX]
 				"tall"			"15" [$OSX]
 				"antialias"		"1"
@@ -1373,7 +1171,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"10"
 				"weight"		"400"
 				"additive"		"0"
@@ -1384,7 +1182,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"10"
 				"weight"		"400"
 				"additive"		"0"
@@ -1395,7 +1193,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"10"
 				"weight"		"500"
 				"range"			"0x0000 0x007F"
@@ -1407,7 +1205,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"20"
 				"weight"		"500"
 				"range"			"0x0000 0x007F"
@@ -1419,7 +1217,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"20"
 				"weight"		"500"
 				"range"			"0x0000 0x007F"
@@ -1431,7 +1229,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"500"
 				"range"			"0x0000 0x007F"
@@ -1443,7 +1241,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"500"
 				"range"			"0x0000 0x007F"
@@ -1455,7 +1253,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"34"
 				"weight"		"500"
 				"range"			"0x0000 0x007F"
@@ -1478,7 +1276,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"52"
 				"range" 		"0x0000 0x00FF"
 				"weight"		"400"
@@ -1487,7 +1285,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"72"
 				"range" 		"0x0000 0x00FF"
 				"weight"		"400"
@@ -1496,7 +1294,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"100"
 				"range" 		"0x0000 0x00FF"
 				"weight"		"400"
@@ -1505,7 +1303,7 @@ Scheme
 			}
 			"4"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"140"
 				"range" 		"0x0000 0x00FF"
 				"weight"		"400"
@@ -1514,7 +1312,7 @@ Scheme
 			}
 			"5"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"180"
 				"range" 		"0x0000 0x00FF"
 				"weight"		"400"
@@ -1527,7 +1325,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"36"
 				"weight"		"500"
 				"range"			"0x0000 0x007F"
@@ -1539,7 +1337,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"400"
 				"additive"		"0"
@@ -1550,7 +1348,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"20"
 				"weight"		"400"
 				"additive"		"0"
@@ -1562,7 +1360,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"400"
 				"additive"		"0"
@@ -1574,7 +1372,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"10"
 				"weight"		"400"
 				"additive"		"0"
@@ -1585,7 +1383,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"7"
 				"weight"		"400"
 				"additive"		"0"
@@ -1597,7 +1395,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"10"
 				"weight"		"400"
 				"additive"		"0"
@@ -1751,7 +1549,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"range" 		"0x0000 0x00FF"
 				"weight"		"300"
@@ -1763,7 +1561,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"500"
 				"range"			"0x0000 0x017F"
@@ -1775,8 +1573,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"8"
+				"name"			"Cerbetica"
+				"tall"			"10"
 				"weight"		"500"
 				"range"			"0x0000 0x017F"
 				"TextColor"		"Black"
@@ -1812,7 +1610,7 @@ Scheme
 			"1"
 			{
 				"name"			"Verdana"
-				"tall"			"11"	[!$OSX]
+				"tall"			"12"	[!$OSX]
 				"tall"			"9"		[$OSX]
 				"weight"		"800"
 				"additive"		"0"
@@ -1824,7 +1622,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"36"
 				"weight"		"500"
 			}
@@ -1833,7 +1631,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"30"
 				"weight"		"500"
 			}
@@ -1842,7 +1640,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"28"
 				"weight"		"500"
 			}
@@ -1851,7 +1649,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"22"
 				"weight"		"900"
 			}
@@ -1860,7 +1658,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"900"
 			}
@@ -1869,7 +1667,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"22"
 				"weight"		"500"
 			}
@@ -1878,7 +1676,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"500"
 			}
@@ -1916,7 +1714,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"36"
 				"weight"		"500"
 				"additive"		"0"
@@ -1927,8 +1725,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"name"			"Cerbetica"
+				"tall"			"12"
 				"weight"		"600"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1939,7 +1737,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"400"
 				"additive"		"0"
@@ -1951,7 +1749,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"900"
 				"antialias" 	"1"
@@ -1985,8 +1783,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"8"
+				"name"			"Cerbetica"
+				"tall"			"10"
 				"weight"		"400"
 				"additive"		"0"
 				"antialias"		"1"
@@ -2029,7 +1827,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"10"
 				"weight"		"500"
 				"additive"		"0"
@@ -2040,7 +1838,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
@@ -2051,7 +1849,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"500"
 				"additive"		"0"
@@ -2062,7 +1860,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"500"
 				"additive"		"0"
@@ -2073,8 +1871,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"8"
+				"name"			"Cerbetica"
+				"tall"			"10"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2084,8 +1882,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"8"
+				"name"			"Cerbetica"
+				"tall"			"10"
 				"antialias"		"1"
 				"weight"		"500"
 			}
@@ -2094,7 +1892,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"10"
 				"weight"		"500"
 				"additive"		"0"
@@ -2105,8 +1903,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"name"			"Cerbetica"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2116,7 +1914,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"500"
 				"additive"		"0"
@@ -2128,8 +1926,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"9"
+				"name"			"Cerbetica"
+				"tall"			"10"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias"		"1"
@@ -2139,8 +1937,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"9"
+				"name"			"Cerbetica"
+				"tall"			"10"
 				"weight"		"500"
 				"blur"			"3"
 				"additive"		"1"
@@ -2151,8 +1949,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"8"
+				"name"			"Cerbetica"
+				"tall"			"10"
 				"weight"		"0"
 				"additive"		"1"
 				"antialias" 	"1"
@@ -2510,8 +2308,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"name"			"Cerbetica"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2574,8 +2372,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"name"			"Cerbetica"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2585,7 +2383,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"500"
 				"additive"		"0"
@@ -2596,7 +2394,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"500"
 				"additive"		"0"
@@ -2607,7 +2405,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
@@ -2618,7 +2416,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"18"
 				"weight"		"500"
 				"additive"		"0"
@@ -2631,7 +2429,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"14"
 				"weight"		"500"
 				"additive"		"0"
@@ -2642,7 +2440,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
@@ -2654,7 +2452,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"15"
 				"weight"		"500"
 				"range"			"0x0000 0x007F"
@@ -2667,8 +2465,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"9"
+				"name"			"Cerbetica"
+				"tall"			"10"
 				"weight"		"400"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2679,8 +2477,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"name"			"Cerbetica"
+				"tall"			"12"
 				"weight"		"500"
 				"antialias" 	"1"
 				"custom"		"1"
@@ -2690,8 +2488,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"name"			"Cerbetica"
+				"tall"			"12"
 				"weight"		"500"
 				"blur"			"3"
 				"additive"		"1"
@@ -2703,7 +2501,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica"
 				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
@@ -2905,13 +2703,13 @@ Scheme
 		}
 		"8"
 		{
-			"font"	"resource/fonts/Cerbetica_bold.ttf"
-			"name"	"Cerbetica Bold"
+			"font"	"resource/fonts/Cerbetica.otf"
+			"name"	"Cerbetica"
 		}
 		"9"
 		{
-			"font"	"resource/fonts/Cerbetica_edited.ttf"
-			"name"	"Cerbetica_edited"
+			"font"	"resource/fonts/Cerbetica_bold.otf"
+			"name"	"Cerbetica_bold"
 		}
 	}
 }
\ No newline at end of file
-- 
cgit v1.2.3