Merge pull request #54 from CriticalFlaw/master

Version 2017.02.07 (Smissmas 2016 & Merge #52 Fixes)

9 files changed, 112 insertions, 160 deletions

diff --git a/resource/ClientScheme.res b/resource/ClientScheme.res
index 7054fb0..16c5116 100644
--- a/resource/ClientScheme.res
+++ b/resource/ClientScheme.res
@@ -2,6 +2,7 @@
 #base "scheme/clientscheme_colors.res"
 #base "scheme/clientscheme_fonts.res"
 #base "scheme/clientscheme_settings.res"
+#base "scheme/clientscheme_xhairs.res"
 
 Scheme
 {
diff --git a/resource/ui/ClassSelection.res b/resource/ui/ClassSelection.res
index fc8f4a2..deb43a5 100644
--- a/resource/ui/ClassSelection.res
+++ b/resource/ui/ClassSelection.res
@@ -123,7 +123,7 @@
 	{

 		"ControlName"		"CExImageButton"

 		"fieldName"			"scout"

-		"xpos"				"30"

+		"xpos"				"32"

 		"ypos"				"275"

 		"zpos"				"6"

 		"wide"				"100"

diff --git a/resource/ui/MainMenuOverride.res b/resource/ui/MainMenuOverride.res
index dafac1b..18d893d 100644
--- a/resource/ui/MainMenuOverride.res
+++ b/resource/ui/MainMenuOverride.res
@@ -2121,7 +2121,7 @@
 			"use_proportional_insets" "1"
 			"font"			"Cerbetica14"
 			"textAlignment"	"east"
-			"labelText"		"v2016.10.25"
+			"labelText"		"v2017.02.07"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
@@ -3092,12 +3092,12 @@
 			"image"			"glyph_bug"
 			"scaleImage"	"1"
 		}				
-	}		
+	}
 	
-	"WarButton"
+	"SettingsButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldName"		"WarButton"
+		"fieldName"		"SettingsButton"
 		"xpos"			"75"
 		"ypos"			"284"
 		"zpos"			"1"
@@ -3109,14 +3109,14 @@
 		"tabPosition"	"0"
 		"font"			"Cerbetica16"
 		"textAlignment"	"west"
-		"labelText"		"Pyro vs Heavy"
+		"labelText"		"Options"
 		"textinsetx"	"24"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"view_war"
+		"Command"		"OpenOptionsDialog"
 		
 		"border_default"	""
 		"border_armed"		"MainMenuTabs"
@@ -3131,6 +3131,7 @@
 		"depressedBgColor_override" "TransparentPanelBG"
 		
 		"image_drawcolor"	"117 107 94 255"
+		
 		"SubImage"
 		{
 			"ControlName"	"ImagePanel"
@@ -3144,15 +3145,15 @@
 			"enabled"		"1"
 			"scaleImage"	"1"
 			"image"			"glyph_options"
-		}						
-	}		
+		}			
+	}
 	
 	"TF2SettingsButton"
 	{
 		"ControlName"	"CExImageButton"
 		"fieldName"		"TF2SettingsButton"
 		"xpos"			"75"
-		"ypos"			"320"
+		"ypos"			"302"
 		"zpos"			"1"
 		"wide"			"220"
 		"tall"			"18"
@@ -3198,68 +3199,14 @@
 			"scaleImage"	"1"
 			"image"			"glyph_options"
 		}						
-	}		
-	
-	"SettingsButton"
-	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"SettingsButton"
-		"xpos"			"75"
-		"ypos"			"302"
-		"zpos"			"1"
-		"wide"			"220"
-		"tall"			"18"
-		"autoResize"	"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"font"			"Cerbetica16"
-		"textAlignment"	"west"
-		"labelText"		"Options"
-		"textinsetx"	"24"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"OpenOptionsDialog"
-		
-		"border_default"	""
-		"border_armed"		"MainMenuTabs"
-		"paintbackground"	"1"
-		
-		"defaultFgColor_override" "TanLight"
-		"armedFgColor_override" "TanLight"
-		"depressedFgColor_override" "TanLight"
-		
-		"defaultBgColor_override" "0 0 0 0"
-		"armedBgColor_override" "TransparentPanelBG"
-		"depressedBgColor_override" "TransparentPanelBG"
-		
-		"image_drawcolor"	"117 107 94 255"
-		
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"16"
-			"ypos"			"6"
-			"zpos"			"1"
-			"wide"			"0"
-			"tall"			"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"image"			"glyph_options"
-		}			
-	}
+	}	
 	
 	"ScoreboardToggle"
 	{
 		"ControlName"	"CExImageButton"
 		"fieldName"		"ScoreboardToggle"
 		"xpos"			"75"
-		"ypos"			"338"
+		"ypos"			"320"
 		"zpos"			"1"
 		"wide"			"220"
 		"tall"			"18"
@@ -3307,13 +3254,13 @@
 		}			
 	}
 	
