From ba6bb21d620b59808e156dad0188f11d2bd1da5b Mon Sep 17 00:00:00 2001 From: RaysFire Date: Sun, 7 Apr 2013 17:50:47 -0500 Subject: Fixed bug where Loose Cannon would overlap with Targe/Screen. --- resource/ui/HudDemomanCharge.res | 83 ++++---- resource/ui/HudDemomanPipes.res | 432 +++++++++++++++++++-------------------- 2 files changed, 258 insertions(+), 257 deletions(-) (limited to 'resource') diff --git a/resource/ui/HudDemomanCharge.res b/resource/ui/HudDemomanCharge.res index 49869b2..88dd928 100644 --- a/resource/ui/HudDemomanCharge.res +++ b/resource/ui/HudDemomanCharge.res @@ -1,42 +1,43 @@ -"Resource/UI/HudDemomanCharge.res" -{ - "ChargeMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ChargeMeter" - "font" "Cerbetica12" - "xpos" "0" - "ypos" "112" - "zpos" "2" - "wide" "150" - "tall" "8" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Center" - "dulltext" "0" - "brighttext" "0" - } - "ChargeMeterLabel" - { - "ControlName" "CExLabel" - "fieldName" "ChargeMeterLabel" - "xpos" "0" - "ypos" "112" - "zpos" "3" - "wide" "150" - "tall" "8" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "CHARGE" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica12" - "fgcolor_override" "150 150 150 255" - } +"Resource/UI/HudDemomanCharge.res" +{ + "ChargeMeter" + { + "ControlName" "ContinuousProgressBar" + "fieldName" "ChargeMeter" + "font" "Cerbetica12" + "xpos" "0" + "ypos" "112" + "zpos" "2" + "wide" "150" + "tall" "8" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "textAlignment" "Center" + "dulltext" "0" + "brighttext" "0" + "fgcolor_override" "White" + } + "ChargeMeterLabel" + { + "ControlName" "CExLabel" + "fieldName" "ChargeMeterLabel" + "xpos" "0" + "ypos" "112" + "zpos" "3" + "wide" "150" + "tall" "8" + "autoResize" "1" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "CHARGE" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "font" "Cerbetica12" + "fgcolor_override" "150 150 150 255" + } } \ No newline at end of file diff --git a/resource/ui/HudDemomanPipes.res b/resource/ui/HudDemomanPipes.res index 91b34bb..5272b0d 100644 --- a/resource/ui/HudDemomanPipes.res +++ b/resource/ui/HudDemomanPipes.res @@ -1,216 +1,216 @@ -"Resource/UI/HudDemomanPipes.res" -{ - "background" - { - "ControlName" "CTFImagePanel" - "fieldName" "background" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "76" - "tall" "38" - "visible" "1" - "visible_minmode" "0" - "enabled" "1" - "image" "../hud/misc_ammo_area_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" - } - - "ChargeLabel" - { - "ControlName" "CExLabel" - "fieldName" "ChargeLabel" - "xpos" "0" - "ypos" "c-128" - "zpos" "2" - "wide" "150" - "tall" "8" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_Charge" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica12" - "fgcolor_override" "150 150 150 255" - } - - "ChargeMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ChargeMeter" - "font" "Default" - "xpos" "0" - "ypos" "112" - "zpos" "1" - "wide" "150" - "tall" "8" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" - } - - "PipesPresentPanel" - { - "ControlName" "EditablePanel" - "fieldName" "PipesPresentPanel" - "xpos" "24" - "ypos" "75" - "zpos" "1" - "wide" "100" - "tall" "50" - "visible" "1" - - "PipeIcon" - { - "ControlName" "CTFImagePanel" - "fieldName" "PipeIcon" - "xpos" "9999" - "ypos" "9999" - "wide" "20" - "tall" "20" - "visible" "1" - "enabled" "1" - "image" "../hud/ico_stickybomb_red" - "scaleImage" "1" - "teambg_2" "../hud/ico_stickybomb_red" - "teambg_3" "../hud/ico_stickybomb_blue" - } - - "NumPipesLabel" - { - "ControlName" "CExLabel" - "fieldName" "NumPipesLabel" - "xpos" "34" - "ypos" "10" - "zpos" "2" - "wide" "35" - "tall" "20" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "%activepipes%" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "font" "CerbeticaBold32" - } - "NumPipesLabelDropshadow" - { - "ControlName" "CExLabel" - "fieldName" "NumPipesLabelDropshadow" - "xpos" "35" - "ypos" "11" - "zpos" "2" - "wide" "35" - "tall" "20" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "%activepipes%" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "font" "CerbeticaBold32" - "fgcolor" "TransparentBlack" - } - } - - "NoPipesPresentPanel" - { - "ControlName" "EditablePanel" - "fieldName" "NoPipesPresentPanel" - "xpos" "9999" - "ypos" "9999" - "zpos" "1" - "wide" "100" - "tall" "50" - "visible" "1" - - "PipeIcon" - { - "ControlName" "CTFImagePanel" - "fieldName" "PipeIcon" - "xpos" "26" - "ypos" "16" - "ypos_minmode" "12" - "wide" "20" - "wide_minmode" "14" - "tall" "20" - "tall_minmode" "14" - "visible" "1" - "enabled" "1" - "image" "../hud/ico_stickybomb_red_faded" - "scaleImage" "1" - "teambg_2" "../hud/ico_stickybomb_red_faded" - "teambg_3" "../hud/ico_stickybomb_blue_faded" - } - - "NumPipesLabel" - { - "ControlName" "CExLabel" - "fieldName" "NumPipesLabel" - "xpos" "50" - "xpos_minmode" "42" - "ypos" "18" - "ypos_minmode" "12" - "zpos" "2" - "wide" "35" - "tall" "20" - "tall_lodef" "28" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "%activepipes%" - "textAlignment" "west" - "dulltext" "1" - "brighttext" "0" - "font" "HudFontMedium" - "font_minmode" "HudFontSmall" - "font_lodef" "HudFontMediumBig" - } - "NumPipesLabelDropshadow" - { - "ControlName" "CExLabel" - "fieldName" "NumPipesLabelDropshadow" - "xpos" "51" - "xpos_minmode" "43" - "ypos" "19" - "ypos_minmode" "13" - "zpos" "2" - "wide" "35" - "tall" "20" - "tall_lodef" "28" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "%activepipes%" - "textAlignment" "west" - "dulltext" "1" - "brighttext" "0" - "font" "HudFontMedium" - "font_minmode" "HudFontSmall" - "font_lodef" "HudFontMediumBig" - "fgcolor" "black" - } - } -} +"Resource/UI/HudDemomanPipes.res" +{ + "background" + { + "ControlName" "CTFImagePanel" + "fieldName" "background" + "xpos" "9999" + "ypos" "9999" + "zpos" "0" + "wide" "76" + "tall" "38" + "visible" "1" + "visible_minmode" "0" + "enabled" "1" + "image" "../hud/misc_ammo_area_blue" + "scaleImage" "1" + "teambg_2" "../hud/misc_ammo_area_red" + "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" + "teambg_3" "../hud/misc_ammo_area_blue" + "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + } + + "ChargeLabel" + { + "ControlName" "CExLabel" + "fieldName" "ChargeLabel" + "xpos" "0" + "ypos" "c-142" + "zpos" "2" + "wide" "150" + "tall" "8" + "autoResize" "1" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "#TF_Charge" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "font" "Cerbetica12" + "fgcolor_override" "150 150 150 255" + } + + "ChargeMeter" + { + "ControlName" "ContinuousProgressBar" + "fieldName" "ChargeMeter" + "font" "Default" + "xpos" "0" + "ypos" "99" + "zpos" "1" + "wide" "150" + "tall" "8" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "textAlignment" "Left" + "dulltext" "0" + "brighttext" "0" + } + + "PipesPresentPanel" + { + "ControlName" "EditablePanel" + "fieldName" "PipesPresentPanel" + "xpos" "24" + "ypos" "75" + "zpos" "1" + "wide" "100" + "tall" "50" + "visible" "1" + + "PipeIcon" + { + "ControlName" "CTFImagePanel" + "fieldName" "PipeIcon" + "xpos" "9999" + "ypos" "9999" + "wide" "20" + "tall" "20" + "visible" "1" + "enabled" "1" + "image" "../hud/ico_stickybomb_red" + "scaleImage" "1" + "teambg_2" "../hud/ico_stickybomb_red" + "teambg_3" "../hud/ico_stickybomb_blue" + } + + "NumPipesLabel" + { + "ControlName" "CExLabel" + "fieldName" "NumPipesLabel" + "xpos" "34" + "ypos" "10" + "zpos" "2" + "wide" "35" + "tall" "20" + "autoResize" "1" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "%activepipes%" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "font" "CerbeticaBold32" + } + "NumPipesLabelDropshadow" + { + "ControlName" "CExLabel" + "fieldName" "NumPipesLabelDropshadow" + "xpos" "35" + "ypos" "11" + "zpos" "2" + "wide" "35" + "tall" "20" + "autoResize" "1" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "%activepipes%" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "font" "CerbeticaBold32" + "fgcolor" "TransparentBlack" + } + } + + "NoPipesPresentPanel" + { + "ControlName" "EditablePanel" + "fieldName" "NoPipesPresentPanel" + "xpos" "9999" + "ypos" "9999" + "zpos" "1" + "wide" "100" + "tall" "50" + "visible" "1" + + "PipeIcon" + { + "ControlName" "CTFImagePanel" + "fieldName" "PipeIcon" + "xpos" "26" + "ypos" "16" + "ypos_minmode" "12" + "wide" "20" + "wide_minmode" "14" + "tall" "20" + "tall_minmode" "14" + "visible" "1" + "enabled" "1" + "image" "../hud/ico_stickybomb_red_faded" + "scaleImage" "1" + "teambg_2" "../hud/ico_stickybomb_red_faded" + "teambg_3" "../hud/ico_stickybomb_blue_faded" + } + + "NumPipesLabel" + { + "ControlName" "CExLabel" + "fieldName" "NumPipesLabel" + "xpos" "50" + "xpos_minmode" "42" + "ypos" "18" + "ypos_minmode" "12" + "zpos" "2" + "wide" "35" + "tall" "20" + "tall_lodef" "28" + "autoResize" "1" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "%activepipes%" + "textAlignment" "west" + "dulltext" "1" + "brighttext" "0" + "font" "HudFontMedium" + "font_minmode" "HudFontSmall" + "font_lodef" "HudFontMediumBig" + } + "NumPipesLabelDropshadow" + { + "ControlName" "CExLabel" + "fieldName" "NumPipesLabelDropshadow" + "xpos" "51" + "xpos_minmode" "43" + "ypos" "19" + "ypos_minmode" "13" + "zpos" "2" + "wide" "35" + "tall" "20" + "tall_lodef" "28" + "autoResize" "1" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "%activepipes%" + "textAlignment" "west" + "dulltext" "1" + "brighttext" "0" + "font" "HudFontMedium" + "font_minmode" "HudFontSmall" + "font_lodef" "HudFontMediumBig" + "fgcolor" "black" + } + } +} -- cgit v1.2.3