From 46d248b5167f9c8794c3125146952fef08f86bcd Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Mon, 28 Dec 2020 13:46:03 -0500
Subject: Added Hypnotize's Icons

- Updated to Hypnotize's icon pack.
- Updated multiple files, removed unused code.
---
 resource/ui/hud_obj_tele_entrance.res | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

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

diff --git a/resource/ui/hud_obj_tele_entrance.res b/resource/ui/hud_obj_tele_entrance.res
index 5251c9c..397b4d1 100644
--- a/resource/ui/hud_obj_tele_entrance.res
+++ b/resource/ui/hud_obj_tele_entrance.res
@@ -63,10 +63,11 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"labelText"		"#Building_hud_tele_enter_not_built_360"
+			"labelText"		"#Building_hud_tele_enter_not_built"
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 	}
 
@@ -79,6 +80,7 @@
 		"wide"			"160"
 		"tall"			"30"
 		"visible"		"0"
+		"proportionaltoparent"	"1"
 
 		"Icon_Upgrade_1"
 		{
@@ -94,6 +96,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_1"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_2"
@@ -110,6 +113,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_2"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_3"
@@ -126,6 +130,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_3"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"AlertTray"
@@ -189,6 +194,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 
 		"BuildingPanel"
@@ -248,6 +254,7 @@
 			"wide"			"100"
 			"tall"			"30"
 			"visible"		"0"
+			"proportionaltoparent"	"1"
 
 			"TeleportedIcon"
 			{
@@ -260,9 +267,10 @@
 				"tall"			"10"
 				"visible"		"1"
 				"enabled"		"1"
+				"scaleImage"	"1"
 				"image"			"../hud/hud_obj_status_teleport_64"
 				"drawcolor"		"ProgressOffWhite"
-				"scaleImage"	"1"
+				"proportionaltoparent"	"1"
 			}
 
 			"ChargingPanel"
@@ -291,6 +299,7 @@
 					"textAlignment"	"Left"
 					"dulltext"		"0"
 					"brighttext"	"0"
+					"proportionaltoparent"	"1"
 				}
 			}
 
@@ -321,6 +330,7 @@
 					"textAlignment"	"center"
 					"dulltext"		"0"
 					"brighttext"	"0"
+					"proportionaltoparent"	"1"
 				}
 			}
 
@@ -338,6 +348,7 @@
 				"scaleImage"	"1"
 				"icon"			"ico_metal"
 				"iconColor"		"ProgressOffWhite"
+				"proportionaltoparent"	"1"
 			}
 
 			"Upgrade"
@@ -356,6 +367,7 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 		}
 	}
-- 
cgit v1.2.3


From e0f728581ba5d7ca0d7ea06b015c36e189993664 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Tue, 29 Dec 2020 21:00:35 -0500
Subject: Bug Fixes, see notes.

- Fixed the stock items checkbox not working on the backpack page.
- Fixed the cutoff description label on the confirmation panel.
- Fixed the font for the item series number being too large to display.
- Fixed the store preview page not allowing to change item color and style.
- Increased the size of the sentry gun's health on the building panel (#158)
- Fixed the KOTH timer not being centred properly.
- Miscellenaous other fixes and improvements.
---
 resource/ui/hud_obj_tele_entrance.res | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/resource/ui/hud_obj_tele_entrance.res b/resource/ui/hud_obj_tele_entrance.res
index 397b4d1..362201e 100644
--- a/resource/ui/hud_obj_tele_entrance.res
+++ b/resource/ui/hud_obj_tele_entrance.res
@@ -261,7 +261,7 @@
 				"ControlName"	"ImagePanel"
 				"fieldName"		"TeleportedIcon"
 				"xpos"			"0"
-				"ypos"			"0"
+				"ypos"			"8"
 				"zpos"			"1"
 				"wide"			"10"
 				"tall"			"10"
@@ -308,7 +308,7 @@
 				"ControlName"	"EditablePanel"
 				"fieldName"		"FullyChargedPanel"
 				"xpos"			"0"
-				"ypos"			"0"
+				"ypos"			"7"
 				"wide"			"100"
 				"tall"			"31"
 				"visible"		"0"
-- 
cgit v1.2.3