diff options
45 files changed, 1567 insertions, 570 deletions
diff --git a/resource/scheme/clientscheme_borders.res b/resource/scheme/clientscheme_borders.res index b0522f4..02f7784 100644 --- a/resource/scheme/clientscheme_borders.res +++ b/resource/scheme/clientscheme_borders.res @@ -126,27 +126,27 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 1" } "2" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "1 1" } "3" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "2 1" } "4" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "3 1" } "5" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "4 1" } } @@ -154,27 +154,27 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 1" } "2" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "1 1" } "3" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "2 1" } "4" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "3 1" } "5" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "4 1" } } @@ -182,27 +182,27 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 1" } "2" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "1 1" } "3" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "2 1" } "4" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "3 1" } "5" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "4 1" } } @@ -214,27 +214,27 @@ Scheme { "1" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "0 1" } "2" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "1 1" } "3" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "2 1" } "4" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "3 1" } "5" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "4 1" } } @@ -242,27 +242,27 @@ Scheme { "1" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "0 1" } "2" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "1 1" } "3" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "2 1" } "4" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "3 1" } "5" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "4 1" } } @@ -270,27 +270,27 @@ Scheme { "1" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "0 1" } "2" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "1 1" } "3" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "2 1" } "4" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "3 1" } "5" { - "color" "15 100 100 255" + "color" "ColorCyanFade" "offset" "4 1" } } @@ -303,7 +303,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 4" } } @@ -311,7 +311,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } } @@ -319,7 +319,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } } @@ -327,7 +327,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } } @@ -340,17 +340,17 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } "2" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "1 0" } "3" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "2 0" } } @@ -358,17 +358,17 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } "2" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "1 0" } "3" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "2 0" } } @@ -376,17 +376,17 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } "2" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "1 0" } "3" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "2 0" } } @@ -394,17 +394,17 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } "2" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "1 0" } "3" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "2 0" } } @@ -909,7 +909,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } } @@ -917,7 +917,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } } @@ -925,7 +925,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } } @@ -933,7 +933,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } } @@ -946,7 +946,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } } @@ -954,7 +954,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } } @@ -962,7 +962,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } } @@ -970,7 +970,7 @@ Scheme { "1" { - "color" "15 255 255 255" + "color" "ColorCyan" "offset" "0 0" } } diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res index db9b858..2511b38 100644 --- a/resource/scheme/clientscheme_colors.res +++ b/resource/scheme/clientscheme_colors.res @@ -9,6 +9,7 @@ "ColorYellow" "255 255 0 255" "ColorGreen" "48 255 48 255" "ColorCyan" "72 255 255 255" + "ColorCyanFade" "72 100 100 255" "ColorBlue" "0 0 255 255" "ColorPurple" "128 0 255 255" "ColorMagenta" "255 0 255 255" diff --git a/resource/ui/charinfoloadoutsubpanel.res b/resource/ui/charinfoloadoutsubpanel.res index eb1fd8a..8cf14f7 100644 --- a/resource/ui/charinfoloadoutsubpanel.res +++ b/resource/ui/charinfoloadoutsubpanel.res @@ -613,11 +613,11 @@ "ypos" "300" "zpos" "1" "wide" "f0" - "tall" "30" + "tall" "0" "autoResize" "0" "pinCorner" "0" - "visible" "0" - "enabled" "0" + "visible" "1" + "enabled" "1" "fgcolor_override" "ColorCyan" } diff --git a/resource/ui/compstats.res b/resource/ui/compstats.res index 2a429ba..8f467d0 100644 --- a/resource/ui/compstats.res +++ b/resource/ui/compstats.res @@ -68,6 +68,7 @@ "font" "HudFontSmallest" "fgcolor_override" "TanLight" "textAlignment" "center" + "allcaps" "1" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -90,6 +91,7 @@ "font" "HudFontSmallest" "fgcolor_override" "TanLight" "textAlignment" "center" + "allcaps" "1" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -358,7 +360,6 @@ "ypos" "7" "wide" "p0.95" "tall" "p0.98" - "tall" "f20" "visible" "0" "enabled" "1" "mouseinputenabled" "1" diff --git a/resource/ui/craftingstatusdialog.res b/resource/ui/craftingstatusdialog.res index 97c8dd5..71bd14b 100644 --- a/resource/ui/craftingstatusdialog.res +++ b/resource/ui/craftingstatusdialog.res @@ -61,7 +61,7 @@ "centerwrap" "1" "labelText" "%updatetext%" "textAlignment" "center" - "fgcolor_override" "TanLight" + "fgcolor_override" "ColorCyan" "bgcolor_override" "Transparent" "auto_wide_tocontents" "1" diff --git a/resource/ui/dynamicrecipepanel.res b/resource/ui/dynamicrecipepanel.res index ed98d74..2658a54 100644 --- a/resource/ui/dynamicrecipepanel.res +++ b/resource/ui/dynamicrecipepanel.res @@ -105,7 +105,7 @@ { "ControlName" "CExLabel" "fieldName" "RecipeTitle" - "font" "HudFontMediumSmall" + "font" "HudFontSmall" "labelText" "%recipetitle%" "textAlignment" "west" "xpos" "80" diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res index a3ce0cc..05e4276 100644 --- a/resource/ui/econ/inspectionpanel.res +++ b/resource/ui/econ/inspectionpanel.res @@ -39,6 +39,11 @@ "noitem_textcolor" "TanDark" "PaintBackgroundType" "2" + "consume_mode" + { + "xpos" "cs-1.1" + } + "itemmodelpanel" { "use_item_rendertarget" "0" @@ -135,6 +140,12 @@ "display_vertically" "0" "align" "west" + "consume_mode" + { + "xpos" "cs-0.5" + "ypos" "r140" + } + "ButtonSettings" { "wide" "19" @@ -234,6 +245,11 @@ "tall" "60" "visible" "1" } + "consume_mode" + { + "xpos" "cs-0.5" + "ypos" "r120" + } "DebugButton" { diff --git a/resource/ui/econ/paintkitconsumedialog.res b/resource/ui/econ/paintkitconsumedialog.res index f93d233..aef33ff 100644 --- a/resource/ui/econ/paintkitconsumedialog.res +++ b/resource/ui/econ/paintkitconsumedialog.res @@ -25,7 +25,8 @@ "tall" "30" "visible" "1" "enabled" "1" - "fgcolor_override" "TanLight" + "allcaps" "1" + "fgcolor_override" "ColorCyan" "proportionaltoparent" "1" } @@ -221,7 +222,7 @@ { "fieldName" "InspectionPanel" "xpos" "0" - "ypos" "40" + "ypos" "30" "zpos" "10" "wide" "f0" "tall" "350" @@ -275,6 +276,7 @@ "textinsetx" "50" "dulltext" "0" "brighttext" "0" + "allcaps" "1" "Command" "accept" "proportionaltoparent" "1" "sound_depressed" "UI/buttonclick.wav" diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res index 12a1407..87cf077 100644 --- a/resource/ui/econ/store/v2/storehome_base.res +++ b/resource/ui/econ/store/v2/storehome_base.res @@ -269,8 +269,9 @@ "tabPosition" "0" "textAlignment" "center" "scaleImage" "1" - "font" "HudFontSmall" + "font" "HudFontSmallest" "fgcolor" "TanLight" + "allcaps" "1" "defaultBgColor_override" "TanDarker" "defaultFgColor_override" "TanLight" @@ -442,8 +443,8 @@ { "ControlName" "CExButton" "fieldName" "MarketPlaceButton" - "xpos" "c-239" - "ypos" "334" + "xpos" "c-20" + "ypos" "31" "zpos" "2" "wide" "170" "tall" "23" @@ -453,7 +454,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#Store_MarketPlace" - "font" "HudFontSmall" + "font" "HudFontSmallest" "textAlignment" "center" "dulltext" "0" "brighttext" "0" diff --git a/resource/ui/hudarenaplayercount.res b/resource/ui/hudarenaplayercount.res index 50a5fb9..30fdd51 100644 --- a/resource/ui/hudarenaplayercount.res +++ b/resource/ui/hudarenaplayercount.res @@ -4,11 +4,11 @@ { "ControlName" "EditablePanel" "fieldName" "blueteam" - "xpos" "c-46" + "xpos" "c-65" "ypos" "0" "zpos" "0" - "wide" "46" - "tall" "23" + "wide" "45" + "tall" "25" "visible" "1" "background" @@ -18,22 +18,23 @@ "xpos" "0" "ypos" "0" "zpos" "0" - "wide" "46" - "tall" "23" + "wide" "45" + "tall" "25" "visible" "1" "enabled" "1" - "bgcolor_override" "BlueSolid" + "bgcolor_override" "Blue" + "PaintBackgroundType" "2" } "count" { "ControlName" "CExLabel" "fieldName" "count" - "xpos" "13" + "xpos" "0" "ypos" "0" "zpos" "2" - "wide" "30" - "tall" "23" + "wide" "45" + "tall" "25" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -42,6 +43,7 @@ "labelText" "%blue_alive%" "textAlignment" "east" "fgcolor" "TanLight" + "textinsetx" "10" } "countshadow" { @@ -50,8 +52,8 @@ "xpos" "-2" "ypos" "-2" "zpos" "1" - "wide" "30" - "tall" "23" + "wide" "45" + "tall" "25" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -60,6 +62,7 @@ "labelText" "%blue_alive%" "textAlignment" "east" "fgcolor" "TransparentBlack" + "textinsetx" "10" "pin_to_sibling" "count" } @@ -67,8 +70,8 @@ { "ControlName" "ImagePanel" "fieldName" "playerimage" - "xpos" "3" - "ypos" "3" + "xpos" "4" + "ypos" "4" "zpos" "3" "wide" "10" "tall" "18" @@ -83,11 +86,11 @@ { "ControlName" "EditablePanel" "fieldName" "redteam" - "xpos" "c0" + "xpos" "c20" "ypos" "0" "zpos" "0" - "wide" "46" - "tall" "23" + "wide" "45" + "tall" "25" "visible" "1" "background" @@ -97,22 +100,23 @@ "xpos" "0" "ypos" "0" "zpos" "0" - "wide" "46" - "tall" "23" + "wide" "45" + "tall" "25" "visible" "1" "enabled" "1" - "bgcolor_override" "RedSolid" + "bgcolor_override" "Red" + "PaintBackgroundType" "2" } "count" { "ControlName" "CExLabel" "fieldName" "count" - "xpos" "3" + "xpos" "0" "ypos" "0" "zpos" "2" - "wide" "30" - "tall" "23" + "wide" "45" + "tall" "25" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -121,6 +125,7 @@ "labelText" "%red_alive%" "textAlignment" "west" "fgcolor" "TanLight" + "textinsetx" "10" } "countshadow" { @@ -129,8 +134,8 @@ "xpos" "-2" "ypos" "-2" "zpos" "1" - "wide" "30" - "tall" "23" + "wide" "45" + "tall" "25" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -139,6 +144,7 @@ "labelText" "%red_alive%" "textAlignment" "west" "fgcolor" "TransparentBlack" + "textinsetx" "10" "pin_to_sibling" "count" } @@ -146,8 +152,8 @@ { "ControlName" "ImagePanel" "fieldName" "playerimage" - "xpos" "33" - "ypos" "3" + "xpos" "30" + "ypos" "4" "zpos" "3" "wide" "10" "tall" "18" diff --git a/resource/ui/hudarenateammenu.res b/resource/ui/hudarenateammenu.res index ae720b7..272c38e 100644 --- a/resource/ui/hudarenateammenu.res +++ b/resource/ui/hudarenateammenu.res @@ -13,7 +13,6 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "fgcolor" "255 0 0 255" } "SidePanelBG" @@ -28,7 +27,7 @@ "visible" "1" "enabled" "1" "scaleImage" "1" - "fillcolor" "0 0 0 120" + "fillcolor" "0 0 0 100" } "SysMenu" @@ -66,14 +65,15 @@ "ControlName" "Label" "fieldName" "mapname" "xpos" "0" - "ypos" "35" + "ypos" "c-75" "zpos" "1" "wide" "255" - "tall" "30" + "tall" "25" "textAlignment" "center" - "font" "Cerbetica28" + "font" "Cerbetica32" "visible" "1" "enabled" "1" + "allcaps" "1" "fgcolor_override" "TanLight" } @@ -82,8 +82,8 @@ "ControlName" "CTFTeamButton" "fieldName" "teambutton2" "xpos" "0" - "ypos" "c-35" - "zpos" "3" + "ypos" "15" + "zpos" "1" "wide" "255" "tall" "30" "autoResize" "0" @@ -98,11 +98,23 @@ "command" "jointeam spectate" "font" "Cerbetica20" "allcaps" "1" - - "defaultFgColor_override" "255 255 255 128" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "255 255 255 128" - "selectedFgColor_override" "TanLight" + + "defaultBgColor_override" "TransparentBlack" + "armedBgColor_override" "ColorWhite" + "depressedBgColor_override" "TransparentBlack" + "selectedBgColor_override" "ColorWhite" + + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "TanDark" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "TanDark" + + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + + "pin_to_sibling" "mapname" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_BOTTOMLEFT" } "teambutton3" @@ -110,8 +122,8 @@ "ControlName" "CTFTeamButton" "fieldName" "teambutton3" "xpos" "0" - "ypos" "c5" - "zpos" "3" + "ypos" "5" + "zpos" "1" "wide" "255" "tall" "30" "autoResize" "0" @@ -125,11 +137,23 @@ "brighttext" "0" "command" "jointeam spectatearena" "font" "Cerbetica20" - - "defaultFgColor_override" "255 255 255 128" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "255 255 255 128" - "selectedFgColor_override" "TanLight" + + "defaultBgColor_override" "TransparentBlack" + "armedBgColor_override" "ColorWhite" + "depressedBgColor_override" "TransparentBlack" + "selectedBgColor_override" "ColorWhite" + + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "TanDark" + "depressedFgColor_override" "TanLight" + "selectedFgColor_override" "TanDark" + + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + + "pin_to_sibling" "teambutton2" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_BOTTOMLEFT" } "CancelButton" @@ -139,34 +163,6 @@ "wide" "0" } - "FightBG" - { - "ControlName" "EditablePanel" - "fieldName" "FightBG" - "xpos" "0" - "ypos" "c-35" - "zpos" "0" - "wide" "255" - "tall" "30" - "visible" "1" - "enabled" "1" - "bgcolor_override" "TransparentBlack" - } - - "SpectateBG" - { - "ControlName" "EditablePanel" - "fieldName" "SpectateBG" - "xpos" "0" - "ypos" "c5" - "zpos" "0" - "wide" "255" - "tall" "30" - "visible" "1" - "enabled" "1" - "bgcolor_override" "TransparentBlack" - } - "MenuBG" { "ControlName" "ImagePanel" diff --git a/resource/ui/hudcurrencyaccount.res b/resource/ui/hudcurrencyaccount.res index 3776fb5..dcd8065 100644 --- a/resource/ui/hudcurrencyaccount.res +++ b/resource/ui/hudcurrencyaccount.res @@ -47,6 +47,7 @@ "tall" "20" "visible" "1" "enabled" "1" + "allcaps" "1" "textAlignment" "west" "labelText" "#TF_PVE_Currency" } diff --git a/resource/ui/huditemeffectmeter.res b/resource/ui/huditemeffectmeter.res index f6056a2..6a5ea05 100644 --- a/resource/ui/huditemeffectmeter.res +++ b/resource/ui/huditemeffectmeter.res @@ -6,7 +6,7 @@ "visible" "1" "enabled" "1" "xpos" "c-75" - "xpos_minmode" "c-55" + "xpos_minmode" "c-50" "ypos" "c103" "ypos_minmode" "c48" "wide" "180" @@ -45,7 +45,7 @@ "ypos" "0" "zpos" "2" "wide" "120" - "wide_minmode" "110" + "wide_minmode" "100" "tall" "8" "tall_minmode" "5" "autoResize" "0" diff --git a/resource/ui/huditemeffectmeter_powerupbottle.res b/resource/ui/huditemeffectmeter_powerupbottle.res index c67b085..9864812 100644 --- a/resource/ui/huditemeffectmeter_powerupbottle.res +++ b/resource/ui/huditemeffectmeter_powerupbottle.res @@ -5,10 +5,8 @@ "fieldName" "HudItemEffectMeter" "visible" "1" "enabled" "1" - "xpos" "c-267" - "xpos_minmode" "c-250" - "ypos" "r72" - "ypos_minmode" "r146" + "xpos" "r105" + "ypos" "r66" "wide" "100" "tall" "60" "MeterFG" "White" @@ -66,6 +64,7 @@ "visible" "1" "enabled" "1" "textAlignment" "west" + "allcaps" "1" "labelText" "#TF_Spell_Athletic" } diff --git a/resource/ui/hudmannvsmachinestatus.res b/resource/ui/hudmannvsmachinestatus.res index d89c4a6..4ddc7d8 100644 --- a/resource/ui/hudmannvsmachinestatus.res +++ b/resource/ui/hudmannvsmachinestatus.res @@ -4,10 +4,10 @@ { "ControlName" "CWaveStatusPanel" "fieldName" "WaveStatusPanel" - "xpos" "c-300" + "xpos" "c-100" "ypos" "0" "zpos" "0" - "wide" "600" + "wide" "200" "tall" "67" "visible" "1" "enabled" "1" @@ -47,10 +47,8 @@ { "ControlName" "CCurrencyStatusPanel" "fieldName" "CurrencyStatusPanel" - "xpos" "c-267" - "xpos_minmode" "c-250" - "ypos" "r114" - "ypos_minmode" "r190" + "xpos" "r105" + "ypos" "r45" "wide" "100" "tall" "20" "visible" "1" @@ -61,10 +59,8 @@ { "ControlName" "CInWorldCurrencyStatus" "fieldName" "InWorldCurrencyPanel" - "xpos" "c-267" - "xpos_minmode" "c-250" - "ypos" "r93" - "ypos_minmode" "r168" + "xpos" "r105" + "ypos" "r25" "wide" "100" "tall" "20" "visible" "1" diff --git a/resource/ui/hudmatchstatus-base.res b/resource/ui/hudmatchstatus-base.res index 90ea1a3..5a57cda 100644 --- a/resource/ui/hudmatchstatus-base.res +++ b/resource/ui/hudmatchstatus-base.res @@ -210,7 +210,7 @@ { "ControlName" "EditablePanel" "fieldName" "ObjectiveStatusTimePanel" - "xpos" "c-40" + "xpos" "c-25" "ypos" "0" "zpos" "2" "wide" "75" @@ -220,8 +220,8 @@ "delta_item_x" "20" "delta_item_start_y" "20" "delta_item_end_y" "35" - "PositiveColor" "0 255 0 255" - "NegativeColor" "255 0 0 255" + "PositiveColor" "ColorGreen" + "NegativeColor" "ColorRed" "delta_lifetime" "1" "delta_item_font" "HudFontMediumSmall" @@ -236,7 +236,7 @@ "fieldName" "TimePanelValue" "font" "HudFontMediumSmall" "fgcolor" "TanLight" - "xpos" "15" + "xpos" "0" "ypos" "0" "zpos" "3" "wide" "50" @@ -248,7 +248,6 @@ if_match { - "xpos" "15" "ypos" "10" "tall" "15" "font" "HudFontSmall" @@ -288,12 +287,12 @@ "zpos" "1" "proportionaltoparent" "1" - "color_portrait_bg_red" "205 50 50 150" - "color_portrait_bg_blue" "70 130 180 150" + "color_portrait_bg_red" "Red" + "color_portrait_bg_blue" "Blue" "color_portrait_bg_red_dead" "79 54 52 255" "color_portrait_bg_blue_dead" "44 49 51 255" "color_bar_health_high" "Health Buff" - "color_bar_health_med" "191 183 58 255" + "color_bar_health_med" "Health Normal" "percentage_health_med" "0.5" "color_bar_health_low" "Health Hurt" "percentage_health_low" "0.2" @@ -337,7 +336,7 @@ "ypos" "0" "zpos" "2" "wide" "f0" - "tall" "19" + "tall" "20" "visible" "1" "enabled" "1" "PaintBackgroundType" "0" diff --git a/resource/ui/hudmediccharge.res b/resource/ui/hudmediccharge.res index 75d129e..0de14eb 100644 --- a/resource/ui/hudmediccharge.res +++ b/resource/ui/hudmediccharge.res @@ -21,13 +21,13 @@ { "ControlName" "CExLabel" "fieldName" "ChargeLabel" - "xpos" "c80" - "ypos" "35" - "xpos_minmode" "106" - "ypos_minmode" "-5" + "xpos" "c90" + "ypos" "45" + "xpos_minmode" "c40" + "ypos_minmode" "5" "zpos" "2" - "wide" "120" - "tall" "72" + "wide" "100" + "tall" "50" "autoResize" "1" "pinCorner" "2" "visible" "1" @@ -49,8 +49,8 @@ "xpos" "-2" "ypos" "-2" "zpos" "1" - "wide" "120" - "tall" "72" + "wide" "100" + "tall" "50" "autoResize" "1" "pinCorner" "2" "visible" "1" @@ -74,14 +74,14 @@ "ControlName" "CExImageButton" "fieldName" "IndividualChargesLabel" "xpos" "c80" - "ypos" "56" + "ypos" "55" "zpos" "2" - "wide" "122" - "tall" "34" - "xpos_minmode" "140" - "ypos_minmode" "23" - "wide_minmode" "102" - "tall_minmode" "20" + "wide" "120" + "tall" "35" + "xpos_minmode" "c40" + "ypos_minmode" "20" + "wide_minmode" "100" + "tall_minmode" "22" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -120,14 +120,14 @@ "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter" "font" "Default" - "xpos" "c-75" - "ypos" "60" - "xpos_minmode" "10" - "ypos_minmode" "35" + "xpos" "15" + "ypos" "5" + "xpos_minmode" "-15" + "ypos_minmode" "0" "zpos" "2" "wide" "150" "tall" "20" - "wide_minmode" "125" + "wide_minmode" "115" "tall_minmode" "10" "autoResize" "0" "pinCorner" "0" @@ -138,6 +138,10 @@ "brighttext" "0" "fgcolor_override" "Uber Bar Color" "bgcolor_override" "32 32 32 128" + + "pin_to_sibling" "ChargeLabel" + "pin_corner_to_sibling" "PIN_CENTER_RIGHT" + "pin_to_sibling_corner" "PIN_CENTER_LEFT" } "ChargeMeter1" @@ -145,13 +149,13 @@ "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter1" "font" "Default" - "xpos" "-3" - "ypos" "-3" + "xpos" "-2" + "ypos" "-2" "zpos" "3" "wide" "28" - "tall" "28" - "wide_minmode" "22" - "tall_minmode" "10" + "tall" "31" + "wide_minmode" "23" + "tall_minmode" "18" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -172,9 +176,9 @@ "ypos" "0" "zpos" "4" "wide" "28" - "tall" "28" - "wide_minmode" "22" - "tall_minmode" "10" + "tall" "31" + "wide_minmode" "23" + "tall_minmode" "18" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -198,9 +202,9 @@ "ypos" "0" "zpos" "4" "wide" "28" - "tall" "28" - "wide_minmode" "22" - "tall_minmode" "10" + "tall" "31" + "wide_minmode" "23" + "tall_minmode" "18" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -224,9 +228,9 @@ "ypos" "0" "zpos" "4" "wide" "28" - "tall" "28" - "wide_minmode" "22" - "tall_minmode" "10" + "tall" "31" + "wide_minmode" "23" + "tall_minmode" "18" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -261,7 +265,7 @@ "fieldName" "ResistIconAnchor" "xpos" "c80" "ypos" "95" - "xpos_minmode" "210" + "xpos_minmode" "c40" "ypos_minmode" "48" "wide" "30" "tall" "30" @@ -277,6 +281,8 @@ "ypos" "0" "wide" "30" "tall" "30" + "wide_minmode" "25" + "tall_minmode" "25" "visible" "1" "enabled" "1" "image" "../HUD/defense_buff_bullet_blue" diff --git a/resource/ui/hudminigame_base.res b/resource/ui/hudminigame_base.res index 2fde2d2..edd4d89 100644 --- a/resource/ui/hudminigame_base.res +++ b/resource/ui/hudminigame_base.res @@ -4,15 +4,14 @@ { "ControlName" "ImagePanel" "fieldName" "LeftSideBG" - "xpos" "c-120" - "ypos" "r20" - "zpos" "-1" - "wide" "120" - "tall" "14" + "xpos" "c-60" + "ypos" "r30" + "zpos" "0" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" - "fillcolor" "BlueSolid" - "scaleImage" "1" + "fillcolor" "Blue" } "RightSideBG" @@ -20,14 +19,13 @@ "ControlName" "ImagePanel" "fieldName" "RightSideBG" "xpos" "c0" - "ypos" "r20" - "zpos" "-1" - "wide" "120" - "tall" "14" + "ypos" "r30" + "zpos" "0" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" - "fillcolor" "RedSolid" - "scaleImage" "1" + "fillcolor" "Red" } "OutlineBG" @@ -41,17 +39,18 @@ { "ControlName" "CExLabel" "fieldName" "BlueScore" - "xpos" "c-57" - "ypos" "r33" + "xpos" "c-60" + "ypos" "r30" "zpos" "8" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "east" "labelText" "%bluescore%" "font" "Cerbetica40" "fgcolor" "TanLight" + "textinsetx" "10" } "BlueScoreShadow" { @@ -60,14 +59,15 @@ "xpos" "-2" "ypos" "-2" "zpos" "7" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "east" "labelText" "%bluescore%" "font" "Cerbetica40" "fgcolor" "TransparentBlack" + "textinsetx" "10" "pin_to_sibling" "BlueScore" } @@ -75,17 +75,18 @@ { "ControlName" "CExLabel" "fieldName" "RedScore" - "xpos" "c7" - "ypos" "r33" + "xpos" "c0" + "ypos" "r30" "zpos" "8" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "west" "labelText" "%redscore%" "font" "Cerbetica40" "fgcolor" "TanLight" + "textinsetx" "10" } "RedScoreShadow" { @@ -94,14 +95,15 @@ "xpos" "-2" "ypos" "-2" "zpos" "7" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "west" "labelText" "%redscore%" "font" "Cerbetica40" "fgcolor" "TransparentBlack" + "textinsetx" "10" "pin_to_sibling" "RedScore" } @@ -128,15 +130,15 @@ { "ControlName" "EditablePanel" "fieldName" "PlayingToBG" - "xpos" "c-50" + "xpos" "c-60" "ypos" "r50" - "zpos" "3" - "wide" "100" + "zpos" "0" + "wide" "120" "tall" "20" "visible" "1" "enabled" "1" "bgcolor_override" "Transparent" - "PaintBackgroundType" "0" + "PaintBackgroundType" "2" } "GameImage" diff --git a/resource/ui/hudobjectiveflagpanel.res b/resource/ui/hudobjectiveflagpanel.res index 3f2623e..c709fbf 100644 --- a/resource/ui/hudobjectiveflagpanel.res +++ b/resource/ui/hudobjectiveflagpanel.res @@ -24,9 +24,9 @@ "fieldName" "LeftSideBG" "xpos" "c-60" "ypos" "r30" - "zpos" "-1" + "zpos" "0" "wide" "60" - "tall" "34" + "tall" "30" "visible" "1" "enabled" "1" "fillcolor" "Blue" @@ -53,9 +53,9 @@ "fieldName" "RightSideBG" "xpos" "c0" "ypos" "r30" - "zpos" "-1" + "zpos" "0" "wide" "60" - "tall" "34" + "tall" "30" "visible" "1" "enabled" "1" "fillcolor" "Red" @@ -87,17 +87,18 @@ { "ControlName" "CExLabel" "fieldName" "BlueScore" - "xpos" "c-57" - "ypos" "r33" + "xpos" "c-60" + "ypos" "r30" "zpos" "8" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "east" "labelText" "%bluescore%" "font" "Cerbetica40" "fgcolor" "TanLight" + "textinsetx" "10" "if_hybrid" { @@ -121,14 +122,15 @@ "xpos" "-2" "ypos" "-2" "zpos" "7" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "east" "labelText" "%bluescore%" "font" "Cerbetica40" "fgcolor" "TransparentBlack" + "textinsetx" "10" "pin_to_sibling" "BlueScore" "if_hybrid" @@ -151,17 +153,18 @@ { "ControlName" "CExLabel" "fieldName" "RedScore" - "xpos" "c7" - "ypos" "r33" + "xpos" "c0" + "ypos" "r30" "zpos" "8" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "west" "labelText" "%redscore%" "font" "Cerbetica40" "fgcolor" "TanLight" + "textinsetx" "10" "if_hybrid" { @@ -186,14 +189,15 @@ "xpos" "-2" "ypos" "-2" "zpos" "7" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "west" "labelText" "%redscore%" "font" "Cerbetica40" "fgcolor" "TransparentBlack" + "textinsetx" "10" "pin_to_sibling" "RedScore" "if_hybrid" @@ -231,7 +235,20 @@ { "ControlName" "ImagePanel" "fieldName" "CarriedImage" - "xpos" "9999" + "xpos" "cs-0.5" + "ypos" "r82" + "zpos" "10" + "wide" "32" + "tall" "32" + "visible" "0" + "enabled" "1" + "image" "../hud/objectives_flagpanel_carried_red" + "scaleImage" "1" + + "if_specialdelivery" + { + "ypos" "r82" + } } "PlayingTo" @@ -270,17 +287,17 @@ "PlayingToBG" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "PlayingToBG" - "xpos" "c-50" + "xpos" "c-60" "ypos" "r50" - "zpos" "3" - "wide" "100" + "zpos" "0" + "wide" "120" "tall" "20" "visible" "1" "enabled" "1" - "fillcolor" "Transparent" - "scaleImage" "1" + "bgcolor_override" "Transparent" + "PaintBackgroundType" "2" "if_hybrid" { diff --git a/resource/ui/hudobjectivekothtimepanel.res b/resource/ui/hudobjectivekothtimepanel.res index 58e032c..26d8d57 100644 --- a/resource/ui/hudobjectivekothtimepanel.res +++ b/resource/ui/hudobjectivekothtimepanel.res @@ -15,16 +15,17 @@ "xpos" "0" "ypos" "0" "zpos" "10" - "wide" "100" - "tall" "50" + "wide" "50" + "tall" "25" "visible" "1" "enabled" "1" if_match { "proportionaltoparent" "1" - "xpos" "cs-.7" - "ypos" "5" + "xpos" "cs-1.0" + "ypos" "0" + "wide" "26" "delta_item_x" "10" "delta_item_start_y" "12" "delta_item_end_y" "50" @@ -40,7 +41,7 @@ "fieldName" "TimePanelValue" "font" "HudFontMedium" "fgcolor" "BlueSolid" - "xpos" "15" + "xpos" "0" "ypos" "0" "zpos" "3" "wide" "50" @@ -53,10 +54,12 @@ if_match { "proportionaltoparent" "1" - "xpos" "11" - "ypos" "8" - "tall" "10" - "wide" "25" + "xpos" "0" + "ypos" "0" + "wide" "26" + "tall" "25" + "textAlignment" "south" + "textinsety" "-2" "font" "HudFontSmallest" } } @@ -69,16 +72,17 @@ "xpos" "50" "ypos" "0" "zpos" "10" - "wide" "100" - "tall" "150" + "wide" "50" + "tall" "25" "visible" "1" "enabled" "1" if_match { "proportionaltoparent" "1" - "xpos" "cs-0.77" - "ypos" "5" + "xpos" "cs0" + "ypos" "0" + "wide" "26" "delta_item_x" "50" "delta_item_start_y" "12" "delta_item_end_y" "50" @@ -94,11 +98,11 @@ "fieldName" "TimePanelValue" "font" "HudFontMedium" "fgcolor" "RedSolid" - "xpos" "15" + "xpos" "0" "ypos" "0" "zpos" "3" "wide" "50" - "tall" "24" + "tall" "25" "visible" "1" "enabled" "1" "textAlignment" "center" @@ -107,10 +111,12 @@ if_match { "proportionaltoparent" "1" - "xpos" "rs1-33" - "ypos" "8" - "tall" "10" - "wide" "25" + "xpos" "0" + "ypos" "0" + "wide" "26" + "tall" "25" + "textAlignment" "south" + "textinsety" "-2" "font" "HudFontSmallest" } } diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res index 7ef95ed..4ab9831 100644 --- a/resource/ui/hudobjectivetimepanel.res +++ b/resource/ui/hudobjectivetimepanel.res @@ -4,7 +4,7 @@ { "ControlName" "EditablePanel" "fieldName" "TimePanelBG" - "xpos" "15" + "xpos" "0" "ypos" "0" "zpos" "2" "wide" "50" @@ -30,18 +30,18 @@ { "ControlName" "CExLabel" "fieldName" "WaitingForPlayersLabel" - "xpos" "15" + "xpos" "0" "ypos" "25" "zpos" "5" "wide" "50" - "tall" "15" + "tall" "30" "visible" "1" "enabled" "1" "labelText" "#game_WaitingForPlayers" "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "wrap" "0" + "wrap" "1" "font" "HudFontSmallest" } "WaitingForPlayersBG" @@ -55,7 +55,7 @@ { "ControlName" "CExLabel" "fieldName" "OvertimeLabel" - "xpos" "15" + "xpos" "0" "ypos" "35" "zpos" "5" "wide" "50" @@ -93,7 +93,7 @@ { "ControlName" "CExLabel" "fieldName" "SetupLabel" - "xpos" "15" + "xpos" "0" "ypos" "25" "zpos" "5" "wide" "50" @@ -118,7 +118,7 @@ { "ControlName" "CExLabel" "fieldName" "ServerTimeLimitLabel" - "xpos" "15" + "xpos" "0" "ypos" "23" "zpos" "5" "wide" "50" diff --git a/resource/ui/hudpasstimeballstatus.res b/resource/ui/hudpasstimeballstatus.res new file mode 100644 index 0000000..7b69db5 --- /dev/null +++ b/resource/ui/hudpasstimeballstatus.res @@ -0,0 +1,638 @@ +"Resource/UI/HudPasstimeBallStatus.res" +{ + "HudPasstimeBallStatus" + { + "ControlName" "EditablePanel" + "fieldName" "HudPasstimeBallStatus" + "xpos" "0" + "ypos" "0" + "zpos" "100" + "wide" "f0" + "tall" "f0" + "visible" "1" + "enabled" "1" + } + + "EventTitleLabel" + { + "ControlName" "CExLabel" + "fieldName" "EventTitleLabel" + "dropshadow" "1" + "font" "HudFontBiggerBold" + "xpos" "0" + "ypos" "c-98" + "zpos" "3" + "wide" "f" + "tall" "25" + "visible" "1" + "enabled" "1" + "textAlignment" "center" + "labelText" "A TEAM STOLE THE BALL" + "fgcolor_override" "White" + } + + "EventBonusLabel" + { + "ControlName" "CExLabel" + "fieldName" "EventBonusLabel" + "font" "HudFontMediumSmallBold" + "dropshadow" "1" + "xpos" "0" + "ypos" "0" + "zpos" "3" + "wide" "f" + "tall" "20" + "visible" "1" + "enabled" "1" + "textAlignment" "center" + "labelText" "" + "fgcolor_override" "255 235 35 200" + "pin_to_sibling" "EventTitleLabel" + "pin_corner_to_sibling" "6" + "pin_to_sibling_corner" "4" + } + + "EventDetailLabel" + { + "ControlName" "CExLabel" + "fieldName" "EventDetailLabel" + "font" "FontRegular14" + "dropshadow" "1" + "xpos" "0" + "ypos" "0" + "zpos" "3" + "wide" "f" + "tall" "24" + "visible" "1" + "enabled" "1" + "textAlignment" "center" + "labelText" "A TEAM STOLE THE BALL" + "fgcolor_override" "White" + "pin_to_sibling" "EventTitleLabel" + "pin_corner_to_sibling" "4" + "pin_to_sibling_corner" "6" + } + + "ProgressLevelBar" + { + "ControlName" "ImagePanel" + "fieldName" "ProgressLevelBar" + "xpos" "c-190" + "ypos" "r35" + "zpos" "0" + "wide" "380" + "tall" "48" + "visible" "1" + "enabled" "1" + "labelText" "" + "image" "../passtime/hud/passtime_ballcontrol_bar" + "scaleImage" "1" + } + + "BlueProgressEnd" + { + "ControlName" "Panel" + "fieldName" "BlueProgressEnd" + "xpos" "c-152" + "ypos" "r11" + "visible" "0" + } + + "RedProgressEnd" + { + "ControlName" "Panel" + "fieldName" "RedProgressEnd" + "xpos" "c152" + "ypos" "r11" + "visible" "0" + } + + "GoalBlue0" + { + "ControlName" "ImagePanel" + "fieldName" "GoalBlue0" + "xpos" "c-162" + "ypos" "r19" + "zpos" "1" + "wide" "17" + "tall" "17" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "image" "../passtime/hud/passtime_goal_blue_icon" + "scaleImage" "1" + } + + "GoalBlue1" + { + "ControlName" "ImagePanel" + "fieldName" "GoalBlue1" + "xpos" "c-132" + "ypos" "r19" + "zpos" "1" + "wide" "17" + "tall" "17" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "image" "../passtime/hud/passtime_goal_blue_icon" + "scaleImage" "1" + } + + "GoalBlue2" + { + "ControlName" "ImagePanel" + "fieldName" "GoalBlue2" + "xpos" "c-102" + "ypos" "r19" + "zpos" "1" + "wide" "17" + "tall" "17" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "image" "../passtime/hud/passtime_goal_blue_icon" + "scaleImage" "1" + } + + "GoalRed0" + { + "ControlName" "ImagePanel" + "fieldName" "GoalRed0" + "xpos" "c146" + "ypos" "r19" + "zpos" "1" + "wide" "17" + "tall" "17" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "image" "../passtime/hud/passtime_goal_red_icon" + "scaleImage" "1" + } + + "GoalRed1" + { + "ControlName" "ImagePanel" + "fieldName" "GoalRed1" + "xpos" "c116" + "ypos" "r19" + "zpos" "1" + "wide" "17" + "tall" "17" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "image" "../passtime/hud/passtime_goal_red_icon" + "scaleImage" "1" + } + + "GoalRed2" + { + "ControlName" "ImagePanel" + "fieldName" "GoalRed2" + "xpos" "c86" + "ypos" "r19" + "zpos" "1" + "wide" "17" + "tall" "17" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "image" "../passtime/hud/passtime_goal_red_icon" + "scaleImage" "1" + } + + "ProgressBallIcon" + { + "ControlName" "ImagePanel" + "fieldName" "ProgressBallIcon" + "xpos" "0" + "ypos" "0" + "zpos" "10" + "wide" "42" + "tall" "42" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "image" "../passtime/hud/passtime_ball" + "scaleImage" "1" + } + + "ProgressSelfPlayerIcon" + { + "ControlName" "ImagePanel" + "fieldName" "ProgressSelfPlayerIcon" + "xpos" "0" + "ypos" "0" + "zpos" "-100" + "wide" "42" + "tall" "42" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "scaleImage" "1" + } + + "ProgressBallCarrierName" + { + "ControlName" "Label" + "fieldName" "ProgressBallCarrierName" + "visible" "1" + "enabled" "1" + "zpos" "-400" + "xpos" "0" + "ypos" "-45" + "wide" "150" + "tall" "10" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "1" + "labelText" "NameOfCarrier" + "pin_to_sibling" "ProgressLevelBar" + "pin_corner_to_sibling" "4" + "pin_to_sibling_corner" "6" + } + + "BallPowerCluster" + { + "ControlName" "EditablePanel" + "fieldName" "BallPowerCluster" + "xpos" "0" + "ypos" "32" + "zpos" "5" + "wide" "f0" + "tall" "f0" + "autoResize" "0" + "visible" "1" + "enabled" "1" + + "BallPowerMeterFrame" + { + "ControlName" "ImagePanel" + "fieldName" "BallPowerMeterFrame" + "xpos" "c-100" + "ypos" "0" + "zpos" "5" + "wide" "200" + "tall" "50" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "image" "../passtime/hud/passtime_powerball_meter_frame" + "scaleImage" "1" + } + + "BallPowerMeterFinalSectionContainer" + { + "ControlName" "EditablePanel" + "fieldName" "BallPowerMeterFinalSectionContainer" + "xpos" "c-85" + "ypos" "16" + "zpos" "3" + "wide" "168" + "tall" "18" + "visible" "1" + "enabled" "1" + + "BallPowerMeterFinalSection" + { + "ControlName" "ImagePanel" + "fieldName" "BallPowerMeterFinalSection" + "xpos" "0" + "ypos" "0" + "zpos" "0" + "wide" "168" + "tall" "18" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "image" "white" + "scaleImage" "1" + } + } + + "BallPowerMeterFillContainer" + { + "ControlName" "EditablePanel" + "fieldName" "BallPowerMeterFillContainer" + "xpos" "c-85" + "ypos" "16" + "zpos" "4" + "wide" "168" + "tall" "18" + "visible" "1" + "enabled" "1" + + "BallPowerMeterFill" + { + "ControlName" "ImagePanel" + "fieldName" "BallPowerMeterFill" + "xpos" "0" + "ypos" "0" + "zpos" "0" + "wide" "168" + "tall" "18" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "image" "white" + "scaleImage" "1" + } + } + } + + "playericon0" + { + "ControlName" "ImagePanel" + "fieldName" "playericon0" + "wide" "12" + "tall" "12" + } + + "playericon1" + { + "ControlName" "ImagePanel" + "fieldName" "playericon1" + "wide" "12" + "tall" "12" + } + + "playericon2" + { + "ControlName" "ImagePanel" + "fieldName" "playericon2" + "wide" "12" + "tall" "12" + } + + "playericon3" + { + "ControlName" "ImagePanel" + "fieldName" "playericon3" + "wide" "12" + "tall" "12" + } + + "playericon4" + { + "ControlName" "ImagePanel" + "fieldName" "playericon4" + "wide" "12" + "tall" "12" + } + + "playericon5" + { + "ControlName" "ImagePanel" + "fieldName" "playericon5" + "wide" "12" + "tall" "12" + } + + "playericon6" + { + "ControlName" "ImagePanel" + "fieldName" "playericon6" + "wide" "12" + "tall" "12" + } + + "playericon7" + { + "ControlName" "ImagePanel" + "fieldName" "playericon7" + "wide" "12" + "tall" "12" + } + + "playericon8" + { + "ControlName" "ImagePanel" + "fieldName" "playericon8" + "wide" "12" + "tall" "12" + } + + "playericon9" + { + "ControlName" "ImagePanel" + "fieldName" "playericon9" + "wide" "12" + "tall" "12" + } + + "playericon10" + { + "ControlName" "ImagePanel" + "fieldName" "playericon10" + "wide" "12" + "tall" "12" + } + + "playericon11" + { + "ControlName" "ImagePanel" + "fieldName" "playericon11" + "wide" "12" + "tall" "12" + } + + "playericon12" + { + "ControlName" "ImagePanel" + "fieldName" "playericon12" + "wide" "12" + "tall" "12" + } + + "playericon13" + { + "ControlName" "ImagePanel" + "fieldName" "playericon13" + "wide" "12" + "tall" "12" + } + + "playericon14" + { + "ControlName" "ImagePanel" + "fieldName" "playericon14" + "wide" "12" + "tall" "12" + } + + "playericon15" + { + "ControlName" "ImagePanel" + "fieldName" "playericon15" + "wide" "12" + "tall" "12" + } + + "playericon16" + { + "ControlName" "ImagePanel" + "fieldName" "playericon16" + "wide" "12" + "tall" "12" + } + + "playericon17" + { + "ControlName" "ImagePanel" + "fieldName" "playericon17" + "wide" "12" + "tall" "12" + } + + "playericon18" + { + "ControlName" "ImagePanel" + "fieldName" "playericon18" + "wide" "12" + "tall" "12" + } + + "playericon19" + { + "ControlName" "ImagePanel" + "fieldName" "playericon19" + "wide" "12" + "tall" "12" + } + + "playericon20" + { + "ControlName" "ImagePanel" + "fieldName" "playericon20" + "wide" "12" + "tall" "12" + } + + "playericon21" + { + "ControlName" "ImagePanel" + "fieldName" "playericon21" + "wide" "12" + "tall" "12" + } + + "playericon22" + { + "ControlName" "ImagePanel" + "fieldName" "playericon22" + "wide" "12" + "tall" "12" + } + + "playericon23" + { + "ControlName" "ImagePanel" + "fieldName" "playericon23" + "wide" "12" + "tall" "12" + } + + "playericon24" + { + "ControlName" "ImagePanel" + "fieldName" "playericon24" + "wide" "12" + "tall" "12" + } + + "playericon25" + { + "ControlName" "ImagePanel" + "fieldName" "playericon25" + "wide" "12" + "tall" "12" + } + + "playericon26" + { + "ControlName" "ImagePanel" + "fieldName" "playericon26" + "wide" "12" + "tall" "12" + } + + "playericon27" + { + "ControlName" "ImagePanel" + "fieldName" "playericon27" + "wide" "12" + "tall" "12" + } + + "playericon28" + { + "ControlName" "ImagePanel" + "fieldName" "playericon28" + "wide" "12" + "tall" "12" + } + + "playericon29" + { + "ControlName" "ImagePanel" + "fieldName" "playericon29" + "wide" "12" + "tall" "12" + } + + "playericon30" + { + "ControlName" "ImagePanel" + "fieldName" "playericon30" + "wide" "12" + "tall" "12" + } + + "playericon31" + { + "ControlName" "ImagePanel" + "fieldName" "playericon31" + "wide" "12" + "tall" "12" + } + + "playericon32" + { + "ControlName" "ImagePanel" + "fieldName" "playericon32" + "wide" "12" + "tall" "12" + } +}
\ No newline at end of file diff --git a/resource/ui/hudpasstimepassnotify.res b/resource/ui/hudpasstimepassnotify.res new file mode 100644 index 0000000..8b2b9aa --- /dev/null +++ b/resource/ui/hudpasstimepassnotify.res @@ -0,0 +1,137 @@ +"Resource/UI/HudPasstimePassNotify.res" +{ + "HudPasstimePassNotify" + { + "ControlName" "EditablePanel" + "fieldName" "HudPasstimePassNotify" + "xpos" "0" + "ypos" "0" + "zpos" "0" + "wide" "f0" + "tall" "480" + "visible" "1" + "enabled" "1" + } + + "TextBox" + { + "ControlName" "EditablePanel" + "fieldName" "TextBox" + "xpos" "c-150" + "ypos" "c-80" + "zpos" "1" + "wide" "300" + "tall" "46" + "visible" "1" + "enabled" "1" + "border" "NoBorder" + "RoundedCorners" "255" + + "TextInPassRange" + { + "ControlName" "CExLabel" + "fieldName" "TextInPassRange" + "font" "HudFontMediumSmallBold" + "xpos" "0" + "ypos" "0" + "zpos" "3" + "wide" "300" + "tall" "32" + "visible" "1" + "enabled" "1" + "centerwrap" "1" + "textAlignment" "center" + "labelText" "#Msg_PasstimeInPassRange" + "fgcolor_override" "White" + } + + "TextLockedOn" + { + "ControlName" "CExLabel" + "fieldName" "TextLockedOn" + "font" "HudFontMediumSmallBold" + "xpos" "0" + "ypos" "0" + "zpos" "3" + "wide" "300" + "tall" "32" + "visible" "1" + "enabled" "1" + "centerwrap" "1" + "textAlignment" "center" + "labelText" "#Msg_PasstimeLockedOn" + "fgcolor_override" "White" + } + + "TextPassIncoming" + { + "ControlName" "CExLabel" + "fieldName" "TextPassIncoming" + "font" "HudFontMediumSmallBold" + "xpos" "0" + "ypos" "4" + "zpos" "3" + "wide" "300" + "tall" "32" + "visible" "1" + "enabled" "1" + "centerwrap" "1" + "textAlignment" "center" + "labelText" "#Msg_PasstimePassIncoming" + "fgcolor_override" "White" + } + + "TextPlayerName" + { + "ControlName" "CExLabel" + "fieldName" "TextPlayerName" + "font" "HudFontSmall" + "xpos" "0" + "ypos" "25" + "zpos" "3" + "wide" "300" + "tall" "16" + "visible" "1" + "enabled" "1" + "textAlignment" "center" + "labelText" "WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW" + "fgcolor_override" "White" + } + } + + "PassLockIndicator" + { + "ControlName" "ImagePanel" + "fieldName" "PassLockIndicator" + "xpos" "-8" + "ypos" "14" + "wide" "64" + "zpos" "3" + "tall" "64" + "visible" "1" + "enabled" "1" + "scaleImage" "1" + "image" "../passtime/hud/passtime_ball_reticle_incomingpass" + "pin_to_sibling" "TextBox" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "1" + } + + "SpeechIndicator" + { + "ControlName" "ImagePanel" + "fieldName" "SpeechIndicator" + "xpos" "8" + "ypos" "8" + "zpos" "3" + "wide" "48" + "tall" "48" + "visible" "1" + "enabled" "1" + "scaleImage" "1" + "image" "../passtime/hud/passtime_pass_to_me_prompt" + "pin_to_sibling" "TextBox" + "pin_corner_to_sibling" "1" + "pin_to_sibling_corner" "0" + } +}
\ No newline at end of file diff --git a/resource/ui/hudpasstimeteamscore.res b/resource/ui/hudpasstimeteamscore.res index 836a1a9..f3c4cdc 100644 --- a/resource/ui/hudpasstimeteamscore.res +++ b/resource/ui/hudpasstimeteamscore.res @@ -15,30 +15,32 @@ "LeftSideBG" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "LeftSideBG" - "xpos" "c-35" - "ypos" "r50" - "zpos" "1" - "wide" "35" - "tall" "34" + "xpos" "c-230" + "ypos" "r30" + "zpos" "0" + "wide" "60" + "tall" "35" "visible" "1" "enabled" "1" - "fillcolor" "BlueSolid" + "bgcolor_override" "Blue" + "PaintBackgroundType" "2" } "RightSideBG" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "RightSideBG" - "xpos" "c0" - "ypos" "r50" - "zpos" "1" - "wide" "35" - "tall" "34" + "xpos" "c170" + "ypos" "r30" + "zpos" "0" + "wide" "60" + "tall" "35" "visible" "1" "enabled" "1" - "fillcolor" "RedSolid" + "bgcolor_override" "Red" + "PaintBackgroundType" "2" } "OutlineBG" @@ -52,17 +54,18 @@ { "ControlName" "CExLabel" "fieldName" "BlueScore" - "xpos" "c-57" - "ypos" "r54" + "xpos" "c-230" + "ypos" "r30" "zpos" "8" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "east" "labelText" "%bluescore%" - "font" "Cerbetica32" + "font" "Cerbetica40" "fgcolor" "TanLight" + "textinsetx" "10" } "BlueScoreShadow" { @@ -71,14 +74,15 @@ "xpos" "-2" "ypos" "-2" "zpos" "7" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "east" "labelText" "%bluescore%" - "font" "Cerbetica32" + "font" "Cerbetica40" "fgcolor" "TransparentBlack" + "textinsetx" "10" "pin_to_sibling" "BlueScore" } @@ -86,17 +90,18 @@ { "ControlName" "CExLabel" "fieldName" "RedScore" - "xpos" "c7" - "ypos" "r54" + "xpos" "c170" + "ypos" "r30" "zpos" "8" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "west" "labelText" "%redscore%" - "font" "Cerbetica32" + "font" "Cerbetica40" "fgcolor" "TanLight" + "textinsetx" "10" } "RedScoreShadow" @@ -106,14 +111,15 @@ "xpos" "-2" "ypos" "-2" "zpos" "7" - "wide" "50" - "tall" "35" + "wide" "60" + "tall" "30" "visible" "1" "enabled" "1" "textAlignment" "west" "labelText" "%redscore%" - "font" "Cerbetica32" + "font" "Cerbetica40" "fgcolor" "TransparentBlack" + "textinsetx" "10" "pin_to_sibling" "RedScore" } @@ -121,7 +127,7 @@ { "ControlName" "EditablePanel" "fieldName" "PlayingToCluster" - "xpos" "65" + "xpos" "0" "ypos" "0" "zpos" "10" "wide" "f0" @@ -133,33 +139,34 @@ { "ControlName" "CExLabel" "fieldName" "PlayingTo" - "xpos" "cs-0.5" - "ypos" "r50" - "zpos" "7" + "xpos" "c-70" + "ypos" "r54" + "zpos" "4" "wide" "140" - "tall" "38" + "tall" "30" "visible" "1" "enabled" "1" "labelText" "#TF_PlayingTo" "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "font" "FontRegular12" + "font" "HudFontSmall" "fgcolor" "TanLight" } "PlayingToBG" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "PlayingToBG" - "xpos" "c-40" - "ypos" "r24" - "zpos" "3" - "wide" "80" - "tall" "24" + "xpos" "c-60" + "ypos" "r50" + "zpos" "0" + "wide" "120" + "tall" "20" "visible" "1" "enabled" "1" - "fillcolor" "TransparentBlack" + "bgcolor_override" "Transparent" + "PaintBackgroundType" "2" } } }
\ No newline at end of file diff --git a/resource/ui/hudrocketpack.res b/resource/ui/hudrocketpack.res index a9fd7d4..fc58636 100644 --- a/resource/ui/hudrocketpack.res +++ b/resource/ui/hudrocketpack.res @@ -2,11 +2,10 @@ "Resource/UI/HudRocketPack.res" { - HudItemEffectMeter + "HudItemEffectMeter" { "tall" "20" } - "ItemEffectMeterBG" { "ControlName" "CTFImagePanel" @@ -33,13 +32,12 @@ "ItemEffectMeterLabel" { "visible" "0" - "labelText" "#TF_RocketPack_Disabled" } "ItemEffectMeter" { "wide" "60" - "wide_minmode" "55" + "wide_minmode" "50" } "ItemEffectMeter2" @@ -48,18 +46,18 @@ "fieldName" "ItemEffectMeter2" "font" "Default" "xpos" "60" - "xpos_minmode" "55" + "xpos_minmode" "51" "ypos" "0" "zpos" "2" "wide" "60" "tall" "8" - "wide_minmode" "55" + "wide_minmode" "50" "tall_minmode" "5" "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" - "textAlignment" "Center" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" } diff --git a/resource/ui/hudroundcounter.res b/resource/ui/hudroundcounter.res index 3f643ee..56c641e 100644 --- a/resource/ui/hudroundcounter.res +++ b/resource/ui/hudroundcounter.res @@ -73,7 +73,7 @@ "tall" "10" "visible" "1" "enabled" "1" - "fillcolor" "BlueSolid" + "fillcolor" "Blue" "proportionaltoparent" "1" } @@ -87,10 +87,10 @@ "tall" "10" "visible" "1" "enabled" "1" - "fillcolor" "RedSolid" + "fillcolor" "Red" "proportionaltoparent" "1" } - + "TimerBG" { "ControlName" "ImagePanel" diff --git a/resource/ui/hudspellselection.res b/resource/ui/hudspellselection.res index 36a333a..2de844d 100644 --- a/resource/ui/hudspellselection.res +++ b/resource/ui/hudspellselection.res @@ -18,7 +18,7 @@ { "ControlName" "ImagePanel" "fieldName" "SpellIcon" - "xpos" "25" + "xpos" "5" "ypos" "0" "zpos" "7" "wide" "20" @@ -67,6 +67,9 @@ "wide" "20" "tall" "20" "fgcolor" "TanLight" + "pin_to_sibling" "SpellIcon" + "pin_corner_to_sibling" "PIN_CENTER_LEFT" + "pin_to_sibling_corner" "PIN_CENTER_RIGHT" } "CountTextShadow" diff --git a/resource/ui/hudtournament-base.res b/resource/ui/hudtournament-base.res index cabc17e..b27165c 100644 --- a/resource/ui/hudtournament-base.res +++ b/resource/ui/hudtournament-base.res @@ -326,7 +326,7 @@ "HudTournamentBLUEBG" { - "ControlName" "ScalableImagePanel" + "ControlName" "ImagePanel" "fieldName" "HudTournamentBLUEBG" "xpos" "c-125" "ypos" "0" @@ -335,7 +335,22 @@ "tall" "16" "visible" "1" "enabled" "1" - "image" "../HUD/tournament_panel_blu" + "fillcolor" "BlueSolid" + + if_mvm + { + "visible" "0" + } + + if_competitive + { + "visible" "0" + } + + if_readymode + { + "visible" "0" + } "src_corner_height" "15" "src_corner_width" "15" @@ -362,11 +377,11 @@ { "ControlName" "Label" "fieldName" "TournamentBLUELabel" - "font" "HudFontSmall" - "xpos" "-5" + "font" "HudFontMediumSmall" + "xpos" "0" "ypos" "0" "zpos" "1" - "wide" "65" + "wide" "125" "tall" "16" "autoResize" "0" "pinCorner" "0" @@ -375,6 +390,7 @@ "wrap" "0" "labelText" "%bluenamelabel%" "textAlignment" "west" + "textinsetx" "5" "pin_to_sibling" "HudTournamentBLUEBG" "pin_corner_to_sibling" "PIN_TOPLEFT" @@ -401,10 +417,10 @@ "ControlName" "Label" "fieldName" "TournamentBLUEStateLabel" "font" "HudFontSmallest" - "xpos" "-5" + "xpos" "0" "ypos" "0" "zpos" "1" - "wide" "65" + "wide" "125" "tall" "16" "autoResize" "0" "pinCorner" "0" @@ -413,6 +429,7 @@ "wrap" "0" "labelText" "%bluestate%" "textAlignment" "east" + "textinsetx" "5" "pin_to_sibling" "HudTournamentBLUEBG" "pin_corner_to_sibling" "PIN_TOPRIGHT" @@ -436,7 +453,7 @@ "HudTournamentREDBG" { - "ControlName" "ScalableImagePanel" + "ControlName" "ImagePanel" "fieldName" "HudTournamentREDBG" "xpos" "c0" "ypos" "0" @@ -445,7 +462,20 @@ "tall" "16" "visible" "1" "enabled" "1" - "image" "../HUD/tournament_panel_red" + "fillcolor" "RedSolid" + + if_mvm + { + "visible" "0" + } + if_competitive + { + "visible" "0" + } + if_readymode + { + "visible" "0" + } "src_corner_height" "15" "src_corner_width" "15" @@ -470,11 +500,11 @@ { "ControlName" "Label" "fieldName" "TournamentREDLabel" - "font" "HudFontSmall" - "xpos" "-5" + "font" "HudFontMediumSmall" + "xpos" "0" "ypos" "0" "zpos" "1" - "wide" "65" + "wide" "125" "tall" "16" "autoResize" "0" "pinCorner" "0" @@ -483,6 +513,7 @@ "wrap" "0" "labelText" "%rednamelabel%" "textAlignment" "east" + "textinsetx" "5" "pin_to_sibling" "HudTournamentREDBG" "pin_corner_to_sibling" "PIN_TOPRIGHT" @@ -509,10 +540,10 @@ "ControlName" "Label" "fieldName" "TournamentREDStateLabel" "font" "HudFontSmallest" - "xpos" "-5" + "xpos" "0" "ypos" "0" "zpos" "1" - "wide" "65" + "wide" "125" "tall" "16" "autoResize" "0" "pinCorner" "0" @@ -521,6 +552,7 @@ "wrap" "0" "labelText" "%redstate%" "textAlignment" "west" + "textinsetx" "5" "pin_to_sibling" "HudTournamentREDBG" "pin_corner_to_sibling" "PIN_TOPLEFT" @@ -552,7 +584,7 @@ "ypos" "16" "zpos" "1" "wide" "250" - "tall" "14" + "tall" "16" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -587,7 +619,7 @@ "xpos" "c-125" "ypos" "30" "wide" "250" - "tall" "12" + "tall" "16" "zpos" "1" "autoResize" "0" "pinCorner" "0" diff --git a/resource/ui/hudtournamentsetup.res b/resource/ui/hudtournamentsetup.res index 704213b..d60e5ae 100644 --- a/resource/ui/hudtournamentsetup.res +++ b/resource/ui/hudtournamentsetup.res @@ -34,6 +34,7 @@ "wrap" "0" "labelText" "%tournamentstatelabel%" "textAlignment" "center" + "allcaps" "1" } "TournamentTeamNameLabel" @@ -41,7 +42,7 @@ "ControlName" "Label" "fieldName" "TournamentTeamNameLabel" "font" "HudFontSmallest" - "xpos" "35" + "xpos" "30" "ypos" "20" "zpos" "1" "wide" "75" @@ -61,7 +62,7 @@ "fieldName" "TournamentNameEdit" "xpos" "105" "ypos" "20" - "wide" "45" + "wide" "50" "tall" "15" "autoResize" "0" "pinCorner" "0" @@ -75,7 +76,7 @@ "unicode" "0" "wrap" "0" "fgcolor_override" "TanLight" - "bgcolor_override" "Transparent" + "bgcolor_override" "Black" "labelText" "%teamname%" "textAlignment" "west" "font" "HudFontSmallest" @@ -92,9 +93,9 @@ { "ControlName" "CExButton" "fieldName" "TournamentNotReadyButton" - "xpos" "35" + "xpos" "95" "ypos" "37" - "wide" "55" + "wide" "65" "tall" "15" "zpos" "0" "autoResize" "0" @@ -109,6 +110,7 @@ "default" "1" "font" "Cerbetica12" "fgcolor" "ColorRed" + "allcaps" "1" "defaultBgColor_override" "Blank" "defaultFgColor_override" "TanLight" @@ -122,9 +124,9 @@ { "ControlName" "CExButton" "fieldName" "TournamentReadyButton" - "xpos" "95" + "xpos" "30" "ypos" "37" - "wide" "55" + "wide" "65" "tall" "15" "zpos" "0" "autoResize" "0" @@ -136,7 +138,6 @@ "dulltext" "0" "brighttext" "0" "command" "teamready" - "paintborder" "0" "default" "1" "font" "Cerbetica12" "fgcolor" "ColorGreen" diff --git a/resource/ui/hudtraining.res b/resource/ui/hudtraining.res new file mode 100644 index 0000000..3fd3c51 --- /dev/null +++ b/resource/ui/hudtraining.res @@ -0,0 +1,114 @@ +"Resource/UI/HudTraining.res" +{ + "ObjectiveStatusTraining" + { + "ControlName" "EditablePanel" + "fieldName" "ObjectiveStatusTraining" + "xpos" "c-160" + "ypos" "r108" + "zpos" "1" + "wide" "320" + "tall" "90" + "visible" "1" + "enabled" "1" + } + + "GoalLabel" + { + "ControlName" "CExLabel" + "fieldName" "GoalLabel" + "fgcolor" "TanLight" + "xpos" "20" + "ypos" "5" + "zpos" "4" + "wide" "300" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "wrap" "1" + "labelText" "%goal%" + "font" "HudFontMediumSmall" + "textAlignment" "North" + } + + "GoalLabelShadow" + { + "ControlName" "CExLabel" + "fieldName" "GoalLabelShadow" + "fgcolor" "TransparentBlack" + "xpos" "-1" + "ypos" "-1" + "zpos" "3" + "wide" "300" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "0" + "wrap" "1" + "labelText" "%goal%" + "font" "HudFontMediumSmall" + "textAlignment" "North" + + "pin_to_sibling" "GoalLabel" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPLEFT" + } + + "MsgLabel" + { + "ControlName" "CExRichText" + "fieldName" "MsgLabel" + "fgcolor" "TanLight" + "xpos" "20" + "ypos" "25" + "zpos" "3" + "wide" "280" + "tall" "45" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "wrap" "1" + "labelText" "" + "textAlignment" "North" + "font" "HudFontSmall" + } + + "PressSpacebarToContinue" + { + "ControlName" "CExLabel" + "fieldName" "PressSpacebarToContinue" + "fgcolor" "TanLight" + "xpos" "20" + "ypos" "70" + "zpos" "3" + "wide" "280" + "tall" "15" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "wrap" "1" + "labelText" "#TF_Training_SpaceToContinue" + "textAlignment" "North" + "font" "TFFontMedium" + } + + "HudTrainingMsgBG" + { + "ControlName" "EditablePanel" + "fieldName" "HudTrainingMsgBG" + "xpos" "-5" + "ypos" "-25" + "zpos" "2" + "wide" "330" + "tall" "205" + "visible" "1" + "enabled" "1" + "bgcolor_override" "TransparentBlack" + "PaintBackgroundType" "2" + } +}
\ No newline at end of file diff --git a/resource/ui/hudweaponselection.res b/resource/ui/hudweaponselection.res new file mode 100644 index 0000000..8a45920 --- /dev/null +++ b/resource/ui/hudweaponselection.res @@ -0,0 +1,111 @@ +"Resource/UI/HudWeaponSelection.res" +{ + "modelpanel0" + { + "ControlName" "CItemModelPanel" + "fieldName" "modelpanel0" + "bgcolor_override" "Transparent" + "PaintBackgroundType" "2" + "paintborder" "1" + "name_only" "1" + "model_ypos" "0" + "standard_text_color" "1" + + "itemmodelpanel" + { + "use_item_rendertarget" "0" + "inventory_image_type" "1" + "allow_rot" "0" + } + } + "modelpanel1" + { + "ControlName" "CItemModelPanel" + "fieldName" "modelpanel1" + "bgcolor_override" "Transparent" + "PaintBackgroundType" "2" + "paintborder" "1" + "name_only" "1" + "model_ypos" "0" + "standard_text_color" "1" + + "itemmodelpanel" + { + "use_item_rendertarget" "0" + "inventory_image_type" "1" + "allow_rot" "0" + } + } + "modelpanel2" + { + "ControlName" "CItemModelPanel" + "fieldName" "modelpanel2" + "bgcolor_override" "Transparent" + "PaintBackgroundType" "2" + "paintborder" "1" + "name_only" "1" + "model_ypos" "0" + "standard_text_color" "1" + + "itemmodelpanel" + { + "use_item_rendertarget" "0" + "inventory_image_type" "1" + "allow_rot" "0" + } + } + "modelpanel3" + { + "ControlName" "CItemModelPanel" + "fieldName" "modelpanel3" + "bgcolor_override" "Transparent" + "PaintBackgroundType" "2" + "paintborder" "1" + "name_only" "1" + "model_ypos" "0" + "standard_text_color" "1" + + "itemmodelpanel" + { + "use_item_rendertarget" "0" + "inventory_image_type" "1" + "allow_rot" "0" + } + } + "modelpanel4" + { + "ControlName" "CItemModelPanel" + "fieldName" "modelpanel4" + "bgcolor_override" "Transparent" + "PaintBackgroundType" "2" + "paintborder" "1" + "name_only" "1" + "model_ypos" "0" + "standard_text_color" "1" + + "itemmodelpanel" + { + "use_item_rendertarget" "0" + "inventory_image_type" "1" + "allow_rot" "0" + } + } + "modelpanel5" + { + "ControlName" "CItemModelPanel" + "fieldName" "modelpanel5" + "bgcolor_override" "Transparent" + "PaintBackgroundType" "2" + "paintborder" "1" + "name_only" "1" + "model_ypos" "0" + "standard_text_color" "1" + + "itemmodelpanel" + { + "use_item_rendertarget" "0" + "inventory_image_type" "1" + "allow_rot" "0" + } + } +}
\ No newline at end of file diff --git a/resource/ui/matchmakingdashboardcomp.res b/resource/ui/matchmakingdashboardcomp.res index 2f834e9..ab634d7 100644 --- a/resource/ui/matchmakingdashboardcomp.res +++ b/resource/ui/matchmakingdashboardcomp.res @@ -20,7 +20,7 @@ "fieldName" "Title" "xpos" "0" "ypos" "25" - "zpos" "101" + "zpos" "99" "wide" "f0" "tall" "20" "proportionaltoparent" "1" @@ -28,7 +28,6 @@ "textAlignment" "center" "font" "HudFontMedium" "fgcolor_override" "TanLight" - "bgcolor_override" "DarkGrey" "mouseinputenabled" "0" "allcaps" "1" } diff --git a/resource/ui/medigunpanel.res b/resource/ui/medigunpanel.res index d54b8ef..9a4c2ed 100644 --- a/resource/ui/medigunpanel.res +++ b/resource/ui/medigunpanel.res @@ -88,10 +88,10 @@ "image" "replay/thumbnails/uber" "team-red" { - "drawcolor" "188 66 66 255" + "drawcolor" "205 50 50 150" } "team-blu" { - "drawcolor" "79 117 144 255" + "drawcolor" "70 130 180 150" } "player-alive" diff --git a/resource/ui/mvminworldcurrency.res b/resource/ui/mvminworldcurrency.res index 22ee96f..a4d1c59 100644 --- a/resource/ui/mvminworldcurrency.res +++ b/resource/ui/mvminworldcurrency.res @@ -24,10 +24,11 @@ "xpos" "4" "ypos" "0" "zpos" "3" - "wide" "80" + "wide" "50" "tall" "20" "visible" "1" "enabled" "1" + "allcaps" "1" "textAlignment" "west" "labelText" "#TF_PVE_Missed" } diff --git a/resource/ui/mvmscoreboard-base.res b/resource/ui/mvmscoreboard-base.res index f2a42a8..02e66ba 100644 --- a/resource/ui/mvmscoreboard-base.res +++ b/resource/ui/mvmscoreboard-base.res @@ -4,10 +4,10 @@ { "ControlName" "CWaveStatusPanel" "fieldName" "WaveStatusPanel" - "xpos" "c-300" - "ypos" "8" + "xpos" "c-100" + "xpos" "c-100" "zpos" "0" - "wide" "600" + "wide" "200" "tall" "67" "visible" "1" "enabled" "1" diff --git a/resource/ui/objectivestatusmultipleescort.res b/resource/ui/objectivestatusmultipleescort.res index 9f8e115..b08540f 100644 --- a/resource/ui/objectivestatusmultipleescort.res +++ b/resource/ui/objectivestatusmultipleescort.res @@ -5,7 +5,7 @@ "ControlName" "EditablePanel" "fieldName" "ObjectiveStatusMultipleEscort" "xpos" "0" - "ypos" "0" + "ypos" "27" "wide" "f0" "tall" "480" "visible" "1" diff --git a/resource/ui/pvprankpanel-base.res b/resource/ui/pvprankpanel-base.res index 52517db..adbab2c 100644 --- a/resource/ui/pvprankpanel-base.res +++ b/resource/ui/pvprankpanel-base.res @@ -468,7 +468,7 @@ "visible" "1" "enabled" "1" "font" "HudFontSmallest" - "fgcolor_override" "White" + "fgcolor_override" "TanLight" "textAlignment" "north-west" "labelText" "%stat_games%" "proportionaltoparent" "1" @@ -486,7 +486,7 @@ "visible" "1" "enabled" "1" "font" "HudFontSmallest" - "fgcolor_override" "White" + "fgcolor_override" "TanLight" "textAlignment" "north-west" "labelText" "%stat_kills%" "proportionaltoparent" "1" @@ -504,7 +504,7 @@ "visible" "1" "enabled" "1" "font" "HudFontSmallest" - "fgcolor_override" "White" + "fgcolor_override" "TanLight" "textAlignment" "north-west" "labelText" "%stat_deaths%" "proportionaltoparent" "1" @@ -523,7 +523,7 @@ "visible" "1" "enabled" "1" "font" "HudFontSmallest" - "fgcolor_override" "White" + "fgcolor_override" "TanLight" "textAlignment" "north-west" "labelText" "%stat_damage%" "proportionaltoparent" "1" @@ -541,7 +541,7 @@ "visible" "1" "enabled" "1" "font" "HudFontSmallest" - "fgcolor_override" "White" + "fgcolor_override" "TanLight" "textAlignment" "north-west" "labelText" "%stat_healing%" "proportionaltoparent" "1" @@ -559,7 +559,7 @@ "visible" "1" "enabled" "1" "font" "HudFontSmallest" - "fgcolor_override" "White" + "fgcolor_override" "TanLight" "textAlignment" "north-west" "labelText" "%stat_support%" "proportionaltoparent" "1" @@ -577,7 +577,7 @@ "visible" "0" "enabled" "0" "font" "HudFontSmallest" - "fgcolor_override" "White" + "fgcolor_override" "TanLight" "textAlignment" "north-west" "labelText" "%stat_score%" "proportionaltoparent" "1" diff --git a/resource/ui/roundinfo.res b/resource/ui/roundinfo.res index 0325f20..1195384 100644 --- a/resource/ui/roundinfo.res +++ b/resource/ui/roundinfo.res @@ -76,7 +76,7 @@ "ControlName" "CExButton" "fieldName" "RoundContinue" "xpos" "c-60" - "ypos" "c96" + "ypos" "c170" "zpos" "6" "wide" "120" "tall" "30" @@ -120,7 +120,7 @@ "ypos" "c-75" "zpos" "1" "wide" "275" - "tall" "200" + "tall" "150" "visible" "1" "enabled" "1" "bgcolor_override" "TransparentBlack" diff --git a/resource/ui/scoreboard-base.res b/resource/ui/scoreboard-base.res index 9cdbe4f..111cfed 100644 --- a/resource/ui/scoreboard-base.res +++ b/resource/ui/scoreboard-base.res @@ -28,7 +28,7 @@ { "ControlName" "EditablePanel" "fieldName" "BlueScoreBG" - "xpos" "c-270" + "xpos" "c-265" "ypos" "144" "wide" "270" "tall" "25" @@ -418,7 +418,7 @@ { "ControlName" "SectionedListPanel" "fieldName" "BluePlayerList" - "xpos" "c-270" + "xpos" "c-265" "ypos" "168" "zpos" "20" "wide" "270" @@ -440,7 +440,7 @@ { "ControlName" "SectionedListPanel" "fieldName" "RedPlayerList" - "xpos" "c0" + "xpos" "c5" "ypos" "168" "zpos" "20" "wide" "270" diff --git a/resource/ui/spectatortournament.res b/resource/ui/spectatortournament.res index 512a27e..aecdc24 100644 --- a/resource/ui/spectatortournament.res +++ b/resource/ui/spectatortournament.res @@ -65,42 +65,11 @@ "proportionaltoparent" "1" } - "LoadoutIconsActiveItemRed" - { - "ControlName" "ImagePanel" - "fieldName" "LoadoutIconsActiveItemRed" - "xpos" "135" - "ypos" "3" - "zpos" "200" - "wide" "24" - "tall" "11" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - "proportionalToParent" "1" - //fillcolor_override "255 0 0 32" - } - "LoadoutIconsActiveItemBlue" - { - "ControlName" "ImagePanel" - "fieldName" "LoadoutIconsActiveItemBlue" - "xpos" "135" - "ypos" "3" - "zpos" "200" - "wide" "24" - "tall" "11" - "visible" "1" - "enabled" "1" - "scaleImage" "1" - "proportionalToParent" "1" - //fillcolor_override "255 0 0 32" - } - "StatusEffectIconRed" { "ControlName" "ImagePanel" "fieldName" "StatusEffectIconRed" - "xpos" "27" + "xpos" "29" "ypos" "1" "zpos" "200" "wide" "14" @@ -116,8 +85,8 @@ { "ControlName" "ImagePanel" "fieldName" "StatusEffectIconBlue" - "xpos" "27" - "ypos" "1" + "xpos" "29" + "ypos" "2" "zpos" "200" "wide" "14" "tall" "14" @@ -137,8 +106,6 @@ "zpos" "-1" "wide" "52" "tall" "18" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "enabled" "1" "fillcolor" "15 15 15 64" @@ -153,8 +120,6 @@ "zpos" "-1" "wide" "49" "tall" "18" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "enabled" "1" "fillcolor" "15 15 15 128" @@ -169,8 +134,6 @@ "zpos" "-1" "wide" "26" "tall" "18" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "enabled" "1" "fillcolor" "15 15 15 110" @@ -182,7 +145,7 @@ "fieldName" "PanelFull" "xpos" "0" "ypos" "0" - "zpos" "-1" + "zpos" "0" "wide" "160" "tall" "18" "autoResize" "0" @@ -192,38 +155,6 @@ "fillcolor" "15 15 15 100" } - "PanelBottom" - { - "ControlName" "ImagePanel" - "fieldName" "PanelBottom" - "xpos" "0" - "ypos" "15" - "zpos" "-1" - "wide" "160" - "tall" "4" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "fillcolor" "15 15 15 255" - } - - "PanelRight" - { - "ControlName" "ImagePanel" - "fieldName" "PanelRight" - "xpos" "157" - "ypos" "0" - "zpos" "-1" - "wide" "4" - "tall" "16" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "fillcolor" "15 15 15 255" - } - "playername" { "ControlName" "CExLabel" @@ -234,8 +165,6 @@ "zpos" "5" "wide" "80" "tall" "16" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "labelText" "%playername%" "textAlignment" "west" @@ -249,13 +178,13 @@ "xpos" "0" "ypos" "0" "zpos" "3" - "wide" "26" - "tall" "17" - "HealthBonusPosAdj" "10" - "HealthDeathWarning" "0.49" + "wide" "f0" + "tall" "f0" + "bgcolor_override" "Transparent" + "proportionaltoparent" "1" + "HealthBonusPosAdj" "-240" + "HealthDeathWarning" "1.001" "HealthDeathWarningColor" "HUDDeathWarning" - "TFFont" "HudFontSmallest" - "TextColor" "HudOffWhite" } "PanelBG" @@ -264,50 +193,45 @@ "fieldName" "PanelBG" "xpos" "0" "ypos" "0" - "zpos" "-1" + "zpos" "0" "wide" "160" - "tall" "0" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" + "tall" "22" "fillcolor" "15 15 15 50" + "proportionaltoparent" "1" } - + "respawntime" { "ControlName" "CExLabel" "fieldName" "respawntime" - "font" "HudFontSmallest" - "xpos" "5" - "ypos" "3" + "xpos" "0" + "ypos" "0" "zpos" "5" - "wide" "23" - "tall" "10" - "autoResize" "0" - "pinCorner" "0" + "wide" "26" + "tall" "18" + "font" "HudFontSmallest" + "fgcolor" "ColorMagenta" "visible" "1" + "textAlignment" "center" "labelText" "%respawntime%" - "textAlignment" "west" - "fgcolor" "255 20 175 255" + "proportionaltoparent" "1" } - "respawntimeBG" + "respawntimeShadow" { "ControlName" "CExLabel" - "fieldName" "respawntimeBG" + "fieldName" "respawntimeShadow" "font" "HudFontSmallest" - "xpos" "6" - "ypos" "4" - "zpos" "5" - "wide" "23" - "tall" "10" - "autoResize" "0" - "pinCorner" "0" + "xpos" "-1" + "ypos" "-2" + "zpos" "4" + "wide" "26" + "tall" "18" "visible" "1" "labelText" "%respawntime%" - "textAlignment" "west" + "textAlignment" "center" "fgcolor" "TransparentBlack" + "pin_to_sibling" "respawntime" } "ReadyBG" @@ -347,25 +271,6 @@ "textAlignment" "east" "fgcolor" "0 255 255 255" } - - "chargeamountBG" - { - "ControlName" "CExLabel" - "fieldName" "chargeamountBG" - "font" "HudFontSmallest" - "xpos" "-1" - "ypos" "-1" - "zpos" "6" - "wide" "25" - "tall" "13" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "labelText" "%chargeamount%" - "textAlignment" "east" - "fgcolor" "TransparentBlack" - "pin_to_sibling" "chargeamount" - } } } diff --git a/resource/ui/teammenu-base.res b/resource/ui/teammenu-base.res index 1fe00ec..a85b207 100644 --- a/resource/ui/teammenu-base.res +++ b/resource/ui/teammenu-base.res @@ -184,9 +184,9 @@ "depressedBgColor_override" "TransparentBlack" "selectedBgColor_override" "ColorWhite" - "defaultFgColor_override" "255 255 255 128" + "defaultFgColor_override" "TanLight" "armedFgColor_override" "TanDark" - "depressedFgColor_override" "255 255 255 128" + "depressedFgColor_override" "TanLight" "selectedFgColor_override" "TanDark" "sound_depressed" "UI/buttonclick.wav" @@ -224,9 +224,9 @@ "depressedBgColor_override" "TransparentBlack" "selectedBgColor_override" "ColorWhite" - "defaultFgColor_override" "255 255 255 128" + "defaultFgColor_override" "TanLight" "armedFgColor_override" "TanDark" - "depressedFgColor_override" "255 255 255 128" + "depressedFgColor_override" "TanLight" "selectedFgColor_override" "TanDark" "sound_depressed" "UI/buttonclick.wav" diff --git a/resource/ui/votehud-base.res b/resource/ui/votehud-base.res index 4a5a02a..c2558e3 100644 --- a/resource/ui/votehud-base.res +++ b/resource/ui/votehud-base.res @@ -12,7 +12,7 @@ "enabled" "1" "paintborder" "1" "border" "CyanBorder" - "bgcolor_override" "DarkGrey" + "bgcolor_override" "TransparentBlack" "PaintBackgroundType" "2" "PassedIcon" @@ -81,7 +81,7 @@ "enabled" "1" "paintborder" "1" "border" "CyanBorder" - "bgcolor_override" "DarkGrey" + "bgcolor_override" "TransparentBlack" "PaintBackgroundType" "2" "Header" @@ -90,7 +90,7 @@ "fieldName" "Header" "xpos" "10" "ypos" "5" - "wide" "130" + "wide" "140" "tall" "20" "visible" "1" "enabled" "1" @@ -108,8 +108,8 @@ "ControlName" "Label" "fieldName" "Issue" "xpos" "10" - "ypos" "22" - "wide" "130" + "ypos" "25" + "wide" "140" "tall" "40" "visible" "1" "enabled" "1" @@ -118,7 +118,7 @@ "dulltext" "0" "brighttext" "0" "font" "ScoreboardSmall" - "fgcolor_override" "White" + "fgcolor_override" "TanLight" "wrap" "1" "noshortcutsyntax" "1" } @@ -414,7 +414,7 @@ "enabled" "1" "paintborder" "1" "border" "CyanBorder" - "bgcolor_override" "DarkGrey" + "bgcolor_override" "TransparentBlack" "PaintBackgroundType" "2" "FailedIcon" @@ -483,7 +483,7 @@ "enabled" "1" "paintborder" "1" "border" "CyanBorder" - "bgcolor_override" "DarkGrey" + "bgcolor_override" "TransparentBlack" "PaintBackgroundType" "2" "FailedIcon" @@ -560,7 +560,7 @@ "PaintBackgroundType" "2" "header_font" "ItemFontNameLarge" - "header_fgcolor" "Orange" + "header_fgcolor" "ColorCyan" "issue_width" "180" "issue_font" "ItemFontNameSmall" "issue_fgcolor" "TanLight" @@ -583,6 +583,8 @@ "visible" "1" "enabled" "1" "wrap" "0" + "allcaps" "1" + "fgcolor_override" "ColorCyan" } "VoteSetupList" @@ -658,13 +660,13 @@ "NumericInputOnly" "0" "unicode" "0" - "fgcolor_override" "TextColor" - "bgcolor_override" "Yellow" - "disabledFgColor_override" "TextColor" - "disabledBgColor_override" "Yellow" - "selectionColor_override" "Yellow" - "selectionTextColor_override" "TextColor" - "defaultSelectionBG2Color_override" "Yellow" + "fgcolor_override" "TanLight" + "bgcolor_override" "LightRed" + "disabledFgColor_override" "TanLight" + "disabledBgColor_override" "LightRed" + "selectionColor_override" "LightRed" + "selectionTextColor_override" "TanLight" + "defaultSelectionBG2Color_override" "LightRed" } "CallVoteButton" @@ -686,7 +688,7 @@ "brighttext" "0" "Command" "CallVote" "Default" "0" - "font" "HudFontSmall" + "font" "HudFontMediumSmall" } "Button1" { @@ -707,7 +709,7 @@ "brighttext" "0" "Command" "Close" "Default" "0" - "font" "HudFontSmall" + "font" "HudFontMediumSmall" } } }
\ No newline at end of file diff --git a/resource/ui/wavestatuspanel.res b/resource/ui/wavestatuspanel.res index dae1e35..7ca31ac 100644 --- a/resource/ui/wavestatuspanel.res +++ b/resource/ui/wavestatuspanel.res @@ -27,15 +27,15 @@ "fieldName" "WaveCountLabel" "font" "Cerbetica14" "fgcolor" "TanLight" - "xpos" "140" - "ypos" "15" - "ypos_minmode" "5" + "xpos" "0" + "ypos" "0" "zpos" "3" - "wide" "200" - "tall" "15" + "wide" "70" + "tall" "30" "visible" "1" "enabled" "1" - "textAlignment" "center" + "allcaps" "1" + "textAlignment" "west" "labelText" "%wave_count%" } @@ -46,13 +46,13 @@ "font" "Cerbetica14" "fgcolor" "TransparentBlack" "xpos" "-1" - "ypos" "-1" + "ypos" "-2" "zpos" "3" - "wide" "200" - "tall" "15" - "visible" "1" - "enabled" "1" - "textAlignment" "center" + "wide" "70" + "tall" "30" + "visible" "0" + "enabled" "0" + "textAlignment" "west" "labelText" "%wave_count%" "pin_to_sibling" "WaveCountLabel" } @@ -104,12 +104,11 @@ { "ControlName" "ScalableImagePanel" "fieldName" "ProgressBar" - "xpos" "276" - "ypos" "19" - "ypos_minmode" "9" + "xpos" "60" + "ypos" "10" "zpos" "3" - "wide" "118" - "tall" "6" + "wide" "150" + "tall" "10" "visible" "1" "enabled" "1" "fillcolor" "../HUD/tournament_panel_tan" @@ -124,12 +123,11 @@ { "ControlName" "ImagePanel" "fieldName" "NewProgressBarBG" - "xpos" "276" - "ypos" "19" - "ypos_minmode" "9" - "zpos" "-1" - "wide" "118" - "tall" "6" + "xpos" "60" + "ypos" "10" + "zpos" "0" + "wide" "150" + "tall" "10" "autoResize" "0" "pinCorner" "0" "visible" "1" diff --git a/scripts/hudanimations_custom.txt b/scripts/hudanimations_custom.txt index 7a74943..1e38141 100644 --- a/scripts/hudanimations_custom.txt +++ b/scripts/hudanimations_custom.txt @@ -103,11 +103,11 @@ event HudMedicSolidColorCharge event HudMedicOrangePulseCharge { - Animate ChargeLabel FgColor "Flashing Uber Color1" Linear 0.0 0.3 - Animate ChargeLabel FgColor "Flashing Uber Color2" Linear 0.3 0.3 + Animate ChargeLabel FgColor "Flashing Uber Color1" Linear 0.0 0.1 + Animate ChargeLabel FgColor "Flashing Uber Color2" Linear 0.3 0.4 - Animate ChargeMeter FgColor "Flashing Uber Color1" Linear 0.0 0.3 - Animate ChargeMeter FgColor "Flashing Uber Color2" Linear 0.3 0.3 + Animate ChargeMeter FgColor "Flashing Uber Color1" Linear 0.0 0.1 + Animate ChargeMeter FgColor "Flashing Uber Color2" Linear 0.3 0.4 RunEvent HudMedicChargedLoop 0.6 } @@ -141,14 +141,14 @@ event HitMarker // Spy Disguise event HudSpyDisguiseFadeIn { - //RunEvent HudSpyDisguiseChanged 0.0 - //Animate PlayerStatusSpyImage Alpha "255" Linear 0.9 0.1 +// RunEvent HudSpyDisguiseChanged 0.0 +// Animate PlayerStatusSpyImage Alpha "255" Linear 0.9 0.1 } event HudSpyDisguiseFadeOut { - //RunEvent HudSpyDisguiseChanged 0.0 - //Animate PlayerStatusSpyImage Alpha "0" Linear 0.9 0.1 +// RunEvent HudSpyDisguiseChanged 0.0 +// Animate PlayerStatusSpyImage Alpha "0" Linear 0.9 0.1 } event HudSpyDisguiseChanged diff --git a/scripts/hudlayout-base.res b/scripts/hudlayout-base.res index 3acb46e..7809d57 100644 --- a/scripts/hudlayout-base.res +++ b/scripts/hudlayout-base.res @@ -62,7 +62,7 @@ "fieldName" "HudWeaponAmmo" "visible" "1" "enabled" "1" - "xpos" "c70" + "xpos" "c80" "ypos" "c70" "xpos_minmode" "c25" "ypos_minmode" "c30" @@ -86,14 +86,14 @@ "fieldName" "HudKothTimeStatus" "visible" "1" "enabled" "1" - "xpos" "c-65" + "xpos" "c-50" "ypos" "0" "zpos" "5" - "wide" "200" + "wide" "100" "tall" "60" - "blue_active_xpos" "15" - "red_active_xpos" "65" + "blue_active_xpos" "0" + "red_active_xpos" "50" } "HudItemEffectMeter" @@ -274,10 +274,10 @@ "visible" "0" "enabled" "1" "xpos" "c-100" - "ypos" "355" + "ypos" "c110" "ypos_minmode" "c80" "wide" "600" - "tall" "53" + "tall" "50" "priority" "100" } @@ -301,8 +301,8 @@ "visible" "0" "enabled" "1" "xpos" "c-100" - "ypos" "c135" - "ypos_minmode" "c120" + "ypos" "c145" + "ypos_minmode" "c140" "wide" "600" "tall" "50" "priority" "35" @@ -857,7 +857,8 @@ "visible" "1" "enabled" "1" "xpos" "c-225" - "ypos" "r128" + "ypos" "r125" + "zpos" "10" "wide" "450" "tall" "300" } @@ -1114,8 +1115,8 @@ "fieldName" "HudStopWatch" "visible" "1" "enabled" "1" - "xpos" "c-115" - "ypos" "27" + "xpos" "c100" + "ypos" "r20" "zpos" "0" "wide" "90" "tall" "15" @@ -1161,6 +1162,7 @@ "enabled" "1" "xpos" "0" "ypos" "r120" + "zpos" "10" "wide" "f0" "tall" "320" } @@ -1182,10 +1184,10 @@ "visible" "1" "enabled" "1" "xpos" "0" - "ypos" "0" - "zpos" "10" + "ypos" "r30" + "zpos" "1" "wide" "f0" - "tall" "50" + "tall" "25" } "HudAchievementTracker" |