20171028 - Scream Fortress 2017 Update

- Updated for Scream Fortress 2017
- Updated the Main Menu design and backend
- Updated the version number
- Fixed inexplicable crashes following the Scream Fortress update
- Fixed incorrect image file being used during the loading screen
- Fixed the Phlogistinator, Thermal Thruster and Vita Saw meters
- Miscellaneous other fixes and tweaks
- Removed unused files, code and fonts
- Replaced the current crosshairs with KnuckleCrosses

1 files changed, 40 insertions, 35 deletions

diff --git a/resource/ui/huditemeffectmeter_organs.res b/resource/ui/huditemeffectmeter_organs.res
index 0e72079..97aeab6 100644
--- a/resource/ui/huditemeffectmeter_organs.res
+++ b/resource/ui/huditemeffectmeter_organs.res
@@ -5,17 +5,11 @@
 		"fieldName"		"HudItemEffectMeter"
 		"visible"		"1"
 		"enabled"		"1"
-		"x_offset"		"40"
-		"xpos"			"r174"	[$WIN32]
-		"ypos"			"r57"	[$WIN32]
-		"xpos_minmode"	"r52"	[$WIN32]
-		"ypos_minmode"	"r68"	[$WIN32]
-		"x_offset_minmode"		"0"	[$WIN32]
-		"xpos"			"r194"	[$X360]
-		"ypos"			"r124"	[$X360]
-		"wide"			"100"
-		"tall"			"50"
-		"MeterFG"		"White"
+		"xpos"			"c122"	
+		"ypos"			"374"
+		"wide"			"75"
+		"tall"			"20"
+		"MeterFG"		"TanLight"
 		"MeterBG"		"Gray"
 	}
 	
@@ -23,44 +17,38 @@
 	{
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"ItemEffectMeterBG"
-		"xpos"			"12"
-		"ypos"			"0"
+		"xpos"			"9999"
+		"ypos"			"9999"
 		"zpos"			"0"
 		"wide"			"100"
 		"tall"			"50"
 		"visible"		"1"
-		"visible_minmode"	"0"
 		"enabled"		"1"
 		"image"			"../hud/misc_ammo_area_horiz2_blue"
 		"scaleImage"	"1"	
 		"teambg_2"		"../hud/misc_ammo_area_horiz2_red"
-		"teambg_2_lodef"	"../hud/misc_ammo_area_red_lodef"
 		"teambg_3"		"../hud/misc_ammo_area_horiz2_blue"
-		"teambg_3_lodef"	"../hud/misc_ammo_area_blue_lodef"				
 	}
 	
 	"ItemEffectMeterLabel"
 	{
 		"ControlName"			"CExLabel"
 		"fieldName"				"ItemEffectMeterLabel"
-		"xpos"					"40"
-		"xpos_minmode"			"15"
-		"ypos"					"27"
-		"ypos_minmode"			"0"
+		"xpos"					"0"
+		"ypos"					"7"
 		"zpos"					"2"
-		"wide"					"41"
-		"tall"					"15"
+		"wide"					"40"
+		"tall"					"8"
 		"autoResize"			"1"
 		"pinCorner"				"2"
 		"visible"				"1"
-		"visible_minmode"		"1"
-		"textAlignment_minmode"			"west"
 		"enabled"				"1"
 		"tabPosition"			"0"
-		"textAlignment"			"center"
+		"textAlignment"			"east"
 		"dulltext"				"0"
 		"brighttext"			"0"
-		"font"					"TFFontSmall"
+		"font"					"CerbeticaBold12"
+		"fgcolor_override"		"White"
 	}
 
 	"ItemEffectMeter"
@@ -70,11 +58,8 @@
 		"font"					"Default"
 		"xpos"					"45"
 		"ypos"					"23"
-		"ypos_minmode"			"0"
-		"xpos_minmode"			"0"
 		"zpos"					"2"
 		"wide"					"30"
-		"wide_minmode"			"50"
 		"tall"					"5"				
 		"autoResize"			"0"
 		"pinCorner"				"0"
@@ -89,9 +74,8 @@
 	{
 		"ControlName"			"CExLabel"
 		"fieldName"				"ItemEffectMeterCount"
-		"xpos"					"40"
-		"xpos_minmode"			"12"
-		"ypos"					"10"
+		"xpos"					"46"
+		"ypos"					"0"
 		"zpos"					"2"
 		"wide"					"40"
 		"tall"					"20"	
@@ -100,9 +84,30 @@
 		"enabled"				"1"
 		"tabPosition"			"0"
 		"labelText"				"%progresscount%"
-		"textAlignment"			"north"
+		"textAlignment"			"west"
 		"dulltext"				"0"
 		"brighttext"			"0"
-		"font"					"HudFontMedium"
-	}	
+		"font"					"CerbeticaBold24"
+		"fgcolor"				"White"
+	}
+	"ItemEffectMeterCountBackground"
+	{
+		"ControlName"			"CExLabel"
+		"fieldName"				"ItemEffectMeterCountBackground"
+		"xpos"					"47"
+		"ypos"					"1"
+		"zpos"					"2"
+		"wide"					"40"
+		"tall"					"20"	
+		"pinCorner"				"2"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"%progresscount%"
+		"textAlignment"			"west"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"font"					"CerbeticaBold24"
+		"fgcolor"				"Black"
+	}
 }
\ No newline at end of file