From ed8a4f66f73efb133ba066969ceb7d368f91e834 Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Sat, 9 Mar 2019 16:10:56 -0500 Subject: Updated Item Effect Meters - Fixed some Demoman/Medic meters not displaying correctly - Repositioned all item effect meters - Fixed some meters not using #base correctly - Added shadows to labels, removed unused elements - Updated the Vaccinator meter --- resource/ui/HudMedicCharge.res | 179 +++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 95 deletions(-) (limited to 'resource/ui/HudMedicCharge.res') diff --git a/resource/ui/HudMedicCharge.res b/resource/ui/HudMedicCharge.res index a13388d..4c531fb 100644 --- a/resource/ui/HudMedicCharge.res +++ b/resource/ui/HudMedicCharge.res @@ -4,44 +4,25 @@ { "ControlName" "CTFImagePanel" "fieldName" "Background" - "xpos" "9999" - "ypos" "9999" + "xpos" "0" + "ypos" "0" "zpos" "0" "wide" "130" "tall" "65" - "visible" "1" - "enabled" "1" + "visible" "0" + "enabled" "0" "image" "../hud/medic_charge_blue_bg" "scaleImage" "1" "teambg_2" "../hud/medic_charge_red_bg" "teambg_3" "../hud/medic_charge_blue_bg" } - "ChargeBackground" - { - "ControlName" "ImagePanel" - "fieldName" "ChargeBackground" - "font" "Default" - "xpos" "75" - "ypos" "115" - "xpos_minmode" "0" - "ypos_minmode" "35" - "zpos" "2" - "wide" "150" - "tall" "20" - "wide_minmode" "124" - "tall_minmode" "14" - "visible" "0" - "enabled" "0" - "fillcolor" "255 255 255 50" - } - "ChargeLabel" { "ControlName" "CExLabel" "fieldName" "ChargeLabel" - "xpos" "236" - "ypos" "40" + "xpos" "150" + "ypos" "35" "xpos_minmode" "96" "ypos_minmode" "-5" "zpos" "2" @@ -87,19 +68,46 @@ "fgcolor" "Ammo In Clip" } + "ChargeMeterLabel" + { + "ControlName" "CExLabel" + "fieldName" "ChargeMeterLabel" + "xpos" "75" + "ypos" "117" + "xpos_minmode" "0" + "ypos_minmode" "34" + "zpos" "3" + "wide" "150" + "tall" "15" + "wide_minmode" "124" + "tall_minmode" "16" + "autoResize" "1" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "font" "Cerbetica16" + "font_minmode" "Cerbetica12" + "fgcolor" "150 150 150 255" + } + "ChargeMeter" { "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter" "font" "Default" - "xpos" "75" - "ypos" "95" - "xpos_minmode" "2" - "ypos_minmode" "37" + "xpos" "0" + "ypos" "60" + "xpos_minmode" "10" + "ypos_minmode" "27" "zpos" "2" "wide" "150" "tall" "20" - "wide_minmode" "124" + "wide_minmode" "114" "tall_minmode" "10" "autoResize" "0" "pinCorner" "0" @@ -117,15 +125,16 @@ "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter1" "font" "Default" - "xpos" "250" - "ypos" "55" + "xpos" "0" + "ypos" "60" "zpos" "3" - "wide" "100" - "xpos_minmode" "136" - "ypos_minmode" "23" + "xpos_minmode" "33" + "ypos_minmode" "22" "zpos_minmode" "4" + "wide" "36" + "tall" "20" "wide_minmode" "20" - "tall" "9" + "tall_minmode" "17" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -141,15 +150,13 @@ "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter2" "font" "Default" - "xpos" "250" - "ypos" "66" - "zpos" "3" - "wide" "100" - "xpos_minmode" "158" - "ypos_minmode" "23" - "zpos_minmode" "4" - "wide_minmode" "19" - "tall" "10" + "xpos" "2" + "ypos" "0" + "zpos" "4" + "wide" "36" + "tall" "20" + "wide_minmode" "20" + "tall_minmode" "17" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -158,6 +165,10 @@ "dulltext" "0" "brighttext" "0" "fgcolor_override" "Uber Bar Color" + + "pin_to_sibling" "ChargeMeter1" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" } "ChargeMeter3" @@ -165,15 +176,13 @@ "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter3" "font" "Default" - "xpos" "250" - "ypos" "78" - "zpos" "3" - "wide" "100" - "tall" "10" - "xpos_minmode" "136" - "ypos_minmode" "34" - "zpos_minmode" "4" + "xpos" "2" + "ypos" "0" + "zpos" "4" + "wide" "36" + "tall" "20" "wide_minmode" "20" + "tall_minmode" "17" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -182,6 +191,10 @@ "dulltext" "0" "brighttext" "0" "fgcolor_override" "Uber Bar Color" + + "pin_to_sibling" "ChargeMeter2" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" } "ChargeMeter4" @@ -189,16 +202,13 @@ "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter4" "font" "Default" - "xpos" "250" - "ypos" "90" - "zpos" "3" - "xpos_minmode" "158" - "ypos_minmode" "34" - "zpos_minmode" "4" - "wide" "100" - "tall" "9" - "wide_minmode" "19" - "tall_minmode" "10" + "xpos" "2" + "ypos" "0" + "zpos" "4" + "wide" "36" + "tall" "20" + "wide_minmode" "20" + "tall_minmode" "17" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -207,43 +217,22 @@ "dulltext" "0" "brighttext" "0" "fgcolor_override" "Uber Bar Color" - } - "ChargeMeterLabel" - { - "ControlName" "CExLabel" - "fieldName" "ChargeMeterLabel" - "xpos" "75" - "ypos" "117" - "xpos_minmode" "0" - "ypos_minmode" "34" - "zpos" "3" - "wide" "150" - "tall" "15" - "wide_minmode" "124" - "tall_minmode" "16" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica16" - "font_minmode" "Cerbetica12" - "fgcolor" "150 150 150 255" - } + "pin_to_sibling" "ChargeMeter3" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + } "ResistIconAnchor" { "ControlName" "EditablePanel" "fieldName" "ResistIconAnchor" - "xpos" "0" - "ypos" "22" - "wide" "25" - "tall" "25" + "xpos" "150" + "ypos" "57" + "xpos_minmode" "136" + "ypos_minmode" "18" + "wide" "45" + "tall" "45" "visible" "1" "enabled" "1" } @@ -253,7 +242,7 @@ "ControlName" "ImagePanel" "fieldName" "ResistIcon" "xpos" "0" - "ypos" "20" + "ypos" "0" "wide" "25" "tall" "25" "visible" "1" -- 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/HudMedicCharge.res | 84 +++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'resource/ui/HudMedicCharge.res') diff --git a/resource/ui/HudMedicCharge.res b/resource/ui/HudMedicCharge.res index 4c531fb..af2c27f 100644 --- a/resource/ui/HudMedicCharge.res +++ b/resource/ui/HudMedicCharge.res @@ -1,5 +1,5 @@ "Resource/UI/HudMedicCharge.res" -{ +{ "Background" { "ControlName" "CTFImagePanel" @@ -14,7 +14,7 @@ "image" "../hud/medic_charge_blue_bg" "scaleImage" "1" "teambg_2" "../hud/medic_charge_red_bg" - "teambg_3" "../hud/medic_charge_blue_bg" + "teambg_3" "../hud/medic_charge_blue_bg" } "ChargeLabel" @@ -93,8 +93,8 @@ "font" "Cerbetica16" "font_minmode" "Cerbetica12" "fgcolor" "150 150 150 255" - } - + } + "ChargeMeter" { "ControlName" "ContinuousProgressBar" @@ -122,11 +122,11 @@ "ChargeMeter1" { - "ControlName" "ContinuousProgressBar" - "fieldName" "ChargeMeter1" - "font" "Default" - "xpos" "0" - "ypos" "60" + "ControlName" "ContinuousProgressBar" + "fieldName" "ChargeMeter1" + "font" "Default" + "xpos" "0" + "ypos" "60" "zpos" "3" "xpos_minmode" "33" "ypos_minmode" "22" @@ -134,22 +134,22 @@ "wide" "36" "tall" "20" "wide_minmode" "20" - "tall_minmode" "17" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" + "tall_minmode" "17" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "textAlignment" "Left" + "dulltext" "0" + "brighttext" "0" "fgcolor_override" "Uber Bar Color" } "ChargeMeter2" { - "ControlName" "ContinuousProgressBar" - "fieldName" "ChargeMeter2" - "font" "Default" + "ControlName" "ContinuousProgressBar" + "fieldName" "ChargeMeter2" + "font" "Default" "xpos" "2" "ypos" "0" "zpos" "4" @@ -157,13 +157,13 @@ "tall" "20" "wide_minmode" "20" "tall_minmode" "17" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "textAlignment" "Left" + "dulltext" "0" + "brighttext" "0" "fgcolor_override" "Uber Bar Color" "pin_to_sibling" "ChargeMeter1" @@ -173,23 +173,23 @@ "ChargeMeter3" { - "ControlName" "ContinuousProgressBar" - "fieldName" "ChargeMeter3" - "font" "Default" + "ControlName" "ContinuousProgressBar" + "fieldName" "ChargeMeter3" + "font" "Default" "xpos" "2" "ypos" "0" "zpos" "4" "wide" "36" "tall" "20" - "wide_minmode" "20" + "wide_minmode" "20" "tall_minmode" "17" - "autoResize" "0" + "autoResize" "0" "pinCorner" "0" - "visible" "1" + "visible" "1" "enabled" "1" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" + "textAlignment" "Left" + "dulltext" "0" + "brighttext" "0" "fgcolor_override" "Uber Bar Color" "pin_to_sibling" "ChargeMeter2" @@ -201,7 +201,7 @@ { "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter4" - "font" "Default" + "font" "Default" "xpos" "2" "ypos" "0" "zpos" "4" @@ -209,13 +209,13 @@ "tall" "20" "wide_minmode" "20" "tall_minmode" "17" - "autoResize" "0" + "autoResize" "0" "pinCorner" "0" - "visible" "1" - "enabled" "1" + "visible" "1" + "enabled" "1" "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" + "dulltext" "0" + "brighttext" "0" "fgcolor_override" "Uber Bar Color" "pin_to_sibling" "ChargeMeter3" -- 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/HudMedicCharge.res | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'resource/ui/HudMedicCharge.res') diff --git a/resource/ui/HudMedicCharge.res b/resource/ui/HudMedicCharge.res index af2c27f..1a478f7 100644 --- a/resource/ui/HudMedicCharge.res +++ b/resource/ui/HudMedicCharge.res @@ -102,7 +102,7 @@ "font" "Default" "xpos" "0" "ypos" "60" - "xpos_minmode" "10" + "xpos_minmode" "17" "ypos_minmode" "27" "zpos" "2" "wide" "150" @@ -128,13 +128,13 @@ "xpos" "0" "ypos" "60" "zpos" "3" - "xpos_minmode" "33" - "ypos_minmode" "22" + "xpos_minmode" "17" + "ypos_minmode" "27" "zpos_minmode" "4" "wide" "36" "tall" "20" - "wide_minmode" "20" - "tall_minmode" "17" + "wide_minmode" "27" + "tall_minmode" "10" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -155,8 +155,8 @@ "zpos" "4" "wide" "36" "tall" "20" - "wide_minmode" "20" - "tall_minmode" "17" + "wide_minmode" "27" + "tall_minmode" "10" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -181,8 +181,8 @@ "zpos" "4" "wide" "36" "tall" "20" - "wide_minmode" "20" - "tall_minmode" "17" + "wide_minmode" "27" + "tall_minmode" "10" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -207,8 +207,8 @@ "zpos" "4" "wide" "36" "tall" "20" - "wide_minmode" "20" - "tall_minmode" "17" + "wide_minmode" "27" + "tall_minmode" "10" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -227,7 +227,7 @@ { "ControlName" "EditablePanel" "fieldName" "ResistIconAnchor" - "xpos" "150" + "xpos" "160" "ypos" "57" "xpos_minmode" "136" "ypos_minmode" "18" -- cgit v1.2.3 From 7a1c7e5e88738e990888d4d30e2b66d09b2cbd18 Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Mon, 1 Apr 2019 22:29:57 -0400 Subject: Fixed Medic UI in Mann vs. Machine Adjusted the ubercharge and item effect meters so to not overlap when the medic has a shield power up. Fixed a rogue shadow element in tournament spectator. --- resource/ui/HudMedicCharge.res | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'resource/ui/HudMedicCharge.res') diff --git a/resource/ui/HudMedicCharge.res b/resource/ui/HudMedicCharge.res index 1a478f7..032fc6b 100644 --- a/resource/ui/HudMedicCharge.res +++ b/resource/ui/HudMedicCharge.res @@ -23,7 +23,7 @@ "fieldName" "ChargeLabel" "xpos" "150" "ypos" "35" - "xpos_minmode" "96" + "xpos_minmode" "106" "ypos_minmode" "-5" "zpos" "2" "wide" "120" @@ -101,9 +101,9 @@ "fieldName" "ChargeMeter" "font" "Default" "xpos" "0" - "ypos" "60" + "ypos" "80" "xpos_minmode" "17" - "ypos_minmode" "27" + "ypos_minmode" "34" "zpos" "2" "wide" "150" "tall" "20" -- cgit v1.2.3