-	"QuitButton"
+	"ConsoleButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldName"		"QuitButton"
+		"fieldName"		"ConsoleButton"
 		"xpos"			"75"
-		"ypos"			"392"
-		"zpos"			"1"
+		"ypos"			"338"
+		"zpos"			"11"
 		"wide"			"220"
 		"tall"			"18"
 		"autoResize"	"0"
@@ -3322,14 +3269,14 @@
 		"tabPosition"	"0"
 		"font"			"Cerbetica16"
 		"textAlignment"	"west"
-		"labelText"		"Quit"
+		"labelText"		"Console"
 		"textinsetx"	"24"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"engine replay_confirmquit"
+		"Command"		"engine toggleconsole"
 		
 		"border_default"	""
 		"border_armed"		"MainMenuTabs"
@@ -3365,7 +3312,7 @@
 		"ControlName"	"CExImageButton"
 		"fieldName"		"DemoUIButton"
 		"xpos"			"75"
-		"ypos"			"374"
+		"ypos"			"356"
 		"zpos"			"1"
 		"wide"			"220"
 		"tall"			"18"
@@ -3411,15 +3358,15 @@
 			"scaleImage"	"1"
 			"image"			"glyph_options"
 		}			
-	}		
-
-	"ConsoleButton"
+	}
+	
+	"QuitButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldName"		"ConsoleButton"
+		"fieldName"		"QuitButton"
 		"xpos"			"75"
-		"ypos"			"356"
-		"zpos"			"11"
+		"ypos"			"374"
+		"zpos"			"1"
 		"wide"			"220"
 		"tall"			"18"
 		"autoResize"	"0"
@@ -3428,14 +3375,14 @@
 		"tabPosition"	"0"
 		"font"			"Cerbetica16"
 		"textAlignment"	"west"
-		"labelText"		"Console"
+		"labelText"		"Quit"
 		"textinsetx"	"24"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"engine toggleconsole"
+		"Command"		"engine replay_confirmquit"
 		
 		"border_default"	""
 		"border_armed"		"MainMenuTabs"
@@ -3464,14 +3411,14 @@
 			"scaleImage"	"1"
 			"image"			"glyph_options"
 		}			
-	}		
+	}
 	
 	"DisconnectButton"
 	{
 		"ControlName"	"CExImageButton"
 		"fieldName"		"DisconnectButton"
 		"xpos"			"75"
-		"ypos"			"392"
+		"ypos"			"374"
 		"zpos"			"1"
 		"wide"			"220"
 		"tall"			"18"
diff --git a/resource/ui/econ/ItemModelPanel.res b/resource/ui/econ/ItemModelPanel.res
index 86fdb7b..d6561f3 100644
--- a/resource/ui/econ/ItemModelPanel.res
+++ b/resource/ui/econ/ItemModelPanel.res
@@ -74,6 +74,7 @@
 				"angles_x"		"10"
 				"angles_y"		"130"
 				"angles_z"		"0"
+				"spotlight"		"1"
 			}
 		}
 		
diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res
index 1fe6797..173f180 100644
--- a/resource/ui/econ/store/v2/storehome_base.res
+++ b/resource/ui/econ/store/v2/storehome_base.res
@@ -325,7 +325,7 @@
 		"xpos"				"c-230"
 		"ypos"				"8"
 		"zpos"				"0"
-		"wide"				"335"
+		"wide"				"430"
 		"tall"				"30"
 		"autoResize"		"0"
 		"pinCorner"			"0"
diff --git a/resource/ui/lobbycontainerframe.res b/resource/ui/lobbycontainerframe.res
index 9e4e8ff..6e3e7f1 100644
--- a/resource/ui/lobbycontainerframe.res
+++ b/resource/ui/lobbycontainerframe.res
@@ -61,7 +61,7 @@
 		"fillcolor"		"15 15 15 175"
 		"tileImage"		"1"
 	}			
