From b5f72ccd69fcaec0fbc8af3d9b25089ed7d6c6d7 Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Sat, 9 Mar 2019 16:08:53 -0500 Subject: Updated HUD Files - Updated colors to use the schema instead of RGB codes - Removed unused or redundant code - Added shadows to certain elements - Corrected element names, reorganized some files - Pinned some elements to their parent elements - Fixed elements referencing non-existing colors or fonts --- resource/ui/HudObjectiveFlagPanel.res | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'resource/ui/HudObjectiveFlagPanel.res') diff --git a/resource/ui/HudObjectiveFlagPanel.res b/resource/ui/HudObjectiveFlagPanel.res index 9871e81..246d6c6 100644 --- a/resource/ui/HudObjectiveFlagPanel.res +++ b/resource/ui/HudObjectiveFlagPanel.res @@ -135,8 +135,8 @@ { "ControlName" "CExLabel" "fieldName" "BlueScoreShadow" - "xpos" "c-56" - "ypos" "r32" + "xpos" "-1" + "ypos" "-1" "zpos" "8" "wide" "50" "tall" "35" @@ -145,7 +145,11 @@ "textAlignment" "east" "labelText" "%bluescore%" "font" "Cerbetica40" - "fgcolor" "Black" + "fgcolor" "TransparentBlack" + + "pin_to_sibling" "BlueScore" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPLEFT" "if_hybrid" { @@ -199,8 +203,8 @@ { "ControlName" "CExLabel" "fieldName" "RedScoreShadow" - "xpos" "c8" - "ypos" "r32" + "xpos" "-1" + "ypos" "-1" "zpos" "8" "wide" "50" "tall" "35" @@ -209,7 +213,11 @@ "textAlignment" "west" "labelText" "%redscore%" "font" "Cerbetica40" - "fgcolor" "Black" + "fgcolor" "TransparentBlack" + + "pin_to_sibling" "RedScore" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPLEFT" "if_hybrid" { @@ -294,7 +302,7 @@ "tall" "20" [$WIN32] "visible" "1" "enabled" "1" - "fillcolor" "0 0 0 0" + "fillcolor" "Transparent" "scaleImage" "1" "if_hybrid" -- cgit v1.2.3 From eb9e3bf73092500579d32f998fce70fa265e6d1c Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Sat, 9 Mar 2019 16:17:28 -0500 Subject: Code Formatting --- resource/ui/HudObjectiveFlagPanel.res | 91 +++++++++++++++++------------------ 1 file changed, 45 insertions(+), 46 deletions(-) (limited to 'resource/ui/HudObjectiveFlagPanel.res') diff --git a/resource/ui/HudObjectiveFlagPanel.res b/resource/ui/HudObjectiveFlagPanel.res index 246d6c6..a99b13d 100644 --- a/resource/ui/HudObjectiveFlagPanel.res +++ b/resource/ui/HudObjectiveFlagPanel.res @@ -2,18 +2,18 @@ { "ObjectiveStatusFlagPanel" { - "ControlName" "EditablePanel" - "fieldName" "ObjectiveStatusFlagPanel" - "xpos" "0" - "ypos" "0" - "zpos" "1" - "wide" "f0" - "tall" "480" - "visible" "1" - "enabled" "1" + "ControlName" "EditablePanel" + "fieldName" "ObjectiveStatusFlagPanel" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "f0" + "tall" "480" + "visible" "1" + "enabled" "1" "if_hybrid" { - "zpos" "-1" + "zpos" "-1" } } @@ -29,7 +29,7 @@ "visible" "1" "enabled" "1" "fillcolor" "70 130 180 153" - "scaleImage" "1" + "scaleImage" "1" "if_hybrid" { "visible" "0" @@ -49,7 +49,7 @@ "ControlName" "ImagePanel" "fieldName" "RightSideBG" "xpos" "c0" - "ypos" "r20" [$WIN32] + "ypos" "r20" "zpos" "-1" "wide" "120" "tall" "14" @@ -70,21 +70,20 @@ "visible" "0" } } - + "OutlineBG" { "ControlName" "ImagePanel" "fieldName" "OutlineBG" "xpos" "c-140" - "ypos" "r75" [$WIN32] - "ypos" "r96" [$X360] + "ypos" "r75" "zpos" "2" "wide" "280" "tall" "80" "visible" "0" "enabled" "0" "image" "../hud/objectives_flagpanel_bg_outline" - "scaleImage" "1" + "scaleImage" "1" "if_hybrid" { "visible" "0" @@ -110,7 +109,7 @@ "tall" "35" "visible" "1" "enabled" "1" - "textAlignment" "east" + "textAlignment" "east" "labelText" "%bluescore%" "font" "Cerbetica40" "fgcolor" "TanLight" @@ -129,7 +128,7 @@ { "visible" "0" } - } + } "BlueScoreShadow" { @@ -137,7 +136,7 @@ "fieldName" "BlueScoreShadow" "xpos" "-1" "ypos" "-1" - "zpos" "8" + "zpos" "7" "wide" "50" "tall" "35" "visible" "1" @@ -165,7 +164,7 @@ { "visible" "0" } - } + } "RedScore" { @@ -178,7 +177,7 @@ "tall" "35" "visible" "1" "enabled" "1" - "textAlignment" "west" + "textAlignment" "west" "labelText" "%redscore%" "font" "Cerbetica40" "fgcolor" "TanLight" @@ -197,20 +196,20 @@ { "visible" "0" } - } - + } + "RedScoreShadow" { "ControlName" "CExLabel" "fieldName" "RedScoreShadow" "xpos" "-1" "ypos" "-1" - "zpos" "8" + "zpos" "7" "wide" "50" "tall" "35" "visible" "1" "enabled" "1" - "textAlignment" "west" + "textAlignment" "west" "labelText" "%redscore%" "font" "Cerbetica40" "fgcolor" "TransparentBlack" @@ -233,7 +232,7 @@ { "visible" "0" } - } + } "OutlineImage" { @@ -248,23 +247,23 @@ "enabled" "1" "image" "../hud/objectives_flagpanel_carried_outline" "scaleImage" "1" - } + } "CarriedImage" { "ControlName" "ImagePanel" "fieldName" "CarriedImage" "xpos" "9999" - } + } "PlayingTo" { "ControlName" "CExLabel" "fieldName" "PlayingTo" - "xpos" "c-70" [$WIN32] - "ypos" "r54" [$WIN32] + "xpos" "c-70" + "ypos" "r54" "zpos" "4" - "wide" "140" [$WIN32] + "wide" "140" "tall" "30" "visible" "1" "enabled" "1" @@ -289,17 +288,17 @@ { "visible" "0" } - } - + } + "PlayingToBG" { "ControlName" "ImagePanel" "fieldName" "PlayingToBG" - "xpos" "c-50" [$WIN32] - "ypos" "r50" [$WIN32] + "xpos" "c-50" + "ypos" "r50" "zpos" "3" - "wide" "100" [$WIN32] - "tall" "20" [$WIN32] + "wide" "100" + "tall" "20" "visible" "1" "enabled" "1" "fillcolor" "Transparent" @@ -319,14 +318,14 @@ { "visible" "0" } - } - + } + "BlueFlag" { "ControlName" "CTFFlagStatus" "fieldName" "BlueFlag" "xpos" "c-165" - "ypos" "r75" [$WIN32] + "ypos" "r75" "zpos" "2" "wide" "160" "tall" "90" @@ -335,7 +334,7 @@ if_mvm { - "ypos" "r95" [$WIN32] + "ypos" "r95" } "if_hybrid" @@ -378,7 +377,7 @@ "tall" "90" "visible" "1" "enabled" "1" - + "if_hybrid" { "visible" "0" @@ -404,14 +403,14 @@ { "visible" "0" } - } + } "CaptureFlag" { "ControlName" "CTFArrowPanel" "fieldName" "CaptureFlag" "xpos" "c-28" - "ypos" "r100" [$WIN32] + "ypos" "r100" "zpos" "5" "wide" "56" "tall" "56" @@ -459,14 +458,14 @@ "labelText" "%redscore%" "font" "HudFontMediumBold" "fgcolor" "TanLight" - } + } "SpecCarriedImage" { "ControlName" "ImagePanel" "fieldName" "SpecCarriedImage" "xpos" "9999" - "ypos" "9999" [$WIN32] + "ypos" "9999" "zpos" "10" "wide" "100" "tall" "100" -- cgit v1.2.3 From 59374d07d43bc3207a45294b05be3dd8f7b3299e Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Sat, 9 Mar 2019 23:47:40 -0500 Subject: Playtesting Fixes - Updated Arena Mode, CTF and Tournament panels - Fixed the referenced HudBlack color not being available - Fixed visual issues with the Demoman, Scout and Medic meters - Miscellenaous font and color tweaks --- resource/ui/HudObjectiveFlagPanel.res | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'resource/ui/HudObjectiveFlagPanel.res') diff --git a/resource/ui/HudObjectiveFlagPanel.res b/resource/ui/HudObjectiveFlagPanel.res index a99b13d..440d902 100644 --- a/resource/ui/HudObjectiveFlagPanel.res +++ b/resource/ui/HudObjectiveFlagPanel.res @@ -21,11 +21,11 @@ { "ControlName" "ImagePanel" "fieldName" "LeftSideBG" - "xpos" "c-120" - "ypos" "r20" + "xpos" "c-60" + "ypos" "r30" "zpos" "-1" - "wide" "120" - "tall" "14" + "wide" "60" + "tall" "34" "visible" "1" "enabled" "1" "fillcolor" "70 130 180 153" @@ -49,10 +49,10 @@ "ControlName" "ImagePanel" "fieldName" "RightSideBG" "xpos" "c0" - "ypos" "r20" + "ypos" "r30" "zpos" "-1" - "wide" "120" - "tall" "14" + "wide" "60" + "tall" "34" "visible" "1" "enabled" "1" "fillcolor" "205 50 50 153" @@ -324,8 +324,8 @@ { "ControlName" "CTFFlagStatus" "fieldName" "BlueFlag" - "xpos" "c-165" - "ypos" "r75" + "xpos" "c-145" + "ypos" "r67" "zpos" "2" "wide" "160" "tall" "90" @@ -370,8 +370,8 @@ { "ControlName" "CTFFlagStatus" "fieldName" "RedFlag" - "xpos" "c5" - "ypos" "r75" + "xpos" "c-15" + "ypos" "r67" "zpos" "5" "wide" "160" "tall" "90" -- cgit v1.2.3