From 5e34bbd6ae9371fddf0d2677fd66d1ae30b26306 Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Thu, 3 Nov 2016 10:10:39 -0600 Subject: Fixed hudanimations load order --- scripts/HudAnimations_manifest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') 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 -- cgit v1.2.3 From 3a7caec6eb592e5a0aea35b8b65f1eedd25a8070 Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Thu, 3 Nov 2016 10:12:38 -0600 Subject: Updated Ubercharge Animations Each of the three avaliable ubercharge color schemes (orange pulse, solid and rainbow) are now in their own event that can be called by uncommenting the appropriate RunEvent line in HudMedicCharged --- scripts/HudAnimations_custom.txt | 109 +++++++++++++-------------------------- 1 file changed, 35 insertions(+), 74 deletions(-) (limited to 'scripts') 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 -// 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 -// starts another even running at the specified time -// -// StopEvent -// stops another event that is current running at the specified time -// -// StopAnimation -// stops all animations refering to the specified variable in the specified panel -// -// StopPanelAnimations -// stops all active animations operating on the specified panel -// -// SetFont -// -// SetTexture -// -// SetString - -//=========================================== //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 } -- cgit v1.2.3 From 3cc11611692a4200b59824ff5c8163fe4ef44a52 Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Mon, 5 Dec 2016 11:12:59 -0700 Subject: Removed Heavy vs Pyro Button --- scripts/hudlayout.res | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res index c18d76a..bad605e 100644 --- a/scripts/hudlayout.res +++ b/scripts/hudlayout.res @@ -175,8 +175,8 @@ { "controlName" "CExLabel" "fieldName" "ThinCircle" - "visible" "0" - "enabled" "0" + "visible" "1" + "enabled" "1" "zpos" "2" "xpos" "c-100" -- cgit v1.2.3 From 92bb7879ee57ea6660fc0b2eacad879d14196c14 Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Mon, 5 Dec 2016 11:13:58 -0700 Subject: Fixed ThinCircle xHair being enabled --- scripts/hudlayout.res | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res index bad605e..c18d76a 100644 --- a/scripts/hudlayout.res +++ b/scripts/hudlayout.res @@ -175,8 +175,8 @@ { "controlName" "CExLabel" "fieldName" "ThinCircle" - "visible" "1" - "enabled" "1" + "visible" "0" + "enabled" "0" "zpos" "2" "xpos" "c-100" -- cgit v1.2.3