From 46d248b5167f9c8794c3125146952fef08f86bcd Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Mon, 28 Dec 2020 13:46:03 -0500 Subject: Added Hypnotize's Icons - Updated to Hypnotize's icon pack. - Updated multiple files, removed unused code. --- resource/ui/econ/store/v2/storehome_base.res | 48 +---------------- resource/ui/econ/store/v2/storehome_premium.res | 22 +------- resource/ui/econ/store/v2/storepanel.res | 26 ++++----- .../ui/econ/store/v2/storepreviewitempanel.res | 61 ++++++++++------------ .../econ/store/v2/storepreviewitempanel_maps.res | 32 ++++-------- resource/ui/econ/store/v2/storeviewcartpanel.res | 1 + 6 files changed, 54 insertions(+), 136 deletions(-) (limited to 'resource/ui/econ/store/v2') diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res index 7a02259..4830e2f 100644 --- a/resource/ui/econ/store/v2/storehome_base.res +++ b/resource/ui/econ/store/v2/storehome_base.res @@ -211,58 +211,14 @@ { "ControlName" "EditablePanel" "fieldName" "SaxtonBackgroundPanel" - "xpos" "c-415" - "ypos" "10" - "zpos" "-1" - "wide" "300" - "tall" "300" - "visible" "1" - "enabled" "1" - - "MannCoImage" - { - "ControlName" "ImagePanel" - "fieldName" "MannCoImage" - "xpos" "15" - "ypos" "0" - "zpos" "0" - "wide" "420" - "tall" "220" - "visible" "0" - "enabled" "1" - "image" "store/saxton_welcome" - "scaleImage" "1" - } + "xpos" "9999" } "StoreBackgroundPanel" { "ControlName" "EditablePanel" "fieldName" "StoreBackgroundPanel" - "xpos" "0" - "ypos" "0" - "zpos" "-1" - "wide" "f0" - "tall" "f0" - "visible" "0" - "enabled" "0" - "proportiontoparent" "1" - - "StoreBackgroundImage" - { - "ControlName" "ScalableImagePanel" - "fieldName" "StoreBackgroundImage" - "xpos" "0" - "ypos" "0" - "zpos" "0" - "wide" "f0" - "tall" "f0" - "visible" "1" - "enable" "1" - "image" "store/store_bg001" - "scale_image" "1" - "proportiontoparent" "1" - } + "xpos" "9999" } "ReloadSchemeButton" diff --git a/resource/ui/econ/store/v2/storehome_premium.res b/resource/ui/econ/store/v2/storehome_premium.res index d5fab06..ad7fb17 100644 --- a/resource/ui/econ/store/v2/storehome_premium.res +++ b/resource/ui/econ/store/v2/storehome_premium.res @@ -6,26 +6,6 @@ { "ControlName" "EditablePanel" "fieldName" "PremiumCallout" - "xpos" "c-323" - "ypos" "c-45" - "zpos" "-1" - "wide" "300" - "tall" "300" - "visible" "1" - "enabled" "1" - - "MannCoImage" - { - "ControlName" "ImagePanel" - "fieldName" "MannCoImage" - "wide" "420" - "tall" "220" - "visible" "0" - "enabled" "1" - "scaleImage" "1" - "xpos" "15" - "ypos" "0" - "zpos" "0" - } + "xpos" "9999" } } \ No newline at end of file diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res index 202b658..e1b48d0 100644 --- a/resource/ui/econ/store/v2/storepanel.res +++ b/resource/ui/econ/store/v2/storepanel.res @@ -105,14 +105,14 @@ "Sheet" { - "ControlName" "EditablePanel" - "fieldName" "Sheet" - "tabxindent" "80" - "tabxdelta" "10" - "tabxfittotext" "1" - "tabheight" "20" - "yoffset" "14" - "transition_time" "0" + "ControlName" "EditablePanel" + "fieldName" "Sheet" + "tabxindent" "80" + "tabxdelta" "10" + "tabxfittotext" "1" + "tabheight" "20" + "yoffset" "14" + "transition_time" "0" "HeaderLine" { @@ -139,11 +139,11 @@ "selectedcolor" "TanLight" "unselectedcolor" "TanDark" "defaultBgColor_override" "DarkGrey" - "paintbackground" "1" - "activeborder_override" "CyanBorderTabs" - "normalborder_override" "CyanBorderTabsInactive" - "unselectedBgColor_override" "10 10 10 255" - "depressedBgColor_override" "10 10 10 255" + "paintbackground" "1" + "activeborder_override" "CyanBorderTabs" + "normalborder_override" "CyanBorderTabsInactive" + "armedBgColor_override" "10 10 10 255" + "selectedBgColor_override" "10 10 10 255" } } diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res index 89c57b5..498f376 100644 --- a/resource/ui/econ/store/v2/storepreviewitempanel.res +++ b/resource/ui/econ/store/v2/storepreviewitempanel.res @@ -958,9 +958,10 @@ "dulltext" "0" "brighttext" "0" "command" "icons_right" + "paintbackground" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "0" + "defaultFgColor_override" "118 107 94 255" "armedFgColor_override" "128 117 104 255" "depressedFgColor_override" "236 227 203 255" @@ -1009,9 +1010,11 @@ "dulltext" "0" "brighttext" "0" "Command" "-1" + "paintbackground" "0" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "0" + "defaultFgColor_override" "118 107 94 255" "armedFgColor_override" "128 117 104 255" "depressedFgColor_override" "236 227 203 255" @@ -1038,9 +1041,11 @@ "dulltext" "0" "brighttext" "0" "Command" "1" + "paintbackground" "0" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "paintbackground" "0" + "defaultFgColor_override" "118 107 94 255" "armedFgColor_override" "128 117 104 255" "depressedFgColor_override" "236 227 203 255" @@ -1088,10 +1093,12 @@ "dulltext" "0" "brighttext" "0" "default" "0" - "sound_depressed" "UI/buttonclick.wav" - "sound_released" "UI/buttonclickrelease.wav" "Command" "gofullscreen" "paintbackground" "0" + + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "image_drawcolor" "118 107 94 200" "image_armedcolor" "128 117 104 255" @@ -1131,10 +1138,12 @@ "dulltext" "0" "brighttext" "0" "default" "0" - "sound_depressed" "UI/buttonclick.wav" - "sound_released" "UI/buttonclickrelease.wav" "Command" "zoom_toggle" "paintbackground" "0" + + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "image_drawcolor" "118 107 94 200" "image_armedcolor" "128 117 104 255" @@ -1371,38 +1380,21 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labeltext" "" - "font" "" + "labeltext" "(" + "font" "CustomIcons" "textAlignment" "center" "dulltext" "0" "brighttext" "0" "default" "0" + "Command" "closex" + "paintbackground" "0" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "Command" "closex" // Intentionally using "closex" instead of "close" for stats - "paintbackground" "0" - - "defaultFgColor_override" "Blank" - "armedFgColor_override" "Blank" - "depressedFgColor_override" "Blank" - "image_drawcolor" "White" - "image_armedcolor" "255 0 0 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "cs-0.5" - "ypos" "cs-0.5" - "zpos" "1" - "wide" "9" - "tall" "9" - "visible" "1" - "enabled" "1" - "image" "replay/thumbnails/close" - "scaleImage" "1" - "proportionaltoparent" "1" - } + + "defaultFgColor_override" "TanLight" + "armedFgColor_override" "255 0 0 255" + "depressedFgColor_override" "TanLight" } "BackButton" @@ -1425,6 +1417,7 @@ "brighttext" "0" "default" "1" "Command" "close" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" } @@ -1449,6 +1442,7 @@ "brighttext" "0" "default" "1" "Command" "tryitout" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" } @@ -1473,6 +1467,7 @@ "brighttext" "0" "default" "1" "Command" "addtocart" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" } diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res index 18c7440..f8eaf13 100644 --- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res +++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res @@ -496,35 +496,21 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labeltext" "" - "font" "HudFontSmallBold" + "labeltext" "(" + "font" "CustomIcons" "textAlignment" "center" "dulltext" "0" "brighttext" "0" "default" "0" - "sound_depressed" "UI/buttonclick.wav" - "sound_released" "UI/buttonclickrelease.wav" "Command" "close" "paintbackground" "0" - - "image_drawcolor" "White" - "image_armedcolor" "255 0 0 255" - - "SubImage" - { - "ControlName" "ImagePanel" - "fieldName" "SubImage" - "xpos" "cs-0.5" - "ypos" "cs-0.5" - "zpos" "1" - "wide" "9" - "tall" "9" - "visible" "1" - "enabled" "1" - "image" "replay/thumbnails/close" - "scaleImage" "1" - "proportionaltoparent" "1" - } + + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + + "defaultFgColor_override" "White" + "armedFgColor_override" "255 0 0 255" + "depressedFgColor_override" "White" } "BackButton" diff --git a/resource/ui/econ/store/v2/storeviewcartpanel.res b/resource/ui/econ/store/v2/storeviewcartpanel.res index 0d2b1c3..94e6b50 100644 --- a/resource/ui/econ/store/v2/storeviewcartpanel.res +++ b/resource/ui/econ/store/v2/storeviewcartpanel.res @@ -331,6 +331,7 @@ } "nobuttons" "1" + "UpButton" { "ControlName" "Button" -- cgit v1.2.3 From e0f728581ba5d7ca0d7ea06b015c36e189993664 Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Tue, 29 Dec 2020 21:00:35 -0500 Subject: Bug Fixes, see notes. - Fixed the stock items checkbox not working on the backpack page. - Fixed the cutoff description label on the confirmation panel. - Fixed the font for the item series number being too large to display. - Fixed the store preview page not allowing to change item color and style. - Increased the size of the sentry gun's health on the building panel (#158) - Fixed the KOTH timer not being centred properly. - Miscellenaous other fixes and improvements. --- .../ui/econ/store/v2/storepreviewitempanel.res | 98 +++++++++++----------- 1 file changed, 48 insertions(+), 50 deletions(-) (limited to 'resource/ui/econ/store/v2') diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res index 498f376..ecdeea9 100644 --- a/resource/ui/econ/store/v2/storepreviewitempanel.res +++ b/resource/ui/econ/store/v2/storepreviewitempanel.res @@ -1099,8 +1099,8 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "image_drawcolor" "118 107 94 200" - "image_armedcolor" "128 117 104 255" + "image_drawcolor" "118 107 94 200" + "image_armedcolor" "246 247 213 255" "SubImage" { @@ -1144,8 +1144,8 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "image_drawcolor" "118 107 94 200" - "image_armedcolor" "128 117 104 255" + "image_drawcolor" "118 107 94 200" + "image_armedcolor" "246 247 213 255" "SubImage" { @@ -1163,6 +1163,50 @@ } } + "OptionsButton" + { + "ControlName" "CExImageButton" + "fieldName" "OptionsButton" + "xpos" "c-63" + "ypos" "c-123" + "zpos" "20" + "wide" "11" + "tall" "11" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "labeltext" "" + "font" "HudFontSmallBold" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "0" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "Command" "options" + "paintbackground" "0" + + "image_drawcolor" "118 107 94 200" + "image_armedcolor" "246 247 213 255" + + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "11" + "tall" "11" + "visible" "1" + "enabled" "1" + "image" "glyph_options" + "scaleImage" "1" + } + } + "TeamNavPanel" { "ControlName" "CNavigationPanel" @@ -1262,31 +1306,6 @@ } } - "PaintButton" - { - "ControlName" "CExButton" - "fieldName" "PaintButton" - "xpos" "c-158" - "ypos" "c-140" - "zpos" "20" - "wide" "76" - "tall" "15" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "tabPosition" "0" - "labelText" "#Store_Paint" - "font" "HudFontSmallest" - "textAlignment" "center" - "textinsetx" "50" - "dulltext" "0" - "brighttext" "0" - "Command" "paint_toggle" - "sound_depressed" "UI/buttonclick.wav" - "sound_released" "UI/buttonclickrelease.wav" - } - "CycleTextLabel" { "ControlName" "CExLabel" @@ -1306,27 +1325,6 @@ "centerwrap" "1" } - "NextStyleButton" - { - "ControlName" "CExButton" - "fieldName" "NextStyleButton" - "zpos" "20" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "tabPosition" "0" - "labelText" "#Store_NextStyle" - "font" "HudFontSmallest" - "textAlignment" "center" - "textinsetx" "50" - "dulltext" "0" - "brighttext" "0" - "Command" "next_style" - "sound_depressed" "UI/buttonclick.wav" - "sound_released" "UI/buttonclickrelease.wav" - } - "PaintNameLabel" { "ControlName" "CExLabel" -- cgit v1.2.3 From fa52fc56431c410283f185f96c4849b9c5d12bf4 Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Wed, 30 Dec 2020 15:11:57 -0500 Subject: Bug Fixes, see notes. - Fixed the casual and competitive stats not displaying properly. - Fixed the sapper building panel not displaying when sapping a building. - Fixed the time added label not being positioned properly. - Fixed the KOTH timers not displaying team colors. - Fixed the buyback label not appearing in Mann vs. Machine. - Fixed the TargetID not displaying a team colored panel when looking at players. - Fixed the TargetID missing a hand icon for picking up buildings. - Added a score panel for the Passtime game mode. - Added a missing help label to the spell counter. - Removed unused files. - Miscellenaous tweaks and improvements. --- resource/ui/econ/store/v2/storepage.res | 24 +++++++++++----------- resource/ui/econ/store/v2/storepanel.res | 2 +- .../ui/econ/store/v2/storepreviewitempanel.res | 1 + .../econ/store/v2/storepreviewitempanel_maps.res | 3 +++ 4 files changed, 17 insertions(+), 13 deletions(-) (limited to 'resource/ui/econ/store/v2') diff --git a/resource/ui/econ/store/v2/storepage.res b/resource/ui/econ/store/v2/storepage.res index b876c4c..0ab0419 100644 --- a/resource/ui/econ/store/v2/storepage.res +++ b/resource/ui/econ/store/v2/storepage.res @@ -188,19 +188,19 @@ "paintborder" "1" "fgcolor_override" "TanLight" - "bgcolor_override" "15 15 15 255" + "bgcolor_override" "Black" "disabledFgColor_override" "TanLight" - "disabledBgColor_override" "15 15 15 255" - "selectionColor_override" "15 15 15 255" + "disabledBgColor_override" "Black" + "selectionColor_override" "Black" "selectionTextColor_override" "TanLight" - "defaultSelectionBG2Color_override" "15 15 15 255" + "defaultSelectionBG2Color_override" "Black" "Button" { "defaultFgColor_override" "TanLight" - "defaultBgColor_override" "15 15 15 255" + "defaultBgColor_override" "Black" "armedFgColor_override" "15 255 255 255" - "armedBgColor_override" "15 15 15 255" + "armedBgColor_override" "Black" "paintbackgroundtype" "2" } } @@ -229,19 +229,19 @@ "paintborder" "1" "fgcolor_override" "TanLight" - "bgcolor_override" "15 15 15 255" + "bgcolor_override" "Black" "disabledFgColor_override" "TanLight" - "disabledBgColor_override" "15 15 15 255" - "selectionColor_override" "15 15 15 255" + "disabledBgColor_override" "Black" + "selectionColor_override" "Black" "selectionTextColor_override" "TanLight" - "defaultSelectionBG2Color_override" "15 15 15 255" + "defaultSelectionBG2Color_override" "Black" "Button" { "defaultFgColor_override" "TanLight" - "defaultBgColor_override" "15 15 15 255" + "defaultBgColor_override" "Black" "armedFgColor_override" "15 255 255 255" - "armedBgColor_override" "15 15 15 255" + "armedBgColor_override" "Black" "paintbackgroundtype" "2" } } diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res index e1b48d0..0db5a9f 100644 --- a/resource/ui/econ/store/v2/storepanel.res +++ b/resource/ui/econ/store/v2/storepanel.res @@ -221,7 +221,7 @@ "zpos" "5" "wide" "70" "tall" "100" - "font" "HudFontSmallest" + "font" "Cerbetica10" "wrap" "1" "labelText" "#Store_ConfirmStampDonationAddTitle" "visible" "0" diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res index ecdeea9..288c206 100644 --- a/resource/ui/econ/store/v2/storepreviewitempanel.res +++ b/resource/ui/econ/store/v2/storepreviewitempanel.res @@ -1464,6 +1464,7 @@ "dulltext" "0" "brighttext" "0" "default" "1" + "allcaps" "1" "Command" "addtocart" "sound_depressed" "UI/buttonclick.wav" diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res index f8eaf13..9f67564 100644 --- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res +++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res @@ -533,6 +533,7 @@ "brighttext" "0" "default" "1" "Command" "close" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" } @@ -556,7 +557,9 @@ "dulltext" "0" "brighttext" "0" "default" "1" + "allcaps" "1" "Command" "addtocart" + "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" } -- cgit v1.2.3