diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res index 0a3dc160..087e716a 100644 --- a/resource/scheme/clientscheme_fonts.res +++ b/resource/scheme/clientscheme_fonts.res @@ -137,15 +137,6 @@ Scheme "antialias" "1" } } - "Symbols 64" - { - "1" - { - "name" "hypnotize_icons" - "tall" "64" - "antialias" "1" - } - } // DEFAULT "Default" @@ -2778,10 +2769,5 @@ Scheme "15" "resource/linux_fonts/liberationsans-bold.ttf" "16" "resource/linux_fonts/liberationmono-regular.ttf" "17" "resource/linux_fonts/firasans-regular.ttf" - "18" - { - "font" "resource/fonts/hypnotize_icons.ttf" - "name" "hypnotize_icons" - } } } diff --git a/resource/scheme/clientscheme_icons.res b/resource/scheme/clientscheme_icons.res index ec43d899..24b3fd42 100644 --- a/resource/scheme/clientscheme_icons.res +++ b/resource/scheme/clientscheme_icons.res @@ -58,6 +58,16 @@ Scheme "antialias" "1" } } + + "Symbols64" + { + "1" + { + "name" "hypnotize_icons" + "tall" "64" + "antialias" "1" + } + } } CustomFontFiles @@ -67,5 +77,10 @@ Scheme "font" "resource/fonts/icons.ttf" "name" "TF2Icons" } + "122" + { + "font" "resource/fonts/hypnotize_icons.ttf" + "name" "hypnotize_icons" + } } -} \ No newline at end of file +} diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res index 57e4abd0..5b7990c5 100644 --- a/resource/ui/econ/backpackpanel.res +++ b/resource/ui/econ/backpackpanel.res @@ -162,7 +162,7 @@ "labelText" ">>" "textAlignment" "west" "xpos" "c-290" - "ypos" "12" + "ypos" "15" "zpos" "1" "wide" "20" "tall" "16" @@ -1486,4 +1486,4 @@ "fgcolor_override" "LightRed" } } -} \ No newline at end of file +} diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res index cf893d58..238b04af 100644 --- a/resource/ui/econ/tradingstartdialog.res +++ b/resource/ui/econ/tradingstartdialog.res @@ -117,7 +117,7 @@ "wide" "400" "tall" "180" "PaintBackgroundType" "0" - + "QueryLabel" { "ControlName" "CExLabel" @@ -135,7 +135,7 @@ "visible" "0" "enabled" "1" "fgcolor_override" "HudOffWhite" - } + } "subbutton0" { @@ -152,7 +152,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "R" - "font" "Symbols 64" + "font" "Symbols64" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -167,6 +167,7 @@ "pin_corner_to_sibling" "PIN_TOPRIGHT" "pin_to_sibling_corner" "PIN_TOPLEFT" } + "sublabel0" { "ControlName" "CExLabel" @@ -192,6 +193,7 @@ "pin_corner_to_sibling" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_BOTTOMLEFT" } + "subbutton1" { "ControlName" "CExButton" @@ -207,7 +209,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "u" - "font" "Symbols 64" + "font" "Symbols64" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -218,6 +220,7 @@ "paintbackground" "0" } + "sublabel1" { "ControlName" "CExLabel" @@ -243,6 +246,7 @@ "pin_corner_to_sibling" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_BOTTOMLEFT" } + "subbutton2" { "ControlName" "CExButton" @@ -258,7 +262,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "p" - "font" "Symbols 64" + "font" "Symbols64" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -273,6 +277,7 @@ "pin_corner_to_sibling" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_TOPRIGHT" } + "sublabel2" { "ControlName" "CExLabel" diff --git a/resource/ui/surveypanel_base.res b/resource/ui/surveypanel_base.res index f5b989a1..ddd8b944 100644 --- a/resource/ui/surveypanel_base.res +++ b/resource/ui/surveypanel_base.res @@ -141,13 +141,13 @@ "dulltext" "0" "brighttext" "0" "default" "0" - "sound_depressed" "UI/buttonclick.wav" - "sound_released" "UI/buttonclickrelease.wav" "Command" "close" "proportionaltoparent" "1" "actionsignallevel" "1" - "paintbackground" "0" + + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" "defaultFgColor_override" "TanLight" "armedFgColor_override" "LightRed" diff --git a/scripts/hudanimations_custom.txt b/scripts/hudanimations_custom.txt index b8080721..3f0202c0 100644 --- a/scripts/hudanimations_custom.txt +++ b/scripts/hudanimations_custom.txt @@ -4,19 +4,19 @@ event HudHealthBonusPulse Animate PlayerStatusHealthBonusImage Alpha "255" Linear 0.0 0.2 Animate PlayerStatusHealthBonusImage Alpha "0" Linear 0.2 0.4 - Animate PlayerHealthValue FgColor "Health Buff" Accel 0.0 0.0 - Animate TargetHealthValue FgColor "Health Buff" Accel 0.0 0.0 + Animate PlayerHealthValue FgColor "Health Buff" Accel 0.0 0.0 + Animate TargetHealthValue FgColor "Health Buff" Accel 0.0 0.0 - RunEvent HudHealthBonusPulseLoop 0.4 + RunEvent HudHealthBonusPulseLoop 0.4 } event HudHealthBonusPulseStop { - StopEvent HudHealthBonusPulse 0.0 - StopEvent HudHealthBonusPulseLoop 0.0 + StopEvent HudHealthBonusPulse 0.0 + StopEvent HudHealthBonusPulseLoop 0.0 - Animate PlayerHealthValue FgColor "Health Normal" Accel 0.0 0.0 - Animate TargetHealthValue FgColor "Health Normal" Accel 0.0 0.0 + Animate PlayerHealthValue FgColor "Health Normal" Accel 0.0 0.0 + Animate TargetHealthValue FgColor "Health Normal" Accel 0.0 0.0 } //================================================================================== @@ -26,153 +26,153 @@ event HudHealthDyingPulse Animate PlayerStatusHealthBonusImage Alpha "255" Linear 0.0 0.2 Animate PlayerStatusHealthBonusImage Alpha "0" Linear 0.2 0.2 - Animate PlayerHealthValue FgColor "Health Hurt" Accel 0.0 0.0 - Animate TargetHealthValue FgColor "Health Hurt" Accel 0.0 0.0 + Animate PlayerHealthValue FgColor "Health Hurt" Accel 0.0 0.0 + Animate TargetHealthValue FgColor "Health Hurt" Accel 0.0 0.0 - RunEvent HudHealthDyingPulseLoop 0.4 + RunEvent HudHealthDyingPulseLoop 0.4 } event HudHealthDyingPulseStop { - StopEvent HudHealthDyingPulse 0.0 - StopEvent HudHealthDyingPulseLoop 0.0 + StopEvent HudHealthDyingPulse 0.0 + StopEvent HudHealthDyingPulseLoop 0.0 - Animate PlayerHealthValue FgColor "Health Normal" Accel 0.0 0.0 - Animate TargetHealthValue FgColor "Health Normal" Accel 0.0 0.0 + Animate PlayerHealthValue FgColor "Health Normal" Accel 0.0 0.0 + Animate TargetHealthValue FgColor "Health Normal" Accel 0.0 0.0 } //================================================================================== // Low Ammo Pulse event HudLowAmmoPulse { - Animate HudWeaponLowAmmoImage Alpha "255" Linear 0.0 0.075 - Animate HudWeaponLowAmmoImage Alpha "0" Linear 0.125 0.075 + Animate HudWeaponLowAmmoImage Alpha "255" Linear 0.0 0.075 + Animate HudWeaponLowAmmoImage Alpha "0" Linear 0.125 0.075 - Animate AmmoInClip FgColor "Ammo In Clip Low" Linear 0.0 0.0 - Animate AmmoInReserve FgColor "Ammo In Reserve Low" Linear 0.0 0.0 - Animate AmmoNoClip FgColor "Ammo In Clip Low" Linear 0.0 0.0 + Animate AmmoInClip FgColor "Ammo In Clip Low" Linear 0.0 0.0 + Animate AmmoInReserve FgColor "Ammo In Reserve Low" Linear 0.0 0.0 + Animate AmmoNoClip FgColor "Ammo In Clip Low" Linear 0.0 0.0 - RunEvent HudLowAmmoPulseLoop 0.4 + RunEvent HudLowAmmoPulseLoop 0.4 } event HudLowAmmoPulseStop { - StopEvent HudLowAmmoPulse 0.0 - StopEvent HudLowAmmoPulseLoop 0.0 + StopEvent HudLowAmmoPulse 0.0 + StopEvent HudLowAmmoPulseLoop 0.0 - Animate AmmoInClip FgColor "Ammo In Clip" Accel 0.0 0.0 - Animate AmmoInReserve FgColor "Ammo In Reserve" Accel 0.0 0.0 - Animate AmmoNoClip FgColor "Ammo In Clip" Accel 0.0 0.0 + Animate AmmoInClip FgColor "Ammo In Clip" Accel 0.0 0.0 + Animate AmmoInReserve FgColor "Ammo In Reserve" Accel 0.0 0.0 + Animate AmmoNoClip FgColor "Ammo In Clip" Accel 0.0 0.0 } //================================================================================== // Ubercharge Meters event HudMedicCharged { - RunEvent HudMedicOrangePulseCharge 0.0 -// RunEvent HudMedicSolidColorCharge 0.0 -// RunEvent HudMedicRainbowCharged 0.0 + RunEvent HudMedicOrangePulseCharge 0.0 +// RunEvent HudMedicSolidColorCharge 0.0 +// RunEvent HudMedicRainbowCharged 0.0 - RunEvent HudMedicChargedLoop 0.6 + 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 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 + 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 + RunEvent HudMedicChargedLoop 0.6 } event HudMedicSolidColorCharge { - Animate ChargeLabel FgColor "Solid Color Uber" Linear 0.0 0.0 + Animate ChargeLabel FgColor "Solid Color Uber" Linear 0.0 0.0 - Animate ChargeMeter FgColor "Solid Color Uber" Linear 0.0 0.0 + Animate ChargeMeter FgColor "Solid Color Uber" Linear 0.0 0.0 - RunEvent HudMedicChargedLoop 0.6 + RunEvent HudMedicChargedLoop 0.6 } event HudMedicOrangePulseCharge { - Animate ChargeLabel FgColor "Flashing Uber Color1" Linear 0.0 0.1 - Animate ChargeLabel FgColor "Flashing Uber Color2" Linear 0.3 0.4 + Animate ChargeLabel FgColor "Flashing Uber Color1" Linear 0.0 0.1 + Animate ChargeLabel FgColor "Flashing Uber Color2" Linear 0.3 0.4 - Animate ChargeMeter FgColor "Flashing Uber Color1" Linear 0.0 0.1 - Animate ChargeMeter FgColor "Flashing Uber Color2" Linear 0.3 0.4 + Animate ChargeMeter FgColor "Flashing Uber Color1" Linear 0.0 0.1 + Animate ChargeMeter FgColor "Flashing Uber Color2" Linear 0.3 0.4 - RunEvent HudMedicChargedLoop 0.6 + RunEvent HudMedicChargedLoop 0.6 } event HudMedicChargedStop { - StopEvent HudMedicCharged 0.0 - StopEvent HudMedicRainbowCharged 0.0 - StopEvent HudMedicSolidColorCharge 0.0 - StopEvent HudMedicOrangePulseCharge 0.0 - StopEvent HudMedicChargedLoop 0.0 + StopEvent HudMedicCharged 0.0 + StopEvent HudMedicRainbowCharged 0.0 + StopEvent HudMedicSolidColorCharge 0.0 + StopEvent HudMedicOrangePulseCharge 0.0 + StopEvent HudMedicChargedLoop 0.0 - Animate ChargeMeter FgColor "Uber Bar Color" Linear 0.0 0.0001 - Animate ChargeLabel FgColor "Ammo In Clip" Linear 0.0 0.0001 + Animate ChargeMeter FgColor "Uber Bar Color" Linear 0.0 0.0001 + Animate ChargeLabel FgColor "Ammo In Clip" Linear 0.0 0.0001 } //================================================================================== // Spy Disguise event HudSpyDisguiseFadeIn { - RunEvent HudSpyDisguiseChanged 0.0 - Animate PlayerStatusSpyImage Alpha "255" Linear 0.9 0.1 + RunEvent HudSpyDisguiseChanged 0.0 + Animate PlayerStatusSpyImage Alpha "255" Linear 0.9 0.1 } event HudSpyDisguiseFadeOut { - RunEvent HudSpyDisguiseChanged 0.0 - Animate PlayerStatusSpyImage Alpha "0" Linear 0.9 0.1 + RunEvent HudSpyDisguiseChanged 0.0 + Animate PlayerStatusSpyImage Alpha "0" Linear 0.9 0.1 } event HudSpyDisguiseChanged { - Animate PlayerStatusSpyOutlineImage Alpha "200" Linear 0.0 0.2 - Animate PlayerStatusSpyOutlineImage Position "r155 r185" Linear 0.0 0.2 - Animate PlayerStatusSpyOutlineImage Size "150 150" Linear 0.0 0.2 + Animate PlayerStatusSpyOutlineImage Alpha "200" Linear 0.0 0.2 + Animate PlayerStatusSpyOutlineImage Position "r155 r185" Linear 0.0 0.2 + Animate PlayerStatusSpyOutlineImage Size "150 150" Linear 0.0 0.2 - RunEvent HudSpyDisguiseHide 0.7 + RunEvent HudSpyDisguiseHide 0.7 } event HudSpyDisguiseHide { - Animate PlayerStatusSpyOutlineImage Position "r185 r55" Linear 0.0 0.2 - Animate PlayerStatusSpyOutlineImage Size "55 55" Linear 0.0 0.2 + Animate PlayerStatusSpyOutlineImage Position "r185 r55" Linear 0.0 0.2 + Animate PlayerStatusSpyOutlineImage Size "55 55" Linear 0.0 0.2 - Animate PlayerStatusSpyOutlineImage Alpha "0" Linear 0.2 0.1 + Animate PlayerStatusSpyOutlineImage Alpha "0" Linear 0.2 0.1 } //================================================================================== event CompetitiveGame_RestoreChatWindow { // Fix stuck animations - RunEvent HudHealthDyingPulseStop 0.1 - RunEvent HudHealthBonusPulseStop 0.1 - RunEvent HudLowAmmoPulseStop 0.1 - RunEvent HudMedicChargedStop 0.1 + RunEvent HudHealthDyingPulseStop 0.1 + RunEvent HudHealthBonusPulseStop 0.1 + RunEvent HudLowAmmoPulseStop 0.1 + RunEvent HudMedicChargedStop 0.1 } //================================================================================== event TrainingHudBounce { - Animate ObjectiveStatusTraining Position "c-160 r167" Linear 0 0 - Animate ObjectiveStatusTraining Position "c-160 r107" Bounce 0.0 2.0 + Animate ObjectiveStatusTraining Position "c-160 r167" Linear 0 0 + Animate ObjectiveStatusTraining Position "c-160 r107" Bounce 0.0 2.0 } //================================================================================== @@ -189,14 +189,14 @@ event TeamStatus_PlayerAlive event HudTournamentSetupPanelOpen { - Animate HudTournamentSetup Position "c-95 -70" Linear 0.0 0.001 - Animate HudTournamentSetup Position "c-95 70" Spline 0.001 0.2 + Animate HudTournamentSetup Position "c-95 -70" Linear 0.0 0.001 + Animate HudTournamentSetup Position "c-95 70" Spline 0.001 0.2 } event HudTournamentSetupPanelClose { - Animate HudTournamentSetup Position "c-95 70" Linear 0.0 0.001 - Animate HudTournamentSetup Position "c-95 -70" Spline 0.001 0.2 + Animate HudTournamentSetup Position "c-95 70" Linear 0.0 0.001 + Animate HudTournamentSetup Position "c-95 -70" Spline 0.001 0.2 } //==================================================================================