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/FreezePanel_Basic.res | 176 +------------------------------------- 1 file changed, 1 insertion(+), 175 deletions(-) (limited to 'resource/ui/FreezePanel_Basic.res') diff --git a/resource/ui/FreezePanel_Basic.res b/resource/ui/FreezePanel_Basic.res index 9b52678..dc89f40 100644 --- a/resource/ui/FreezePanel_Basic.res +++ b/resource/ui/FreezePanel_Basic.res @@ -1,162 +1,5 @@ "Resource/UI/FreezePanel_Basic.res" { - "FreezePanelBase" [$X360] - { - "ControlName" "EditablePanel" - "fieldName" "FreezePanelBase" - "xpos" "0" - "ypos" "0" - "wide" "640" - "tall" "480" - "visible" "1" - - "NemesisSubPanel" - { - "ControlName" "EditablePanel" - "fieldName" "NemesisSubPanel" - "xpos" "c46" - "xpos_hidef" "c109" - "ypos" "223" - "ypos_hidef" "223" - "ypos_lodef" "193" - "zpos" "4" - "wide" "166" - "tall" "38" - "visible" "1" - - "NemesisPanelBG" - { - "ControlName" "ImagePanel" - "fieldName" "NemesisPanelBG" - "xpos" "0" - "ypos" "0" - "zpos" "5" - "wide" "166" - "tall" "38" - "visible" "1" - "enabled" "1" - "image" "../hud/freezecam_black_bg" - "scaleImage" "1" - } - "NemesisIcon" - { - "ControlName" "ImagePanel" - "fieldName" "NemesisIcon" - "xpos" "5" - "ypos" "-1" - "zpos" "6" - "wide" "36" - "tall" "36" - "visible" "1" - "enabled" "1" - "image" "../hud/leaderboard_nemesis_freezecam" - "scaleImage" "1" - } - "NemesisLabel" - { - "ControlName" "Label" - "fieldName" "NemesisLabel" - "font" "HudFontMediumSmall" - "xpos" "44" - "ypos" "10" - "ypos_hidef" "11" - "ypos_lodef" "13" - "zpos" "6" - "wide" "112" - "tall" "18" - "tall_hidef" "24" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "%nemesisname%" - "textAlignment" "west" - } - } - "FreezePanelBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "FreezePanelBG" - "xpos" "c-38" - "xpos_hidef" "c25" - "ypos" "245" - "ypos_hidef" "245" - "ypos_lodef" "215" - "zpos" "0" - "wide" "266" - "tall" "48" - "visible" "1" - "enabled" "1" - "image" "../hud/color_panel_blu" - "scaleImage" "1" - } - - "FreezeLabel" - { - "ControlName" "Label" - "fieldName" "FreezeLabel" - "font" "DefaultSmall" - "xpos" "c2" - "xpos_hidef" "c65" - "ypos" "255" - "ypos_hidef" "256" - "ypos_lodef" "225" - "zpos" "1" - "wide" "252" - "tall" "9" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "#FreezePanel_Killer" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" - } - - "FreezeLabelKiller" - { - "ControlName" "Label" - "fieldName" "FreezeLabelKiller" - "font" "HudFontSmall" - "xpos" "c6" // No avatar image on X360 - "xpos_hidef" "c69" - "ypos" "266" - "ypos_hidef" "266" - "ypos_lodef" "236" - "zpos" "1" - "wide" "252" - "tall" "18" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "%killername%" - "textAlignment" "Left" - } - - "FreezePanelHealth" - { - "ControlName" "EditablePanel" - "fieldName" "FreezePanelHealth" - "xpos" "c-30" - "xpos_hidef" "c35" - "ypos" "253" - "ypos_hidef" "253" - "ypos_lodef" "223" - "zpos" "1" - "wide" "31" - "tall" "31" - "visible" "1" - "enabled" "1" - "HealthBonusPosAdj" "9" - "HealthDeathWarning" "0.49" - "TFFont" "HudFontSmall" - "HealthDeathWarningColor" "HUDDeathWarning" - "TextColor" "HudOffWhite" - } - } - "itempanel" { "ControlName" "CItemModelPanel" @@ -334,23 +177,6 @@ "ControlName" "CExLabel" "fieldName" "FreezeLabelKiller" "font" "Cerbetica12" - "xpos" "9999" - "ypos" "9999" - "zpos" "1" - "wide" "550" - "tall" "15" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "%killername%" - "textAlignment" "Left" - } - "FreezeLabelKiller2" - { - "ControlName" "CExLabel" - "fieldName" "FreezeLabelKiller2" - "font" "Cerbetica13" "xpos" "42" "ypos" "28" "zpos" "1" @@ -377,7 +203,7 @@ "enabled" "1" "image" "" "scaleImage" "1" - "color_outline" "52 48 45 255" + "color_outline" "HudTimerProgressInActive" } "NemesisSubPanel" -- 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/FreezePanel_Basic.res | 107 +++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 53 deletions(-) (limited to 'resource/ui/FreezePanel_Basic.res') diff --git a/resource/ui/FreezePanel_Basic.res b/resource/ui/FreezePanel_Basic.res index dc89f40..2b47554 100644 --- a/resource/ui/FreezePanel_Basic.res +++ b/resource/ui/FreezePanel_Basic.res @@ -18,10 +18,10 @@ "model_wide" "90" "model_tall" "60" - "text_xpos" "10" - "text_ypos" "10" - "text_wide" "220" - "text_center" "1" + "text_xpos" "10" + "text_ypos" "10" + "text_wide" "220" + "text_center" "1" "max_text_height" "100" "padding_height" "10" @@ -30,40 +30,41 @@ "ItemBackground" { - "ControlName" "ImagePanel" - "fieldName" "ItemBackground" - "xpos" "0" - "ypos" "0" - "zpos" "-1" - "wide" "240" - "tall" "900" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "fillcolor" "0 0 0 100" + "ControlName" "ImagePanel" + "fieldName" "ItemBackground" + "xpos" "0" + "ypos" "0" + "zpos" "-1" + "wide" "240" + "tall" "900" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fillcolor" "0 0 0 100" } + "TitleBackground" { - "ControlName" "ImagePanel" - "fieldName" "TitleBackground" - "xpos" "4" - "ypos" "4" - "zpos" "-1" - "wide" "232" - "tall" "14" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "fillcolor" "0 0 0 100" + "ControlName" "ImagePanel" + "fieldName" "TitleBackground" + "xpos" "4" + "ypos" "4" + "zpos" "-1" + "wide" "232" + "tall" "14" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fillcolor" "0 0 0 100" } "itemmodelpanel" { "fieldName" "itemmodelpanel" "use_item_rendertarget" "0" - "useparentbg" "1" + "useparentbg" "1" "inventory_image_type" "1" } @@ -88,7 +89,7 @@ } } - "FreezePanelBase" [$WIN32] + "FreezePanelBase" { "ControlName" "EditablePanel" "fieldName" "FreezePanelBase" @@ -97,21 +98,21 @@ "wide" "240" "tall" "200" "visible" "1" - + "FreezePanelBGTitle" { "ControlName" "ImagePanel" "fieldName" "FreezePanelBGTitle" "xpos" "0" - "ypos" "15" - "zpos" "-1" - "wide" "240" - "tall" "14" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "fillcolor" "0 0 0 128" + "ypos" "15" + "zpos" "-1" + "wide" "240" + "tall" "14" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fillcolor" "0 0 0 128" } "FreezePanelBG" { @@ -132,11 +133,11 @@ "draw_corner_width" "0" "draw_corner_height" "0" - } - + } + "FreezeLabel" { - "ControlName" "Label" + "ControlName" "Label" "fieldName" "FreezeLabel" "font" "Cerbetica13" "xpos" "40" @@ -151,10 +152,10 @@ "labelText" "#FreezePanel_Killer" "textAlignment" "west" "dulltext" "0" - "brighttext" "0" + "brighttext" "0" } - - "FreezePanelHealth" [$WIN32] + + "FreezePanelHealth" { "ControlName" "CTFFreezePanelHealth" "fieldName" "FreezePanelHealth" @@ -164,12 +165,12 @@ "wide" "30" "tall" "30" "visible" "1" - "enabled" "1" - "HealthBonusPosAdj" "9" - "HealthDeathWarning" "0.49" - "TFFont" "HudFontSmall" + "enabled" "1" + "HealthBonusPosAdj" "9" + "HealthDeathWarning" "0.49" + "TFFont" "HudFontSmall" "HealthDeathWarningColor" "HUDDeathWarning" - "TextColor" "HudOffWhite" + "TextColor" "HudOffWhite" } "FreezeLabelKiller" @@ -189,7 +190,7 @@ "labelText" "%killername%" "textAlignment" "Left" } - + "AvatarImage" { "ControlName" "CAvatarImagePanel" @@ -205,7 +206,7 @@ "scaleImage" "1" "color_outline" "HudTimerProgressInActive" } - + "NemesisSubPanel" { "ControlName" "EditablePanel" -- 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/FreezePanel_Basic.res | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resource/ui/FreezePanel_Basic.res') diff --git a/resource/ui/FreezePanel_Basic.res b/resource/ui/FreezePanel_Basic.res index 2b47554..d998b43 100644 --- a/resource/ui/FreezePanel_Basic.res +++ b/resource/ui/FreezePanel_Basic.res @@ -139,7 +139,7 @@ { "ControlName" "Label" "fieldName" "FreezeLabel" - "font" "Cerbetica13" + "font" "Cerbetica12" "xpos" "40" "ypos" "15" "zpos" "1" -- cgit v1.2.3