2
mirror of https://gitlab.com/jessieh/doghud.git synced 2024-12-11 20:51:47 +00:00

Fix clock showing wrong color (upstream)

This commit is contained in:
Jessie Hildebrandt 2023-01-15 02:49:18 -05:00
parent 2ebc6fc006
commit e2333d18d6
3 changed files with 82 additions and 62 deletions

View File

@ -1,5 +1,26 @@
"Resource/UI/HudObjectiveKothTimePanel.res" "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" "BlueTimer"
{ {
"ControlName" "CTFHudTimeStatus" "ControlName" "CTFHudTimeStatus"
@ -11,7 +32,7 @@
"tall" "30" "tall" "30"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"TimePanelValue" "TimePanelValue"
{ {
"ControlName" "CExLabel" "ControlName" "CExLabel"
@ -29,7 +50,28 @@
"labelText" "0:00" "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" "RedTimer"
{ {
"ControlName" "CTFHudTimeStatus" "ControlName" "CTFHudTimeStatus"
@ -41,7 +83,7 @@
"tall" "30" "tall" "30"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"TimePanelValue" "TimePanelValue"
{ {
"ControlName" "CExLabel" "ControlName" "CExLabel"
@ -59,7 +101,7 @@
"labelText" "0:00" "labelText" "0:00"
} }
} }
"ActiveTimerBG" "ActiveTimerBG"
{ {
"ControlName" "EditablePanel" "ControlName" "EditablePanel"
@ -73,4 +115,4 @@
"enabled" "1" "enabled" "1"
"border" "MaterialTransparent50" "border" "MaterialTransparent50"
} }
} }

View File

@ -1,29 +1,29 @@
"Resource/UI/HudObjectiveTimePanel.res" "Resource/UI/HudObjectiveTimePanel.res"
{ {
"TimePanelBG" "TimePanelBG"
{ {
"ControlName" "CTFImagePanel" "ControlName" "CTFImagePanel"
"fieldName" "TimePanelBG" "fieldName" "TimePanelBG"
"xpos" "2" "xpos" "2"
"ypos" "3" "ypos" "2"
"zpos" "2" "zpos" "2"
"wide" "15" "wide" "16"
"tall" "15" "tall" "16"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"image" "replay/thumbnails/game/clock_white" "image" "replay/thumbnails/game/clock_white"
"scaleImage" "1" "scaleImage" "1"
"teambg_1" "replay/thumbnails/game/clock_white" "teambg_1" "replay/thumbnails/game/clock_white"
"teambg_2" "replay/thumbnails/game/clock_red" "teambg_2" "replay/thumbnails/game/clock_red"
"teambg_3" "replay/thumbnails/game/clock_blue" "teambg_3" "replay/thumbnails/game/clock_blue"
"src_corner_height" "0" "src_corner_height" "0"
"src_corner_width" "0" "src_corner_width" "0"
"draw_corner_width" "0" "draw_corner_width" "0"
"draw_corner_height" "0" "draw_corner_height" "0"
} }
"ServerTimeLimitLabel" "ServerTimeLimitLabel"
{ {
"ControlName" "CExLabel" "ControlName" "CExLabel"
@ -37,18 +37,16 @@
"enabled" "1" "enabled" "1"
"labelText" "%servertimeleft%" "labelText" "%servertimeleft%"
"textAlignment" "center" "textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"wrap" "0" "wrap" "0"
"font" "Size 10" "font" "Size 10"
"fgcolor" "White" "fgcolor" "White"
if_mvm "if_mvm"
{ {
"visible" "0" "visible" "0"
} }
} }
"OvertimeLabel" "OvertimeLabel"
{ {
"ControlName" "CExLabel" "ControlName" "CExLabel"
@ -65,8 +63,8 @@
"textAlignment" "west" "textAlignment" "west"
"font" "Size 10" "font" "Size 10"
} }
//REMOVED //REMOVED
"TimePanelProgressBar" "TimePanelProgressBar"
{ {
@ -97,19 +95,19 @@
"ControlName" "CExLabel" "ControlName" "CExLabel"
"fieldName" "SuddenDeathLabel" "fieldName" "SuddenDeathLabel"
"xpos" "9999" "xpos" "9999"
} }
"SuddenDeathBG" "SuddenDeathBG"
{ {
"ControlName" "CTFImagePanel" "ControlName" "CTFImagePanel"
"fieldName" "SuddenDeathBG" "fieldName" "SuddenDeathBG"
"xpos" "9999" "xpos" "9999"
} }
"SetupLabel" "SetupLabel"
{ {
"ControlName" "CExLabel" "ControlName" "CExLabel"
"fieldName" "SetupLabel" "fieldName" "SetupLabel"
"xpos" "9999" "xpos" "9999"
} }
"SetupBG" "SetupBG"
{ {
"ControlName" "CTFImagePanel" "ControlName" "CTFImagePanel"
@ -121,5 +119,5 @@
"ControlName" "CTFImagePanel" "ControlName" "CTFImagePanel"
"fieldName" "ServerTimeLimitLabelBG" "fieldName" "ServerTimeLimitLabelBG"
"xpos" "9999" "xpos" "9999"
} }
} }

View File

@ -4,13 +4,13 @@ event FlagOutline
{ {
RunEvent FlagOutlineHide 0.0 RunEvent FlagOutlineHide 0.0
Animate OutlineImage Alpha "255" Linear 0.1 0.2 Animate OutlineImage Alpha "255" Linear 0.1 0.2
Animate OutlineImage Position "c-50 r90" 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 Size "100 50" Linear 0.1 0.2
Animate OutlineImage Position "c-25 r0" Linear 0.7 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 Size "50 25" Linear 0.7 0.2
Animate OutlineImage Alpha "0" Linear 0.9 0.1 Animate OutlineImage Alpha "0" Linear 0.9 0.1
} }
@ -19,7 +19,7 @@ event FlagOutline
event HudSpyDisguiseChanged event HudSpyDisguiseChanged
{ {
Animate PlayerStatusSpyOutlineImage Alpha "255" Linear 0.0 0.2 Animate PlayerStatusSpyOutlineImage Alpha "255" Linear 0.0 0.2
Animate PlayerStatusSpyOutlineImage Position "60 r160" 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 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 Position "0 r0" Linear 0.0 0.2
Animate PlayerStatusSpyOutlineImage Size "0 0" Linear 0.0 0.2 Animate PlayerStatusSpyOutlineImage Size "0 0" Linear 0.0 0.2
Animate PlayerStatusSpyOutlineImage Alpha "0" Linear 0.2 0.1 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 event HudSnapShotReminderIn
{ {
RunEvent HudHealthDyingPulseStop 10.0 RunEvent HudHealthDyingPulseStop 10.0
RunEvent HudHealthBonusPulseStop 10.0 RunEvent HudHealthBonusPulseStop 10.0
RunEvent HudLowAmmoPulseStop 10.0 RunEvent HudLowAmmoPulseStop 10.0
RunEvent HudMedicChargedStop 10.0 RunEvent HudMedicChargedStop 10.0
} }
//==================================================================================================================== //====================================================================================================================
event HasNotificationsBlink{}
event HasNotificationsBlinkStop{}
event TeamStatus_PlayerDead{}
event TeamStatus_PlayerAlive{}
event CompetitiveGame_LowerChatWindow{}
event CompetitiveGame_RestoreChatWindow{}
event HudTournament_MoveChatWindow{}
event OvertimeLabelPulseRed{}
event SuddenDeathLabelPulseRed{}