From 2642fc21bef0e851c70a858b45e1f44179d31901 Mon Sep 17 00:00:00 2001 From: Ian Bruton Date: Fri, 2 Nov 2012 01:34:15 -0500 Subject: Positioning/color/sizing fixes. --- resource/ui/ClassSelection.res | 38 +++++++++++------------ resource/ui/HudDemomanPipes.res | 1 - resource/ui/HudItemEffectMeter.res | 2 +- resource/ui/HudItemEffectMeter_Cleaver.res | 2 +- resource/ui/HudItemEffectMeter_ParticleCannon.res | 2 +- resource/ui/HudItemEffectMeter_Pomson.res | 2 +- resource/ui/HudItemEffectMeter_Raygun.res | 2 +- resource/ui/HudItemEffectMeter_Scout.res | 2 +- resource/ui/HudItemEffectMeter_Sniper.res | 34 +++++++++++++++----- resource/ui/HudItemEffectMeter_SniperFocus.res | 2 +- resource/ui/HudItemEffectMeter_SodaPopper.res | 2 +- resource/ui/HudItemEffectMeter_Spy.res | 38 +++++++++++++++++------ resource/ui/HudItemEffectMeter_SpyKnife.res | 2 +- resource/ui/HudObjectiveFlagPanel-minmode.res | 14 ++++----- resource/ui/HudObjectiveFlagPanel.res | 14 ++++----- resource/ui/MvMScoreboard.res | 2 +- resource/ui/ScoreBoard.res | 4 +-- resource/ui/Teammenu.res | 2 +- resource/ui/winpanel.res | 2 +- 19 files changed, 103 insertions(+), 64 deletions(-) diff --git a/resource/ui/ClassSelection.res b/resource/ui/ClassSelection.res index aa369e0..df5bbc5 100644 --- a/resource/ui/ClassSelection.res +++ b/resource/ui/ClassSelection.res @@ -107,7 +107,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "&1 Scout" [$WIN32] + "labelText" "&1 Scout" [$WIN32] "textAlignment" "west" "Command" "joinclass scout" "font" "CerbeticaBold16" @@ -932,10 +932,10 @@ { "ControlName" "CExLabel" "fieldName" "numScout" - "xpos" "c150" + "xpos" "c158" "ypos" "195" "zpos" "5" - "wide" "50" + "wide" "100" "tall" "12" "autoResize" "1" "pinCorner" "2" @@ -952,10 +952,10 @@ { "ControlName" "CExLabel" "fieldName" "numSoldier" - "xpos" "c150" + "xpos" "c158" "ypos" "209" "zpos" "5" - "wide" "50" + "wide" "100" "tall" "12" "autoResize" "1" "pinCorner" "2" @@ -972,10 +972,10 @@ { "ControlName" "CExLabel" "fieldName" "numPyro" - "xpos" "c150" + "xpos" "c158" "ypos" "223" "zpos" "5" - "wide" "50" + "wide" "100" "tall" "12" "autoResize" "1" "pinCorner" "2" @@ -992,10 +992,10 @@ { "ControlName" "CExLabel" "fieldName" "numDemoman" - "xpos" "c150" + "xpos" "c158" "ypos" "243" "zpos" "5" - "wide" "50" + "wide" "100" "tall" "12" "autoResize" "1" "pinCorner" "2" @@ -1012,10 +1012,10 @@ { "ControlName" "CExLabel" "fieldName" "numHeavy" - "xpos" "c150" + "xpos" "c158" "ypos" "257" "zpos" "5" - "wide" "50" + "wide" "100" "tall" "12" "autoResize" "1" "pinCorner" "2" @@ -1032,10 +1032,10 @@ { "ControlName" "CExLabel" "fieldName" "numEngineer" - "xpos" "c150" + "xpos" "c158" "ypos" "271" "zpos" "5" - "wide" "50" + "wide" "100" "tall" "12" "autoResize" "1" "pinCorner" "2" @@ -1052,10 +1052,10 @@ { "ControlName" "CExLabel" "fieldName" "numMedic" - "xpos" "c150" + "xpos" "c158" "ypos" "291" "zpos" "5" - "wide" "50" + "wide" "100" "tall" "12" "autoResize" "1" "pinCorner" "2" @@ -1072,10 +1072,10 @@ { "ControlName" "CExLabel" "fieldName" "numSniper" - "xpos" "c150" + "xpos" "c158" "ypos" "305" "zpos" "5" - "wide" "50" + "wide" "100" "tall" "12" "autoResize" "1" "pinCorner" "2" @@ -1092,10 +1092,10 @@ { "ControlName" "CExLabel" "fieldName" "numMedic" - "xpos" "c150" + "xpos" "c158" "ypos" "319" "zpos" "5" - "wide" "50" + "wide" "100" "tall" "12" "autoResize" "1" "pinCorner" "2" diff --git a/resource/ui/HudDemomanPipes.res b/resource/ui/HudDemomanPipes.res index ae1d341..91b34bb 100644 --- a/resource/ui/HudDemomanPipes.res +++ b/resource/ui/HudDemomanPipes.res @@ -8,7 +8,6 @@ "ypos" "9999" "zpos" "0" "wide" "76" - "wide_minmode" "56" "tall" "38" "visible" "1" "visible_minmode" "0" diff --git a/resource/ui/HudItemEffectMeter.res b/resource/ui/HudItemEffectMeter.res index 3d29a9b..77d9d22 100644 --- a/resource/ui/HudItemEffectMeter.res +++ b/resource/ui/HudItemEffectMeter.res @@ -6,7 +6,7 @@ "visible" "1" "enabled" "1" "xpos" "c-75" - "ypos" "c150" + "ypos" "c137" "wide" "500" "tall" "500" "MeterFG" "White" diff --git a/resource/ui/HudItemEffectMeter_Cleaver.res b/resource/ui/HudItemEffectMeter_Cleaver.res index 537d8dc..74626ca 100644 --- a/resource/ui/HudItemEffectMeter_Cleaver.res +++ b/resource/ui/HudItemEffectMeter_Cleaver.res @@ -6,7 +6,7 @@ "visible" "1" "enabled" "1" "xpos" "c-75" - "ypos" "c137" + "ypos" "c124" "wide" "500" "tall" "500" "MeterFG" "White" diff --git a/resource/ui/HudItemEffectMeter_ParticleCannon.res b/resource/ui/HudItemEffectMeter_ParticleCannon.res index a059747..81749cc 100644 --- a/resource/ui/HudItemEffectMeter_ParticleCannon.res +++ b/resource/ui/HudItemEffectMeter_ParticleCannon.res @@ -6,7 +6,7 @@ "visible" "1" "enabled" "1" "xpos" "c-75" [$WIN32] - "ypos" "c124" [$WIN32] + "ypos" "c111" [$WIN32] "wide" "500" "tall" "500" "MeterFG" "White" diff --git a/resource/ui/HudItemEffectMeter_Pomson.res b/resource/ui/HudItemEffectMeter_Pomson.res index 07b1d87..3f52930 100644 --- a/resource/ui/HudItemEffectMeter_Pomson.res +++ b/resource/ui/HudItemEffectMeter_Pomson.res @@ -6,7 +6,7 @@ "visible" "1" "enabled" "1" "xpos" "c-75" - "ypos" "c124" + "ypos" "c111" "wide" "500" "tall" "500" "MeterFG" "White" diff --git a/resource/ui/HudItemEffectMeter_Raygun.res b/resource/ui/HudItemEffectMeter_Raygun.res index 204e45c..a443d0f 100644 --- a/resource/ui/HudItemEffectMeter_Raygun.res +++ b/resource/ui/HudItemEffectMeter_Raygun.res @@ -6,7 +6,7 @@ "visible" "1" "enabled" "1" "xpos" "c-75" - "ypos" "c137" + "ypos" "c124" "wide" "500" "tall" "500" "MeterFG" "White" diff --git a/resource/ui/HudItemEffectMeter_Scout.res b/resource/ui/HudItemEffectMeter_Scout.res index 2742ff7..ec6c6c9 100644 --- a/resource/ui/HudItemEffectMeter_Scout.res +++ b/resource/ui/HudItemEffectMeter_Scout.res @@ -6,7 +6,7 @@ "visible" "1" "enabled" "1" "xpos" "c-75" - "ypos" "c137" + "ypos" "c124" "wide" "500" "tall" "500" "MeterFG" "White" diff --git a/resource/ui/HudItemEffectMeter_Sniper.res b/resource/ui/HudItemEffectMeter_Sniper.res index ed3e8b4..430f1d7 100644 --- a/resource/ui/HudItemEffectMeter_Sniper.res +++ b/resource/ui/HudItemEffectMeter_Sniper.res @@ -6,7 +6,7 @@ "visible" "1" "enabled" "1" "xpos" "c-75" - "ypos" "c137" + "ypos" "c150" "wide" "500" "tall" "500" "MeterFG" "White" @@ -37,11 +37,11 @@ { "ControlName" "CExLabel" "fieldName" "ItemEffectMeterLabel" - "xpos" "0" - "ypos" "0" + "xpos" "190" + "ypos" "-1" "zpos" "2" - "wide" "150" - "tall" "10" + "wide" "40" + "tall" "8" "autoResize" "1" "pinCorner" "2" "visible" "1" @@ -77,7 +77,7 @@ { "ControlName" "CExLabel" "fieldName" "ItemEffectMeterCount" - "xpos" "25" + "xpos" "190" "ypos" "10" "zpos" "2" "wide" "40" @@ -90,6 +90,26 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "font" "Cerbetica12" + "font" "CerbeticaBold28" + } + "ItemEffectMeterCountBackground" + { + "ControlName" "CExLabel" + "fieldName" "ItemEffectMeterCountBackground" + "xpos" "191" + "ypos" "11" + "zpos" "2" + "wide" "40" + "tall" "20" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "%progresscount%" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "font" "CerbeticaBold28" + "fgcolor" "transparentblack" } } diff --git a/resource/ui/HudItemEffectMeter_SniperFocus.res b/resource/ui/HudItemEffectMeter_SniperFocus.res index 238b9b1..70610fc 100644 --- a/resource/ui/HudItemEffectMeter_SniperFocus.res +++ b/resource/ui/HudItemEffectMeter_SniperFocus.res @@ -6,7 +6,7 @@ "visible" "1" "enabled" "1" "xpos" "c-75" - "ypos" "c124" + "ypos" "c111" "wide" "500" "tall" "500" "MeterFG" "White" diff --git a/resource/ui/HudItemEffectMeter_SodaPopper.res b/resource/ui/HudItemEffectMeter_SodaPopper.res index e7e7395..1e465f9 100644 --- a/resource/ui/HudItemEffectMeter_SodaPopper.res +++ b/resource/ui/HudItemEffectMeter_SodaPopper.res @@ -6,7 +6,7 @@ "visible" "1" "enabled" "1" "xpos" "c-75" - "ypos" "c124" + "ypos" "c111" "wide" "500" "tall" "500" "MeterFG" "White" diff --git a/resource/ui/HudItemEffectMeter_Spy.res b/resource/ui/HudItemEffectMeter_Spy.res index 52b2f40..0b240dd 100644 --- a/resource/ui/HudItemEffectMeter_Spy.res +++ b/resource/ui/HudItemEffectMeter_Spy.res @@ -5,10 +5,10 @@ "fieldName" "HudItemEffectMeter" "visible" "1" "enabled" "1" - "xpos" "r90" - "ypos" "r30" - "wide" "80" - "tall" "20" + "xpos" "c-75" + "ypos" "c124" + "wide" "500" + "tall" "500" "MeterFG" "White" "MeterBG" "Gray" } @@ -37,10 +37,10 @@ { "ControlName" "CExLabel" "fieldName" "ItemEffectMeterLabel" - "xpos" "0" - "ypos" "0" + "xpos" "190" + "ypos" "-1" "zpos" "2" - "wide" "150" + "wide" "40" "tall" "8" "autoResize" "1" "pinCorner" "2" @@ -80,7 +80,7 @@ { "ControlName" "CExLabel" "fieldName" "ItemEffectMeterCount" - "xpos" "25" + "xpos" "190" "ypos" "10" "zpos" "2" "wide" "40" @@ -93,6 +93,26 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "font" "Cerbetica12" + "font" "CerbeticaBold28" + } + "ItemEffectMeterCountBackground" + { + "ControlName" "CExLabel" + "fieldName" "ItemEffectMeterCountBackground" + "xpos" "191" + "ypos" "11" + "zpos" "2" + "wide" "40" + "tall" "20" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "%progresscount%" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "font" "CerbeticaBold28" + "fgcolor" "transparentblack" } } diff --git a/resource/ui/HudItemEffectMeter_SpyKnife.res b/resource/ui/HudItemEffectMeter_SpyKnife.res index 2efdfa3..e826143 100644 --- a/resource/ui/HudItemEffectMeter_SpyKnife.res +++ b/resource/ui/HudItemEffectMeter_SpyKnife.res @@ -6,7 +6,7 @@ "visible" "1" "enabled" "1" "xpos" "c-75" - "ypos" "c137" + "ypos" "c124" "wide" "500" "tall" "500" "MeterFG" "White" diff --git a/resource/ui/HudObjectiveFlagPanel-minmode.res b/resource/ui/HudObjectiveFlagPanel-minmode.res index a55d84c..b6aa72a 100644 --- a/resource/ui/HudObjectiveFlagPanel-minmode.res +++ b/resource/ui/HudObjectiveFlagPanel-minmode.res @@ -219,7 +219,7 @@ "textAlignment" "west" "labelText" "%redscore%" "font" "Cerbetica40" - "fgcolor" "205 92 92 153" + "fgcolor" "205 50 50 153" "if_hybrid" { @@ -427,22 +427,22 @@ { "ControlName" "CTFArrowPanel" "fieldName" "CaptureFlag" - "xpos" "9999" - "ypos" "9999" [$WIN32] + "xpos" "c-28" + "ypos" "r100" [$WIN32] "zpos" "5" - "wide" "60" - "tall" "60" + "wide" "56" + "tall" "56" "visible" "0" "enabled" "1" "if_hybrid" { - "ypos" "r200" + "ypos" "r100" } "if_specialdelivery" { - "ypos" "r200" + "ypos" "r100" } } diff --git a/resource/ui/HudObjectiveFlagPanel.res b/resource/ui/HudObjectiveFlagPanel.res index 62655be..4b1d6a9 100644 --- a/resource/ui/HudObjectiveFlagPanel.res +++ b/resource/ui/HudObjectiveFlagPanel.res @@ -59,7 +59,7 @@ "tall" "100" "visible" "1" "enabled" "1" - "fillcolor" "205 92 92 153" + "fillcolor" "205 50 50 153" "scaleImage" "1" "if_hybrid" @@ -427,22 +427,22 @@ { "ControlName" "CTFArrowPanel" "fieldName" "CaptureFlag" - "xpos" "c-30" - "ypos" "r200" [$WIN32] + "xpos" "c-28" + "ypos" "r100" [$WIN32] "zpos" "5" - "wide" "60" - "tall" "60" + "wide" "56" + "tall" "56" "visible" "0" "enabled" "1" "if_hybrid" { - "ypos" "r200" + "ypos" "r100" } "if_specialdelivery" { - "ypos" "r200" + "ypos" "r100" } } diff --git a/resource/ui/MvMScoreboard.res b/resource/ui/MvMScoreboard.res index ca51b62..838d8de 100644 --- a/resource/ui/MvMScoreboard.res +++ b/resource/ui/MvMScoreboard.res @@ -96,7 +96,7 @@ "fieldName" "MvMPlayerList" "xpos" "110" "ypos" "79" - "wide" "380" + "wide" "420" "tall" "150" "pinCorner" "0" "visible" "1" diff --git a/resource/ui/ScoreBoard.res b/resource/ui/ScoreBoard.res index d21f51f..0415c58 100644 --- a/resource/ui/ScoreBoard.res +++ b/resource/ui/ScoreBoard.res @@ -1536,8 +1536,8 @@ { "ControlName" "CTFHudMannVsMachineScoreboard" "fieldName" "MvMScoreboard" - "xpos" "200" - "ypos" "0" + "xpos" "100" + "ypos" "5" "zpos" "10" "wide" "f0" "tall" "480" diff --git a/resource/ui/Teammenu.res b/resource/ui/Teammenu.res index fcb6ae1..2f87005 100644 --- a/resource/ui/Teammenu.res +++ b/resource/ui/Teammenu.res @@ -39,7 +39,7 @@ "tall" "40" "visible" "1" "enabled" "1" - "fillcolor" "205 92 92 125" + "fillcolor" "205 50 50 153" } "AutojoinBackground" { diff --git a/resource/ui/winpanel.res b/resource/ui/winpanel.res index 45d05b2..ab9e3f2 100644 --- a/resource/ui/winpanel.res +++ b/resource/ui/winpanel.res @@ -38,7 +38,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fillcolor" "205 92 92 153" + "fillcolor" "205 50 50 153" "scaleImage" "1" } "BlueTeamLabel" -- cgit v1.2.3