diff --git a/resource/ui/hudobjectivekothtimepanel.res b/resource/ui/hudobjectivekothtimepanel.res index d1864b0..4639b3c 100644 --- a/resource/ui/hudobjectivekothtimepanel.res +++ b/resource/ui/hudobjectivekothtimepanel.res @@ -1,5 +1,26 @@ "Resource/UI/HudObjectiveKothTimePanel.res" { + "BlueClock" + { + "ControlName" "ScalableImagePanel" + "fieldName" "BlueClock" + "xpos" "2" + "ypos" "2" + "zpos" "3" + "wide" "16" + "tall" "16" + "visible" "1" + "enabled" "1" + + "image" "replay/thumbnails/game/clock_blue_noshadow" + "scaleImage" "1" + + "src_corner_height" "0" + "src_corner_width" "0" + "draw_corner_width" "0" + "draw_corner_height" "0" + } + "BlueTimer" { "ControlName" "CTFHudTimeStatus" @@ -11,7 +32,7 @@ "tall" "30" "visible" "1" "enabled" "1" - + "TimePanelValue" { "ControlName" "CExLabel" @@ -29,7 +50,28 @@ "labelText" "0:00" } } - + + "RedClock" + { + "ControlName" "ScalableImagePanel" + "fieldName" "RedClock" + "xpos" "2" + "ypos" "26" + "zpos" "3" + "wide" "16" + "tall" "16" + "visible" "1" + "enabled" "1" + + "image" "replay/thumbnails/game/clock_red_noshadow" + "scaleImage" "1" + + "src_corner_height" "0" + "src_corner_width" "0" + "draw_corner_width" "0" + "draw_corner_height" "0" + } + "RedTimer" { "ControlName" "CTFHudTimeStatus" @@ -41,7 +83,7 @@ "tall" "30" "visible" "1" "enabled" "1" - + "TimePanelValue" { "ControlName" "CExLabel" @@ -59,7 +101,7 @@ "labelText" "0:00" } } - + "ActiveTimerBG" { "ControlName" "EditablePanel" @@ -73,4 +115,4 @@ "enabled" "1" "border" "MaterialTransparent50" } -} +} \ No newline at end of file diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res index cc41f99..ea79ce0 100644 --- a/resource/ui/hudobjectivetimepanel.res +++ b/resource/ui/hudobjectivetimepanel.res @@ -1,29 +1,29 @@ "Resource/UI/HudObjectiveTimePanel.res" -{ +{ "TimePanelBG" { "ControlName" "CTFImagePanel" "fieldName" "TimePanelBG" "xpos" "2" - "ypos" "3" + "ypos" "2" "zpos" "2" - "wide" "15" - "tall" "15" + "wide" "16" + "tall" "16" "visible" "1" "enabled" "1" - + "image" "replay/thumbnails/game/clock_white" "scaleImage" "1" "teambg_1" "replay/thumbnails/game/clock_white" "teambg_2" "replay/thumbnails/game/clock_red" "teambg_3" "replay/thumbnails/game/clock_blue" - + "src_corner_height" "0" "src_corner_width" "0" "draw_corner_width" "0" "draw_corner_height" "0" } - + "ServerTimeLimitLabel" { "ControlName" "CExLabel" @@ -37,18 +37,16 @@ "enabled" "1" "labelText" "%servertimeleft%" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "wrap" "0" "font" "Size 10" "fgcolor" "White" - - if_mvm + + "if_mvm" { "visible" "0" } } - + "OvertimeLabel" { "ControlName" "CExLabel" @@ -65,8 +63,8 @@ "textAlignment" "west" "font" "Size 10" } - - + + //REMOVED "TimePanelProgressBar" { @@ -97,19 +95,19 @@ "ControlName" "CExLabel" "fieldName" "SuddenDeathLabel" "xpos" "9999" - } + } "SuddenDeathBG" { "ControlName" "CTFImagePanel" "fieldName" "SuddenDeathBG" "xpos" "9999" - } + } "SetupLabel" { "ControlName" "CExLabel" "fieldName" "SetupLabel" "xpos" "9999" - } + } "SetupBG" { "ControlName" "CTFImagePanel" @@ -121,5 +119,5 @@ "ControlName" "CTFImagePanel" "fieldName" "ServerTimeLimitLabelBG" "xpos" "9999" - } + } } \ No newline at end of file diff --git a/scripts/animations/misc.txt b/scripts/animations/misc.txt index ade0fff..99b4033 100644 --- a/scripts/animations/misc.txt +++ b/scripts/animations/misc.txt @@ -4,13 +4,13 @@ event FlagOutline { RunEvent FlagOutlineHide 0.0 Animate OutlineImage Alpha "255" Linear 0.1 0.2 - + Animate OutlineImage Position "c-50 r90" Linear 0.1 0.2 Animate OutlineImage Size "100 50" Linear 0.1 0.2 Animate OutlineImage Position "c-25 r0" Linear 0.7 0.2 Animate OutlineImage Size "50 25" Linear 0.7 0.2 - + Animate OutlineImage Alpha "0" Linear 0.9 0.1 } @@ -19,7 +19,7 @@ event FlagOutline event HudSpyDisguiseChanged { Animate PlayerStatusSpyOutlineImage Alpha "255" Linear 0.0 0.2 - + Animate PlayerStatusSpyOutlineImage Position "60 r160" Linear 0.0 0.2 Animate PlayerStatusSpyOutlineImage Size "100 100" Linear 0.0 0.2 @@ -30,7 +30,7 @@ event HudSpyDisguiseHide { Animate PlayerStatusSpyOutlineImage Position "0 r0" Linear 0.0 0.2 Animate PlayerStatusSpyOutlineImage Size "0 0" Linear 0.0 0.2 - + Animate PlayerStatusSpyOutlineImage Alpha "0" Linear 0.2 0.1 } @@ -76,42 +76,22 @@ event RDNegativeScorePulse //==================================================================================================================== -event HasNotificationsBlink -{ -} -event HasNotificationsBlinkStop -{ -} - -//==================================================================================================================== - -event TeamStatus_PlayerDead -{ -} -event TeamStatus_PlayerAlive -{ -} - -//==================================================================================================================== - -event CompetitiveGame_LowerChatWindow -{ -} -event CompetitiveGame_RestoreChatWindow -{ -} -event HudTournament_MoveChatWindow -{ -} - -//==================================================================================================================== - event HudSnapShotReminderIn { - RunEvent HudHealthDyingPulseStop 10.0 - RunEvent HudHealthBonusPulseStop 10.0 - RunEvent HudLowAmmoPulseStop 10.0 - RunEvent HudMedicChargedStop 10.0 + RunEvent HudHealthDyingPulseStop 10.0 + RunEvent HudHealthBonusPulseStop 10.0 + RunEvent HudLowAmmoPulseStop 10.0 + RunEvent HudMedicChargedStop 10.0 } -//==================================================================================================================== \ No newline at end of file +//==================================================================================================================== + +event HasNotificationsBlink{} +event HasNotificationsBlinkStop{} +event TeamStatus_PlayerDead{} +event TeamStatus_PlayerAlive{} +event CompetitiveGame_LowerChatWindow{} +event CompetitiveGame_RestoreChatWindow{} +event HudTournament_MoveChatWindow{} +event OvertimeLabelPulseRed{} +event SuddenDeathLabelPulseRed{}