diff --git a/materials/vgui/replay/thumbnails/customizations/float_damage_build.vtf b/materials/vgui/replay/thumbnails/customizations/float_damage_build.vtf index b8b61c2..dbf734e 100644 Binary files a/materials/vgui/replay/thumbnails/customizations/float_damage_build.vtf and b/materials/vgui/replay/thumbnails/customizations/float_damage_build.vtf differ diff --git a/materials/vgui/replay/thumbnails/customizations/float_damage_secondary.vtf b/materials/vgui/replay/thumbnails/customizations/float_damage_secondary.vtf index 41766e2..3723110 100644 Binary files a/materials/vgui/replay/thumbnails/customizations/float_damage_secondary.vtf and b/materials/vgui/replay/thumbnails/customizations/float_damage_secondary.vtf differ diff --git a/materials/vgui/replay/thumbnails/customizations/metal_default.vtf b/materials/vgui/replay/thumbnails/customizations/metal_default.vtf index 7f31c60..68acf1d 100644 Binary files a/materials/vgui/replay/thumbnails/customizations/metal_default.vtf and b/materials/vgui/replay/thumbnails/customizations/metal_default.vtf differ diff --git a/materials/vgui/replay/thumbnails/customizations/uber_default.vtf b/materials/vgui/replay/thumbnails/customizations/uber_default.vtf index 9346b80..236ef3c 100644 Binary files a/materials/vgui/replay/thumbnails/customizations/uber_default.vtf and b/materials/vgui/replay/thumbnails/customizations/uber_default.vtf differ diff --git a/resource/ui/#customizations/hud_customization_killfeed.res b/resource/ui/#customizations/hud_customization_killfeed.res index 2d0e63a..6c64e6f 100755 --- a/resource/ui/#customizations/hud_customization_killfeed.res +++ b/resource/ui/#customizations/hud_customization_killfeed.res @@ -255,7 +255,7 @@ "labelText" "9" "font" "ItemFontNameSmall" "textAlignment" "center" - "Command" "engine hud_killfeed_rows_8" + "Command" "engine hud_killfeed_rows_9" "actionsignallevel" "5" "sound_depressed" "UI/buttonclick.wav" diff --git a/resource/ui/huditemeffectmeter_killstreak.res b/resource/ui/huditemeffectmeter_killstreak.res index 8d688fd..4eb497d 100755 --- a/resource/ui/huditemeffectmeter_killstreak.res +++ b/resource/ui/huditemeffectmeter_killstreak.res @@ -7,10 +7,12 @@ "enabled" "1" "xpos" "c-316" "ypos" "r48" - "xpos_minmode" "c-314" - "ypos_minmode" "r36" - "wide" "100" - "tall" "50" + "xpos_minmode" "c-290" + "ypos_minmode" "r22" + "wide" "75" + "tall" "40" + "wide_minmode" "40" + "tall_minmode" "20" "MeterFG" "White" "MeterBG" "Gray" } @@ -37,9 +39,9 @@ { "ControlName" "CTFImagePanel" "fieldName" "MinmodeMeterBG" - "xpos" "26" - "ypos" "14" - "wide" "38" + "xpos" "0" + "ypos" "0" + "wide" "40" "tall" "20" "visible" "0" "visible_minmode" "1" @@ -56,33 +58,45 @@ "draw_corner_height" "6" } - "ItemEffectMeterLabel" + "Icon" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "9999" + "ControlName" "ImagePanel" + "fieldName" "Icon" + "xpos" "12" + "ypos" "10" + "xpos_minmode" "2" + "ypos_minmode" "2" + "zpos" "2" + "wide" "22" + "tall" "22" + "wide_minmode" "16" + "tall_minmode" "16" + "visible" "1" + "visible_minmode" "1" + "enabled" "1" + "image" "../hud/leaderboard_streak" + "scaleImage" "1" } "ItemEffectMeterCount" { "ControlName" "CExLabel" "fieldName" "ItemEffectMeterCount" - "xpos" "24" - "xpos_minmode" "38" - "ypos" "10" - "ypos_minmode" "15" + "xpos" "26" + "ypos" "12" + "xpos_minmode" "15" + "ypos_minmode" "2" "zpos" "2" - "wide" "40" - "tall" "22" - "wide_minmode" "20" - "tall_minmode" "20" + "wide" "35" + "tall" "20" + "wide_minmode" "26" + "tall_minmode" "18" "pinCorner" "2" "visible" "1" "enabled" "1" "tabPosition" "0" "labelText" "%progresscount%" - "textAlignment" "north" - "textAlignment_minmode" "east" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" "font" "HudFontMedium" @@ -93,48 +107,39 @@ { "ControlName" "CExLabel" "fieldName" "ItemEffectMeterCountShadow" - "xpos" "39" - "ypos" "16" + "xpos" "27" + "ypos" "13" + "xpos_minmode" "16" + "ypos_minmode" "3" "zpos" "1" - "wide" "20" + "wide" "35" "tall" "20" + "wide_minmode" "26" + "tall_minmode" "18" "pinCorner" "2" - "visible" "0" - "visible_minmode" "1" + "visible" "1" "enabled" "1" "tabPosition" "0" "labelText" "%progresscount%" - "textAlignment" "east" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "font" "HudFontMediumSmall" + "font" "HudFontMedium" + "font_minmode" "HudFontMediumSmall" "fgcolor" "Black" } - "Icon" + "ItemEffectMeterLabel" { - "ControlName" "ImagePanel" - "fieldName" "Icon" - "xpos" "12" - "ypos" "10" - "xpos_minmode" "28" - "ypos_minmode" "16" - "zpos" "2" - "wide" "22" - "tall" "22" - "wide_minmode" "16" - "tall_minmode" "16" - "visible" "1" - "visible_minmode" "1" - "enabled" "1" - "image" "../hud/leaderboard_streak" - "scaleImage" "1" + "ControlName" "CExLabel" + "fieldName" "ItemEffectMeterLabel" + "xpos" "9999" } "ItemEffectMeter" { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "xpos" "9999" - } + "ControlName" "ContinuousProgressBar" + "fieldName" "ItemEffectMeter" + "xpos" "9999" + } } diff --git a/resource/ui/huditemeffectmeter_powerupbottle.res b/resource/ui/huditemeffectmeter_powerupbottle.res index 326b767..faec131 100755 --- a/resource/ui/huditemeffectmeter_powerupbottle.res +++ b/resource/ui/huditemeffectmeter_powerupbottle.res @@ -5,12 +5,14 @@ "fieldName" "HudItemEffectMeter" "visible" "1" "enabled" "1" - "xpos" "c-316" + "xpos" "c-314" "ypos" "r84" - "xpos_minmode" "c-314" - "ypos_minmode" "r58" - "wide" "100" - "tall" "60" + "xpos_minmode" "c-290" + "ypos_minmode" "r42" + "wide" "70" + "tall" "40" + "wide_minmode" "40" + "tall_minmode" "20" "MeterFG" "White" "MeterBG" "Gray" } @@ -37,9 +39,9 @@ { "ControlName" "CTFImagePanel" "fieldName" "MinmodeMeterBG" - "xpos" "26" - "ypos" "14" - "wide" "38" + "xpos" "0" + "ypos" "0" + "wide" "40" "tall" "20" "visible" "0" "visible_minmode" "1" @@ -60,68 +62,83 @@ { "ControlName" "CTFImagePanel" "fieldName" "ItemEffectIcon" - "xpos" "12" - "xpos_minmode" "28" - "ypos" "8" - "ypos_minmode" "16" + "xpos" "10" + "xpos_minmode" "2" + "ypos" "9" + "ypos_minmode" "2" "zpos" "1" - "wide" "24" + "wide" "22" "wide_minmode" "16" - "tall" "24" + "tall" "22" "tall_minmode" "16" "visible" "1" "enabled" "1" "image" "../hud/ico_powerup_critboost_red" "scaleImage" "1" - } + } - "ItemEffectMeterLabel" + "ItemEffectMeterCount" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "9999" - } - - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "25" - "ypos" "23" + "ControlName" "CExLabel" + "fieldName" "ItemEffectMeterCount" + "xpos" "24" + "ypos" "12" + "xpos_minmode" "14" + "ypos_minmode" "2" "zpos" "2" - "wide" "40" - "tall" "6" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "textAlignment" "Left" + "wide" "35" + "tall" "20" + "wide_minmode" "26" + "tall_minmode" "18" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "%progresscount%" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" - } - - "ItemEffectMeterCount" + "font" "HudFontMedium" + "font_minmode" "HudFontMediumSmall" + } + + "ItemEffectMeterCountShadow" { "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterCount" - "xpos" "22" - "xpos_minmode" "18" - "ypos" "10" - "ypos_minmode" "15" - "zpos" "2" - "wide" "40" + "fieldName" "ItemEffectMeterCountShadow" + "xpos" "25" + "ypos" "13" + "xpos_minmode" "15" + "ypos_minmode" "3" + "zpos" "1" + "wide" "35" "tall" "20" + "wide_minmode" "26" + "tall_minmode" "18" "pinCorner" "2" "visible" "1" "enabled" "1" "tabPosition" "0" "labelText" "%progresscount%" - "textAlignment" "north" - "textAlignment_minmode" "east" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" "font" "HudFontMedium" "font_minmode" "HudFontMediumSmall" + "fgcolor" "Black" + } + + "ItemEffectMeterLabel" + { + "ControlName" "CExLabel" + "fieldName" "ItemEffectMeterLabel" + "xpos" "9999" } + + "ItemEffectMeter" + { + "ControlName" "ContinuousProgressBar" + "fieldName" "ItemEffectMeter" + "xpos" "9999" + } } diff --git a/resource/ui/hudrocketpack.res b/resource/ui/hudrocketpack.res index 1d199c1..e51835b 100755 --- a/resource/ui/hudrocketpack.res +++ b/resource/ui/hudrocketpack.res @@ -9,7 +9,7 @@ "xpos_minmode" "c216" "ypos" "r54" "ypos_minmode" "r48" - "wide" "94" + "wide" "90" "tall" "50" } @@ -18,9 +18,7 @@ "ControlName" "CTFImagePanel" "fieldName" "ItemEffectMeterBG" "xpos" "0" - "xpos_minmode" "0" "ypos" "0" - "ypos_minmode" "16" "zpos" "1" "wide" "90" "tall" "45" @@ -72,13 +70,6 @@ "scaleImage" "1" } - "ItemEffectMeterLabel" - { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "9999" - } - "ItemEffectMeter" { "ControlName" "ContinuousProgressBar" @@ -97,7 +88,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "textAlignment" "Left" + "textAlignment" "west" "dulltext" "0" "brighttext" "0" "fgcolor" "White" @@ -120,9 +111,16 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "textAlignment" "Left" + "textAlignment" "west" "dulltext" "0" "brighttext" "0" "fgcolor" "White" } + + "ItemEffectMeterLabel" + { + "ControlName" "CExLabel" + "fieldName" "ItemEffectMeterLabel" + "xpos" "9999" + } } diff --git a/resource/ui/hudspellselection.res b/resource/ui/hudspellselection.res index e6df11b..ea2caf1 100755 --- a/resource/ui/hudspellselection.res +++ b/resource/ui/hudspellselection.res @@ -5,13 +5,15 @@ "fieldName" "HudSpellMenu" "visible" "1" "enabled" "1" - "wide" "640" - "tall" "480" + "wide" "80" + "tall" "45" "zpos" "2" "xpos" "c-314" "ypos" "r52" - "xpos_minmode" "c-312" - "ypos_minmode" "r58" + "xpos_minmode" "c-313" + "ypos_minmode" "r58" + "wide_minmode" "80" + "tall_minmode" "80" "TextFont" "Default" "ItemFont" "Default" @@ -124,7 +126,7 @@ "textAlignment" "center" "xpos" "37" "ypos" "12" - "xpos_minmode" "46" + "xpos_minmode" "44" "ypos_minmode" "35" "zpos" "1" "wide" "20" @@ -140,7 +142,7 @@ "textAlignment" "center" "xpos" "38" "ypos" "13" - "xpos_minmode" "47" + "xpos_minmode" "45" "ypos_minmode" "36" "wide" "20" "tall" "20" diff --git a/resource/ui/meter/huditemeffectmeter_main.res b/resource/ui/meter/huditemeffectmeter_main.res index 423c399..593a005 100755 --- a/resource/ui/meter/huditemeffectmeter_main.res +++ b/resource/ui/meter/huditemeffectmeter_main.res @@ -9,8 +9,8 @@ "ypos" "r54" "xpos_minmode" "c148" "ypos_minmode" "r52" - "wide" "100" - "tall" "50" + "wide" "90" + "tall" "45" "wide_minmode" "50" "tall_minmode" "18" "MeterFG" "White" @@ -99,7 +99,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "textAlignment" "Left" + "textAlignment" "west" "dulltext" "0" "brighttext" "0" } diff --git a/resource/ui/meter/huditemeffectmeter_misc.res b/resource/ui/meter/huditemeffectmeter_misc.res index 608f974..d6cbf5e 100755 --- a/resource/ui/meter/huditemeffectmeter_misc.res +++ b/resource/ui/meter/huditemeffectmeter_misc.res @@ -9,8 +9,8 @@ "ypos" "r54" "xpos_minmode" "c148" "ypos_minmode" "r88" - "wide" "100" - "tall" "50" + "wide" "90" + "tall" "45" "wide_minmode" "50" "tall_minmode" "18" "MeterFG" "White" @@ -100,7 +100,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "textAlignment" "Left" + "textAlignment" "west" "dulltext" "0" "brighttext" "0" } diff --git a/resource/ui/meter/huditemeffectmeter_primary.res b/resource/ui/meter/huditemeffectmeter_primary.res index 8a4d09b..21f1d5c 100755 --- a/resource/ui/meter/huditemeffectmeter_primary.res +++ b/resource/ui/meter/huditemeffectmeter_primary.res @@ -9,8 +9,8 @@ "ypos" "r90" "xpos_minmode" "c148" "ypos_minmode" "r88" - "wide" "100" - "tall" "50" + "wide" "90" + "tall" "45" "wide_minmode" "50" "tall_minmode" "18" "MeterFG" "White" @@ -100,7 +100,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "textAlignment" "Left" + "textAlignment" "west" "dulltext" "0" "brighttext" "0" } diff --git a/resource/ui/meter/huditemeffectmeter_primarykill.res b/resource/ui/meter/huditemeffectmeter_primarykill.res index 0622668..5683ac4 100755 --- a/resource/ui/meter/huditemeffectmeter_primarykill.res +++ b/resource/ui/meter/huditemeffectmeter_primarykill.res @@ -97,13 +97,6 @@ "allcaps" "1" } - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "xpos" "9999" - } - "ItemEffectMeterCount" { "ControlName" "CExLabel" @@ -128,25 +121,36 @@ "font" "HudFontMedium" "font_minmode" "HudFontMediumSmall" } + "ItemEffectMeterCountShadow" { "ControlName" "CExLabel" "fieldName" "ItemEffectMeterCountShadow" - "xpos" "15" - "ypos" "2" - "zpos" "2" - "wide" "24" - "tall" "18" + "xpos" "26" + "ypos" "9" + "xpos_minmode" "14" + "ypos_minmode" "1" + "zpos" "1" + "wide" "40" + "wide_minmode" "24" + "tall" "22" + "tall_minmode" "18" "pinCorner" "2" - "visible" "0" - "visible_minmode" "1" + "visible" "1" "enabled" "1" "tabPosition" "0" "labelText" "%progresscount%" "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "font" "HudFontMediumSmall" + "font" "HudFontMedium" + "font_minmode" "HudFontMediumSmall" "fgcolor" "Black" } + "ItemEffectMeter" + { + "ControlName" "ContinuousProgressBar" + "fieldName" "ItemEffectMeter" + "xpos" "9999" + } } diff --git a/resource/ui/meter/huditemeffectmeter_secondary.res b/resource/ui/meter/huditemeffectmeter_secondary.res index cfdf687..7b43648 100755 --- a/resource/ui/meter/huditemeffectmeter_secondary.res +++ b/resource/ui/meter/huditemeffectmeter_secondary.res @@ -9,8 +9,8 @@ "ypos" "r89" "xpos_minmode" "c148" "ypos_minmode" "r70" - "wide" "100" - "tall" "50" + "wide" "90" + "tall" "45" "wide_minmode" "50" "tall_minmode" "18" "MeterFG" "White" @@ -100,7 +100,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "textAlignment" "Left" + "textAlignment" "west" "dulltext" "0" "brighttext" "0" } diff --git a/resource/ui/meter/huditemeffectmeter_secondarykill.res b/resource/ui/meter/huditemeffectmeter_secondarykill.res index 86cd243..26aab1e 100755 --- a/resource/ui/meter/huditemeffectmeter_secondarykill.res +++ b/resource/ui/meter/huditemeffectmeter_secondarykill.res @@ -97,13 +97,6 @@ "allcaps" "1" } - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "xpos" "9999" - } - "ItemEffectMeterCount" { "ControlName" "CExLabel" @@ -128,25 +121,37 @@ "font" "HudFontMedium" "font_minmode" "HudFontMediumSmall" } + "ItemEffectMeterCountShadow" { "ControlName" "CExLabel" "fieldName" "ItemEffectMeterCountShadow" - "xpos" "15" - "ypos" "2" - "zpos" "2" - "wide" "24" - "tall" "18" + "xpos" "26" + "ypos" "9" + "xpos_minmode" "15" + "ypos_minmode" "2" + "zpos" "1" + "wide" "40" + "wide_minmode" "24" + "tall" "22" + "tall_minmode" "18" "pinCorner" "2" - "visible" "0" - "visible_minmode" "1" + "visible" "1" "enabled" "1" "tabPosition" "0" "labelText" "%progresscount%" "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "font" "HudFontMediumSmall" + "font" "HudFontMedium" + "font_minmode" "HudFontMediumSmall" "fgcolor" "Black" } + + "ItemEffectMeter" + { + "ControlName" "ContinuousProgressBar" + "fieldName" "ItemEffectMeter" + "xpos" "9999" + } }