jessieh/doghud
jessieh/doghud
1
Fork 0
mirror of https://gitlab.com/jessieh/doghud.git synced 2024-09-19 13:41:46 +00:00
Code Releases Activity

Improve CTF UI (upstream)

Browse Source
This commit is contained in:
Jessie Hildebrandt 2023-01-15 02:47:13 -05:00
parent 56c230b625
commit 2ebc6fc006
2 changed files with 134 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
resource/ui/flagstatus.res
View File

@ -4,21 +4,20 @@
{ {
"ControlName" "CTFArrowPanel" "ControlName" "CTFArrowPanel"
"fieldName" "Arrow" "fieldName" "Arrow"
"xpos" "40" "xpos" "cs-0.5"
"ypos" "-5" "ypos" "cs-0.5"
"zpos" "1" "zpos" "1"
"wide" "35" "wide" "f0"
"tall" "35" "tall" "f0"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"scaleImage" "1" "scaleImage" "1"
"proportionaltoparent" "1"
"if_mvm" "if_mvm"
{ {
"xpos" "38" "wide" "40"
"ypos" "-15" "tall" "40"
"wide" "45"
"tall" "45"
} }
} }
@ -26,8 +25,8 @@
{ {
"ControlName" "CTFImagePanel" "ControlName" "CTFImagePanel"
"fieldName" "Briefcase" "fieldName" "Briefcase"
"xpos" "68" "xpos" "cs-0.5"
"ypos" "34" "ypos" "cs-0.5"
"zpos" "2" "zpos" "2"
"wide" "0" "wide" "0"
"tall" "0" "tall" "0"
@ -35,19 +34,12 @@
"enabled" "1" "enabled" "1"
"image" "../hud/objectives_flagpanel_briefcase" "image" "../hud/objectives_flagpanel_briefcase"
"scaleImage" "1" "scaleImage" "1"
"proportionaltoparent" "1"
"if_mvm" "if_mvm"
{ {
"xpos" "50" "wide" "20"
"ypos" "-2" "tall" "20"
"zpos" "2"
"wide" "22"
"tall" "22"
}
"if_specialdelivery"
{
"visible" "0"
} }
} }
@ -55,23 +47,19 @@
{ {
"ControlName" "CTFImagePanel" "ControlName" "CTFImagePanel"
"fieldName" "StatusIcon" "fieldName" "StatusIcon"
"xpos" "0" "xpos" "cs-0.5"
"ypos" "-8" "ypos" "cs-0.5-1"
"zpos" "3" "zpos" "3"
"wide" "18" "wide" "f20"
"tall" "18" "tall" "f20"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"image" "../hud/objectives_flagpanel_ico_flag_home" "image" "../hud/objectives_flagpanel_ico_flag_home"
"scaleImage" "1" "scaleImage" "1"
"pin_to_sibling" "Arrow" "proportionaltoparent" "1"
"pin_corner_to_sibling" "PIN_CENTER_TOP"
"pin_to_sibling_corner" "PIN_CENTER_TOP"
"if_mvm" "if_mvm"
{ {
"xpos" "63"
"ypos" "13"
"visible" "0" "visible" "0"
} }
} }

196
resource/ui/hudobjectiveflagpanel.res
View File

