From 90cc227c8033fc25ddeca41bbcb789195b874ae3 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Wed, 5 Aug 2020 15:56:46 -0400
Subject: Miscellenaous Tweaks

---
 resource/ui/objectivestatusescort.res | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

(limited to 'resource/ui/objectivestatusescort.res')

diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res
index 4838e16..c88eb19 100644
--- a/resource/ui/objectivestatusescort.res
+++ b/resource/ui/objectivestatusescort.res
@@ -413,8 +413,6 @@
 			"if_multiple_trains"
 			{
 				"xpos"		"9999"
-				"wide"		"5"
-				"tall"		"10"
 			}
 
 			"if_multiple_trains_top"
@@ -486,33 +484,31 @@
 
 			"if_multiple_trains"
 			{
-				"xpos"			"22"
-				"wide"			"8"
-				"tall"			"8"
+				"xpos"		"22"
 			}
 
 			"if_multiple_trains_top"
 			{
-				"ypos"			"46"
+				"ypos"		"46"
 			}
 
 			"if_multiple_trains_bottom"
 			{
-				"ypos"			"83"
+				"ypos"		"83"
 			}
 		}
 
 		"EscortTeardrop"
 		{
-			"ControlName"		"EditablePanel"
-			"fieldName"			"EscortTeardrop"
-			"xpos"				"9999"
-			"ypos"				"9999"
-			"zpos"				"10"
-			"wide"				"50"
-			"tall"				"42"
-			"visible"			"0"
-			"enabled"			"0"
+			"ControlName"	"EditablePanel"
+			"fieldName"		"EscortTeardrop"
+			"xpos"			"9999"
+			"ypos"			"9999"
+			"zpos"			"10"
+			"wide"			"50"
+			"tall"			"42"
+			"visible"		"0"
+			"enabled"		"0"
 
 			"if_multiple_trains"
 			{
@@ -536,10 +532,6 @@
 				"scaleImage"	"1"
 				"icon"			"cappoint_progressbar_teardrop"
 				"iconColor"		"White"
-
-				"if_multiple_trains"
-				{
-				}
 			}
 
 			"ProgressText"
-- 
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/ui/objectivestatusescort.res | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'resource/ui/objectivestatusescort.res')

diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res
index c88eb19..8187b87 100644
--- a/resource/ui/objectivestatusescort.res
+++ b/resource/ui/objectivestatusescort.res
@@ -430,9 +430,9 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"CapNumPlayers"
-			"font"			"Cerbetica8"
-			"xpos"			"31"
-			"ypos"			"78"
+			"font"			"CapPlayerFontSmall"
+			"xpos"			"32"
+			"ypos"			"79"
 			"zpos"			"5"
 			"wide"			"15"
 			"tall"			"8"
-- 
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/ui/objectivestatusescort.res | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'resource/ui/objectivestatusescort.res')

diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res
index 8187b87..8a211f8 100644
--- a/resource/ui/objectivestatusescort.res
+++ b/resource/ui/objectivestatusescort.res
@@ -510,14 +510,6 @@
 			"visible"		"0"
 			"enabled"		"0"
 
-			"if_multiple_trains"
-			{
-				"xpos"			"9999"
-				"ypos"			"9999"
-				"wide"			"65"
-				"tall"			"42"
-			}
-
 			"Teardrop"
 			{
 				"ControlName"	"CIconPanel"
@@ -527,7 +519,7 @@
 				"zpos"			"0"
 				"wide"			"34"
 				"tall"			"41"
-				"visible"		"1"
+				"visible"		"0"
 				"enabled"		"1"
 				"scaleImage"	"1"
 				"icon"			"cappoint_progressbar_teardrop"
-- 
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/ui/objectivestatusescort.res | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'resource/ui/objectivestatusescort.res')

diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res
index 8a211f8..63c45a5 100644
--- a/resource/ui/objectivestatusescort.res
+++ b/resource/ui/objectivestatusescort.res
@@ -229,7 +229,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"RecedeTime"
-			"font"			"Cerbetica8"
+			"font"			"Default"
 			"xpos"			"27"
 			"ypos"			"78"
 			"zpos"			"2"
-- 
cgit v1.2.3