-"BackgroundFooter"
+	"BackgroundFooter"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"BackgroundFooter"
@@ -151,6 +151,48 @@
 			"mouseinputenabled"	"1" 
 		}
 	}
+	
+	"OptionsButton"
+	{
+		"ControlName"	"CExImageButton"
+		"fieldName"		"OptionsButton"
+		"xpos"			"c275"
+		"ypos"			"10"
+		"zpos"			"100"
+		"wide"			"20"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+		"labelText"		""
+		"font"			"HudFontSmallBold"
+		"textAlignment"	"center"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"default"		"0"
+		"Command"		"options"
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+
+		"image_drawcolor"	"ColorWhite"
+		"image_armedcolor"	"ColorWhite"
+		"SubImage"
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"SubImage"
+			"xpos"			"2"
+			"ypos"			"2"
+			"zpos"			"1"
+			"wide"			"16"
+			"tall"			"16"
+			"visible"		"1"
+			"enabled"		"1"
+			"image"			"glyph_options"
+			"scaleImage"	"1"
+		}
+	}
 
 	"BackButton"
 	{
diff --git a/scripts/HudAnimations_custom.txt b/scripts/HudAnimations_custom.txt
index 8485b9d..8b068e0 100644
--- a/scripts/HudAnimations_custom.txt
+++ b/scripts/HudAnimations_custom.txt
@@ -1,49 +1,3 @@
-// sample animation script
-//
-//
-// commands:
-//	Animate <panel name> <variable> <target value> <interpolator> <start time> <duration>
-//		variables:
-//			FgColor
-//			BgColor
-//			Position
-//			Size
-//			Blur		(hud panels only)
-//			TextColor	(hud panels only)
-//			Ammo2Color	(hud panels only)
-//			Alpha		(hud weapon selection only)
-//			SelectionAlpha  (hud weapon selection only)
-//			TextScan	(hud weapon selection only)
-//
-//		interpolator:
-//			Linear
-//			Accel - starts moving slow, ends fast
-//			Deaccel - starts moving fast, ends slow
-//			Spline - simple ease in/out curve
-//			Pulse - < freq > over the duration, the value is pulsed (cosine) freq times ending at the dest value (assuming freq is integral)
-//			Flicker - < randomness factor 0.0 to 1.0 > over duration, each frame if random # is less than factor, use end value, otherwise use prev value
-//			Gain - < bias > Lower bias values bias towards 0.5 and higher bias values bias away from it.
-//			Bias - < bias > Lower values bias the curve towards 0 and higher values bias it towards 1.
-//
-//	RunEvent <event name> <start time>
-//		starts another even running at the specified time
-//
-//	StopEvent <event name> <start time>
-//		stops another event that is current running at the specified time
-//
-//	StopAnimation <panel name> <variable> <start time>
-//		stops all animations refering to the specified variable in the specified panel
-//
-//	StopPanelAnimations <panel name> <start time>
-//		stops all active animations operating on the specified panel
-//
-//  SetFont <panel name> <fontparameter> <fontname from scheme> <set time> 
-//
-//	SetTexture <panel name> <textureidname> <texturefilename> <set time>
-//
-//  SetString <panel name> <string varname> <stringvalue> <set time>
-
-//===========================================
 //Health Bonus Pulse
 event HudHealthBonusPulse
 {
@@ -168,42 +122,49 @@ event HudSpyDisguiseFadeOut
 
 event HudMedicCharged
 {
-
-///////Rainbow Charge
-//	Animate	ChargeLabel 	FgColor		"ColorGreen"		Linear 0.0 0.1
-//	Animate	ChargeLabel 	FgColor		"ColorCyan"			Linear 0.1 0.1
-//	Animate	ChargeLabel 	FgColor		"ColorBlue"			Linear 0.2 0.1
-//	Animate	ChargeLabel 	FgColor		"ColorMagenta"		Linear 0.3 0.1
-//	Animate	ChargeLabel 	FgColor		"ColorRed"			Linear 0.4 0.1
-//	Animate	ChargeLabel 	FgColor		"ColorYellow"		Linear 0.5 0.1
-	
-///////Solid Color Charge
-//	Animate ChargeLabel	FgColor		"Solid Color Uber"	Linear 0.0 0.000
-	
-///////Orange Pulse Charge
-
-	Animate	ChargeLabel 	FgColor		"Flashing Uber Color1"			Linear 0.0 0.3
-	Animate	ChargeLabel 	FgColor		"Flashing Uber Color2"		Linear 0.3 0.3
+	//RunEvent HudMedicRainbowCharged 0.0
+	//RunEvent HudMedicSolidColorCharge 0.0
+	RunEvent HudMedicOrangePulseCharge 0.0
 	
+	RunEvent HudMedicChargedLoop	0.6
+}
 
+event HudMedicRainbowCharged
+{
+	Animate	ChargeLabel 	FgColor		"ColorGreen"		Linear 0.0 0.1
+	Animate	ChargeLabel 	FgColor		"ColorCyan"			Linear 0.1 0.1
+	Animate	ChargeLabel 	FgColor		"ColorBlue"			Linear 0.2 0.1
+	Animate	ChargeLabel 	FgColor		"ColorMagenta"		Linear 0.3 0.1
+	Animate	ChargeLabel 	FgColor		"ColorRed"			Linear 0.4 0.1
+	Animate	ChargeLabel 	FgColor		"ColorYellow"		Linear 0.5 0.1
 
+	Animate	ChargeMeter 	FgColor		"ColorGreen"		Linear 0.0 0.1
+	Animate	ChargeMeter 	FgColor		"ColorCyan"			Linear 0.1 0.1
+	Animate	ChargeMeter 	FgColor		"ColorBlue"			Linear 0.2 0.1
+	Animate	ChargeMeter 	FgColor		"ColorMagenta"		Linear 0.3 0.1
+	Animate	ChargeMeter 	FgColor		"ColorRed"			Linear 0.4 0.1
+	Animate	ChargeMeter 	FgColor		"ColorYellow"		Linear 0.5 0.1
 
-///////Rainbow Charge	
-//	Animate	ChargeMeter 	FgColor		"ColorGreen"		Linear 0.0 0.1
-//	Animate	ChargeMeter 	FgColor		"ColorCyan"			Linear 0.1 0.1
-//	Animate	ChargeMeter 	FgColor		"ColorBlue"			Linear 0.2 0.1
-//	Animate	ChargeMeter 	FgColor		"ColorMagenta"		Linear 0.3 0.1
-//	Animate	ChargeMeter 	FgColor		"ColorRed"			Linear 0.4 0.1
-//	Animate	ChargeMeter 	FgColor		"ColorYellow"		Linear 0.5 0.1
+	RunEvent HudMedicChargedLoop	0.6
+}
 
-///////Solid Color Charge
-//	Animate ChargeMeter	FgColor		"Solid Color Uber"	Linear 0.0 0.000
+event HudMedicSolidColorCharge
+{
+	Animate ChargeLabel	FgColor		"Solid Color Uber"	Linear 0.0 0.000
 	
-///////Orange Pulse Charge
+	Animate ChargeMeter	FgColor		"Solid Color Uber"	Linear 0.0 0.000
 
-	Animate	ChargeMeter 	FgColor		"Flashing Uber Color1"			Linear 0.0 0.3
-	Animate	ChargeMeter 	FgColor		"Flashing Uber Color2"			Linear 0.3 0.3
+	RunEvent HudMedicChargedLoop	0.6
+}
 
+event HudMedicOrangePulseCharge
+{
+	Animate	ChargeLabel 	FgColor		"Flashing Uber Color1"		Linear 0.0 0.3
+	Animate	ChargeLabel 	FgColor		"Flashing Uber Color2"		Linear 0.3 0.3
+
+	Animate	ChargeMeter 	FgColor		"Flashing Uber Color1"		Linear 0.0 0.3
+	Animate	ChargeMeter 	FgColor		"Flashing Uber Color2"		Linear 0.3 0.3
+	
 	RunEvent HudMedicChargedLoop	0.6
 }
 
diff --git a/scripts/HudAnimations_manifest.txt b/scripts/HudAnimations_manifest.txt
index 06b08c3..b1030c1 100644
--- a/scripts/HudAnimations_manifest.txt
+++ b/scripts/HudAnimations_manifest.txt
@@ -1,6 +1,6 @@
 hudanimations_manifest
 {
 	"file"		"scripts/hudanimations.txt"
-	"file"		"scripts/hudanimations_tf.txt"
 	"file"		"scripts/HudAnimations_custom.txt"
+	"file"		"scripts/hudanimations_tf.txt"
 }
\ No newline at end of file
diff --git a/sound/sound.cache b/sound/sound.cache
new file mode 100644
index 0000000..96a982a
--- /dev/null
+++ b/sound/sound.cache