@ -16,31 +16,23 @@
{ {
"zpos" "-1" "zpos" "-1"
} }
"if_mvm"
{
"xpos" "-7"
"ypos" "-8"
}
} }
"BlackTransparentBG" "BlackTransparentBG"
{ {
"ControlName" "CExImageButton" "ControlName" "EditablePanel"
"fieldName" "BlackTransparentBG" "fieldName" "BlackTransparentBG"
"xpos" "cs-0.5" "xpos" "cs-0.5"
"ypos" "r19" "ypos" "rs1"
"zpos" "1" "zpos" "1"
"wide" "120" "wide" "120"
"tall" "22" "tall" "22"
"autoResize" "0"
"pinCorner" "0"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"PaintBackground" "0"
"border_default" "MaterialTransparent50"
"textinsety" "99"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"PaintBackground" "0"
"paintborder" "1"
"border" "MaterialTransparent50"
"if_hybrid" "if_hybrid"
{ {
@ -62,14 +54,13 @@
"xpos" "0" "xpos" "0"
"ypos" "0" "ypos" "0"
"zpos" "4" "zpos" "4"
"wide" "120" "wide" "110"
"tall" "16" "tall" "16"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"proportionaltoparent" "1"
"labelText" "#TF_PlayingTo" "labelText" "#TF_PlayingTo"
"textAlignment" "center" "textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"AllCaps" "1" "AllCaps" "1"
"font" "Size 8" "font" "Size 8"
"fgcolor" "White" "fgcolor" "White"
@ -94,20 +85,20 @@
"BlueScoreBG" "BlueScoreBG"
{ {
"ControlName" "CExImageButton" "ControlName" "EditablePanel"
"fieldName" "BlueScoreBG" "fieldName" "BlueScoreBG"
"xpos" "0" "xpos" "0"
"ypos" "-11" "ypos" "-11"
"zpos" "2" "zpos" "2"
"wide" "65" "wide" "63"
"tall" "20" "tall" "20"
"autoResize" "0"
"pinCorner" "0"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"proportionaltoparent" "1"
"PaintBackground" "0" "PaintBackground" "0"
"border_default" "MaterialBlue" "PaintBorder" "1"
"textinsety" "99" "border" "MaterialBlue"
"pin_to_sibling" "BlackTransparentBG" "pin_to_sibling" "BlackTransparentBG"
"pin_corner_to_sibling" "PIN_BOTTOMLEFT" "pin_corner_to_sibling" "PIN_BOTTOMLEFT"
"pin_to_sibling_corner" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_TOPLEFT"
@ -116,18 +107,15 @@
{ {
"visible" "0" "visible" "0"
} }
"if_mvm" "if_mvm"
{ {
"visible" "0" "visible" "0"
} }
"if_specialdelivery" "if_specialdelivery"
{ {
"visible" "0" "visible" "0"
} }
} }
"BlueScore" "BlueScore"
{ {
"ControlName" "CExLabel" "ControlName" "CExLabel"
@ -135,14 +123,16 @@
"xpos" "-5" "xpos" "-5"
"ypos" "0" "ypos" "0"
"zpos" "10" "zpos" "10"
"wide" "59" "wide" "25"
"tall" "20" "tall" "20"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"proportionaltoparent" "1"
"textAlignment" "west" "textAlignment" "west"
"labelText" "%bluescore%" "labelText" "%bluescore%"
"font" "Size 18" "font" "Size 18"
"fgcolor" "White" "fgcolor" "White"
"pin_to_sibling" "BlueScoreBG" "pin_to_sibling" "BlueScoreBG"
"pin_corner_to_sibling" "PIN_CENTER_LEFT" "pin_corner_to_sibling" "PIN_CENTER_LEFT"
"pin_to_sibling_corner" "PIN_CENTER_LEFT" "pin_to_sibling_corner" "PIN_CENTER_LEFT"
@ -151,12 +141,10 @@
{ {
"visible" "0" "visible" "0"
} }
"if_mvm" "if_mvm"
{ {
"visible" "0" "visible" "0"
} }
"if_specialdelivery" "if_specialdelivery"
{ {
"visible" "0" "visible" "0"
@ -169,10 +157,11 @@
"xpos" "-1" "xpos" "-1"
"ypos" "-1" "ypos" "-1"
"zpos" "9" "zpos" "9"
"wide" "59" "wide" "25"
"tall" "20" "tall" "20"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"proportionaltoparent" "1"
"textAlignment" "west" "textAlignment" "west"
"labelText" "%bluescore%" "labelText" "%bluescore%"
"font" "Size 18 Blur" "font" "Size 18 Blur"
@ -183,12 +172,10 @@
{ {
"visible" "0" "visible" "0"
} }
"if_mvm" "if_mvm"
{ {
"visible" "0" "visible" "0"
} }
"if_specialdelivery" "if_specialdelivery"
{ {
"visible" "0" "visible" "0"
@ -197,20 +184,20 @@
"RedScoreBG" "RedScoreBG"
{ {
"ControlName" "CExImageButton" "ControlName" "EditablePanel"
"fieldName" "RedScoreBG" "fieldName" "RedScoreBG"
"xpos" "0" "xpos" "0"
"ypos" "-11" "ypos" "-11"
"zpos" "2" "zpos" "2"
"wide" "65" "wide" "64"
"tall" "20" "tall" "20"
"autoResize" "0"
"pinCorner" "0"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"proportionaltoparent" "1"
"PaintBackground" "0" "PaintBackground" "0"
"border_default" "MaterialRed" "paintborder" "1"
"textinsety" "99" "border" "MaterialRed"
"pin_to_sibling" "BlackTransparentBG" "pin_to_sibling" "BlackTransparentBG"
"pin_corner_to_sibling" "PIN_BOTTOMRIGHT" "pin_corner_to_sibling" "PIN_BOTTOMRIGHT"
"pin_to_sibling_corner" "PIN_TOPRIGHT" "pin_to_sibling_corner" "PIN_TOPRIGHT"
@ -219,12 +206,10 @@
{ {
"visible" "0" "visible" "0"
} }
"if_mvm" "if_mvm"
{ {
"visible" "0" "visible" "0"
} }
"if_specialdelivery" "if_specialdelivery"
{ {
"visible" "0" "visible" "0"
@ -238,7 +223,7 @@
"xpos" "-5" "xpos" "-5"
"ypos" "0" "ypos" "0"
"zpos" "10" "zpos" "10"
"wide" "59" "wide" "25"
"tall" "20" "tall" "20"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
@ -254,12 +239,10 @@
{ {
"visible" "0" "visible" "0"
} }
"if_mvm" "if_mvm"
{ {
"visible" "0" "visible" "0"
} }
"if_specialdelivery" "if_specialdelivery"
{ {
"visible" "0" "visible" "0"
@ -272,7 +255,7 @@
"xpos" "-1" "xpos" "-1"
"ypos" "-1" "ypos" "-1"
"zpos" "9" "zpos" "9"
"wide" "59" "wide" "25"
"tall" "20" "tall" "20"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
@ -286,12 +269,10 @@
{ {
"visible" "0" "visible" "0"
} }
"if_mvm" "if_mvm"
{ {
"visible" "0" "visible" "0"
} }
"if_specialdelivery" "if_specialdelivery"
{ {
"visible" "0" "visible" "0"
@ -302,32 +283,35 @@
{ {
"ControlName" "CTFFlagStatus" "ControlName" "CTFFlagStatus"
"fieldName" "BlueFlag" "fieldName" "BlueFlag"
"xpos" "c-74" "xpos" "cs-0.5-17"
"ypos" "r40" "ypos" "rs1-15"
"zpos" "5" "zpos" "5"
"wide" "160" "wide" "35"
"tall" "90" "tall" "35"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"proportionaltoparent" "1"
"if_hybrid"
{
"visible" "0"
}
"if_mvm"
{
"xpos" "cs-0.5-3"
"ypos" "rs1-17"
}
"if_hybrid_single" "if_hybrid_single"
{ {
"xpos" "c-55" "xpos" "cs-0.5"
"ypos" "r40"
} }
"if_specialdelivery"
{
"ypos" "r35"
}
"if_no_flags" "if_no_flags"
{ {
"visible" "0" "visible" "0"
} }
"if_hybrid" "if_specialdelivery"
{ {
"visible" "0" "ypos" "rs1"
} }
} }
@ -335,32 +319,31 @@
{ {
"ControlName" "CTFFlagStatus" "ControlName" "CTFFlagStatus"
"fieldName" "RedFlag" "fieldName" "RedFlag"
"xpos" "c-36" "xpos" "cs-0.5+17"
"ypos" "r40" "ypos" "rs1-15"
"zpos" "5" "zpos" "5"
"wide" "160" "wide" "35"
"tall" "90" "tall" "35"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"proportionaltoparent" "1"
"if_hybrid_single"
{
"xpos" "c-55"
"ypos" "r40"
}
"if_specialdelivery"
{
"visible" "0"
}
"if_hybrid" "if_hybrid"
{ {
"visible" "0" "visible" "0"
} }
"if_hybrid_single"
{
"xpos" "cs-0.5"
}
"if_no_flags" "if_no_flags"
{ {
"visible" "0" "visible" "0"
} }
"if_specialdelivery"
{
"ypos" "rs1"
}
} }
"CaptureFlag" "CaptureFlag"
@ -368,7 +351,7 @@
"ControlName" "CTFArrowPanel" "ControlName" "CTFArrowPanel"
"fieldName" "CaptureFlag" "fieldName" "CaptureFlag"
"xpos" "cs-0.5" "xpos" "cs-0.5"
"ypos" "r44" "ypos" "rs1-15"
"zpos" "5" "zpos" "5"
"wide" "35" "wide" "35"
"tall" "35" "tall" "35"
@ -376,17 +359,9 @@
"enabled" "1" "enabled" "1"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"if_hybrid"
{
"ypos" "r44"
}
"if_specialdelivery" "if_specialdelivery"
{ {
"visible" "1" "ypos" "rs1"
"ypos" "r44"
"wide" "38"
"tall" "38"
} }
} }
@ -394,11 +369,11 @@
{ {
"ControlName" "ImagePanel" "ControlName" "ImagePanel"
"fieldName" "CarriedImage" "fieldName" "CarriedImage"
"xpos" "cs-.5" "xpos" "cs-0.5"
"ypos" "r36" "ypos" "rs1-25"
"zpos" "10" "zpos" "10"
"wide" "18" "wide" "15"
"tall" "18" "tall" "15"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"image" "../hud/objectives_flagpanel_carried_red" "image" "../hud/objectives_flagpanel_carried_red"
@ -409,10 +384,12 @@
{ {
"ypos" "r36" "ypos" "r36"
} }
"if_specialdelivery" "if_specialdelivery"
{ {
"visible" "0" "visible" "0"
"ypos" "rs1-7"
"wide" "18"
"tall" "18"
} }
} }
@ -420,13 +397,14 @@
{ {
"ControlName" "ImagePanel" "ControlName" "ImagePanel"
"fieldName" "PoisonIcon" "fieldName" "PoisonIcon"
"xpos" "cs-0.5" "xpos" "cs-1"
"ypos" "r75" "ypos" "rs1-55"
"zpos" "6" "zpos" "6"
"wide" "40" "wide" "15"
"tall" "o1" "tall" "o1"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"proportionaltoparent" "1"
"image" "marked_for_death" "image" "marked_for_death"
"scaleImage" "1" "scaleImage" "1"
} }
@ -434,34 +412,22 @@
{ {
"ControlName" "CExLabel" "ControlName" "CExLabel"
"fieldName" "PoisonTimeLabel" "fieldName" "PoisonTimeLabel"
"xpos" "cs-0.5" "xpos" "5"
"ypos" "r65" "ypos" "0"
"zpos" "6" "zpos" "6"
"wide" "40" "wide" "20"
"tall" "20" "tall" "18"
"visible" "0" "visible" "0"
"enabled" "1" "enabled" "1"
"textAlignment" "center" "proportionaltoparent" "1"
"textAlignment" "west"
"labelText" "%redscore%" "labelText" "%redscore%"
"font" "Size 24" "font" "Size 18"
"fgcolor" "White" "fgcolor" "White"
}
"PoisonTimeLabelShadow" "pin_to_sibling" "PoisonIcon"
{ "pin_corner_to_sibling" "PIN_CENTER_LEFT"
"ControlName" "CExLabel" "pin_to_sibling_corner" "PIN_CENTER_RIGHT"
"fieldName" "PoisonTimeLabelShadow"
"xpos" "-1"
"ypos" "-1"
"zpos" "5"
"wide" "40"
"tall" "20"
"visible" "0"
"enabled" "1"
"textAlignment" "center"
"labelText" "%redscore%"
"font" "Size 24 Blur"
"fgcolor" "Shadow"
"pin_to_sibling" "PoisonTimeLabel"
} }
"OutlineImage" "OutlineImage"
@ -485,7 +451,7 @@
"ControlName" "ImagePanel" "ControlName" "ImagePanel"
"fieldName" "SpecCarriedImage" "fieldName" "SpecCarriedImage"
"xpos" "cs-0.5" "xpos" "cs-0.5"
"ypos" "r95" "ypos" "r85"
"zpos" "10" "zpos" "10"
"wide" "30" "wide" "30"
"tall" "30" "tall" "30"