From 0e3d9d40c7fb818fd977d24b80c00d6e11d8fe19 Mon Sep 17 00:00:00 2001 From: RaysFire Date: Sat, 13 Apr 2013 01:45:22 -0500 Subject: Fixed a small bug that made a few things look out of place in MvM. --- minmode/resource/GameMenu.res | 2 +- .../ui/HudItemEffectMeter_PowerupBottle.res | 248 ++++++++++----------- minmode/resource/ui/HudTournament.res | 10 + minmode/resource/ui/MainMenuOverride.res | 2 +- 4 files changed, 136 insertions(+), 126 deletions(-) (limited to 'minmode') diff --git a/minmode/resource/GameMenu.res b/minmode/resource/GameMenu.res index ea4397d..4fcca84 100644 --- a/minmode/resource/GameMenu.res +++ b/minmode/resource/GameMenu.res @@ -3,7 +3,7 @@ "VersionNumber" { - "label" "rayshud v3.21" + "label" "rayshud v3.22" "command" "toggleconsole" "subimage" "" "OnlyAtMenu" "0" diff --git a/minmode/resource/ui/HudItemEffectMeter_PowerupBottle.res b/minmode/resource/ui/HudItemEffectMeter_PowerupBottle.res index f6e75e4..e186adb 100644 --- a/minmode/resource/ui/HudItemEffectMeter_PowerupBottle.res +++ b/minmode/resource/ui/HudItemEffectMeter_PowerupBottle.res @@ -1,124 +1,124 @@ -"Resource/UI/HudItemEffectMeter_PowerupBottles.res" -{ - HudItemEffectMeter - { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-190" - "ypos" "r41" - "wide" "100" - "tall" "60" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "PowerupBG" - { - "ControlName" "ImagePanel" - "fieldName" "PowerupBG" - "xpos" "0" - "ypos" "0" - "zpos" "0" - "wide" "100" - "tall" "20" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "fillcolor" "0 0 0 100" - } - - "ItemEffectIcon" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectIcon" - "xpos" "60" - "ypos" "2" - "zpos" "1" - "wide" "18" - "tall" "18" - "visible" "1" - "enabled" "1" - "image" "../hud/ico_powerup_critboost_red" - "scaleImage" "1" - } - - "ItemEffectMeterLabel" - { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "9999" - "ypos" "9999" - "zpos" "2" - "wide" "80" - "tall" "40" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_Ball" - "textAlignment" "center" - "centerwrap" "1" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica12" - } - - "CanteenLabel" - { - "ControlName" "CExLabel" - "fieldName" "CanteenLabel" - "font" "Cerbetica14" - "fgcolor" "TanLight" - "xpos" "5" - "ypos" "0" - "zpos" "3" - "wide" "40" - "tall" "20" - "visible" "1" - "enabled" "1" - "textAlignment" "west" - "labelText" "Powerups" - } - - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "25" - "ypos" "23" - "zpos" "2" - "wide" "40" - "tall" "6" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" - } - - "ItemEffectMeterCount" - { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterCount" - "xpos" "54" - "ypos" "1" - "zpos" "2" - "wide" "40" - "tall" "20" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "%progresscount%" - "textAlignment" "east" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica16" - } -} +"Resource/UI/HudItemEffectMeter_PowerupBottles.res" +{ + HudItemEffectMeter + { + "fieldName" "HudItemEffectMeter" + "visible" "1" + "enabled" "1" + "xpos" "c-190" + "ypos" "r41" + "wide" "100" + "tall" "60" + "MeterFG" "White" + "MeterBG" "Gray" + } + + "PowerupBG" + { + "ControlName" "ImagePanel" + "fieldName" "PowerupBG" + "xpos" "0" + "ypos" "0" + "zpos" "0" + "wide" "100" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fillcolor" "0 0 0 100" + } + + "ItemEffectIcon" + { + "ControlName" "CTFImagePanel" + "fieldName" "ItemEffectIcon" + "xpos" "60" + "ypos" "2" + "zpos" "1" + "wide" "18" + "tall" "18" + "visible" "1" + "enabled" "1" + "image" "../hud/ico_powerup_critboost_red" + "scaleImage" "1" + } + + "ItemEffectMeterLabel" + { + "ControlName" "CExLabel" + "fieldName" "ItemEffectMeterLabel" + "xpos" "9999" + "ypos" "9999" + "zpos" "2" + "wide" "80" + "tall" "40" + "autoResize" "1" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "#TF_Ball" + "textAlignment" "center" + "centerwrap" "1" + "dulltext" "0" + "brighttext" "0" + "font" "Cerbetica12" + } + + "CanteenLabel" + { + "ControlName" "CExLabel" + "fieldName" "CanteenLabel" + "font" "Cerbetica14" + "fgcolor" "TanLight" + "xpos" "5" + "ypos" "0" + "zpos" "3" + "wide" "60" + "tall" "20" + "visible" "1" + "enabled" "1" + "textAlignment" "west" + "labelText" "Powerups" + } + + "ItemEffectMeter" + { + "ControlName" "ContinuousProgressBar" + "fieldName" "ItemEffectMeter" + "font" "Default" + "xpos" "25" + "ypos" "23" + "zpos" "2" + "wide" "40" + "tall" "6" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "0" + "textAlignment" "Left" + "dulltext" "0" + "brighttext" "0" + } + + "ItemEffectMeterCount" + { + "ControlName" "CExLabel" + "fieldName" "ItemEffectMeterCount" + "xpos" "54" + "ypos" "1" + "zpos" "2" + "wide" "40" + "tall" "20" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "%progresscount%" + "textAlignment" "east" + "dulltext" "0" + "brighttext" "0" + "font" "Cerbetica16" + } +} diff --git a/minmode/resource/ui/HudTournament.res b/minmode/resource/ui/HudTournament.res index c2033d2..70961f9 100644 --- a/minmode/resource/ui/HudTournament.res +++ b/minmode/resource/ui/HudTournament.res @@ -508,6 +508,11 @@ "visible" "1" "enabled" "1" "fillcolor" "0 0 0 100" + + if_mvm + { + "visible" "0" + } } "TournamentInstructionsLabel" @@ -552,6 +557,11 @@ "visible" "1" "enabled" "1" "fillcolor" "0 0 0 100" + + if_mvm + { + "visible" "0" + } } diff --git a/minmode/resource/ui/MainMenuOverride.res b/minmode/resource/ui/MainMenuOverride.res index 1a22cba..6685b2e 100644 --- a/minmode/resource/ui/MainMenuOverride.res +++ b/minmode/resource/ui/MainMenuOverride.res @@ -1499,7 +1499,7 @@ "use_proportional_insets" "1" "font" "CerbeticaBold20" "textAlignment" "center" - "labelText" "rayshud v3.21" + "labelText" "rayshud v3.22" "dulltext" "0" "brighttext" "0" "default" "1" -- cgit v1.2.3