summaryrefslogtreecommitdiff
path: root/resource/ui/econ
diff options
context:
space:
mode:
authorCriticalFlaw <[email protected]>2020-12-30 15:11:57 -0500
committerCriticalFlaw <[email protected]>2020-12-30 15:11:57 -0500
commitfa52fc56431c410283f185f96c4849b9c5d12bf4 (patch)
tree12cb9619236dcf52474017eac3157cd248d6003a /resource/ui/econ
parent5752f38cce9d4623dbb13e13a3c7d466aae7c3e6 (diff)
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.
Diffstat (limited to 'resource/ui/econ')
-rw-r--r--resource/ui/econ/confirmapplydecodedialog.res298
-rw-r--r--resource/ui/econ/genericwaitingdialog.res2
-rw-r--r--resource/ui/econ/inspectionpanel.res5
-rw-r--r--resource/ui/econ/itemmodelpanel.res2
-rw-r--r--resource/ui/econ/store/v2/storepage.res24
-rw-r--r--resource/ui/econ/store/v2/storepanel.res2
-rw-r--r--resource/ui/econ/store/v2/storepreviewitempanel.res1
-rw-r--r--resource/ui/econ/store/v2/storepreviewitempanel_maps.res3
-rw-r--r--resource/ui/econ/tradingstartdialog.res2
9 files changed, 323 insertions, 16 deletions
diff --git a/resource/ui/econ/confirmapplydecodedialog.res b/resource/ui/econ/confirmapplydecodedialog.res
new file mode 100644
index 0000000..10f7d60
--- /dev/null
+++ b/resource/ui/econ/confirmapplydecodedialog.res
@@ -0,0 +1,298 @@
+"Resource/UI/ConfirmApplyDecodeDialog.res"
+{
+ "ConfirmApplyDecodeDialog"
+ {
+ "fieldName" "ConfirmApplyDecodeDialog"
+ "visible" "1"
+ "enabled" "1"
+ "xpos" "c-200"
+ "ypos" "c-200"
+ "wide" "400"
+ "tall" "240"
+ "bgcolor_override" "DarkGrey"
+ "paintbackgroundtype" "0"
+ "settitlebarvisible" "0"
+ "border" "CyanBorderThick"
+ }
+
+ "mouseoveritempanel"
+ {
+ "ControlName" "CItemModelPanel"
+ "fieldName" "mouseoveritempanel"
+ "xpos" "c-70"
+ "ypos" "270"
+ "zpos" "100"
+ "wide" "300"
+ "tall" "300"
+ "visible" "0"
+ "bgcolor_override" "Transparent"
+ "noitem_textcolor" "TextColor"
+ "PaintBackgroundType" "2"
+ "paintborder" "1"
+ "text_ypos" "20"
+ "text_center" "1"
+ "model_hide" "1"
+ "resize_to_text" "1"
+ "padding_height" "15"
+
+ "attriblabel"
+ {
+ "font" "ItemFontAttribLarge"
+ "xpos" "0"
+ "ypos" "30"
+ "zpos" "2"
+ "wide" "140"
+ "tall" "60"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "%attriblist%"
+ "textAlignment" "center"
+ "fgcolor" "TextColor"
+ "centerwrap" "1"
+ }
+ }
+
+ "TitleLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "TitleLabel"
+ "font" "HudFontMediumBold"
+ "labelText" "dynamic"
+ "textAlignment" "center"
+ "xpos" "100"
+ "ypos" "10"
+ "zpos" "0"
+ "wide" "200"
+ "tall" "60"
+ "autoResize" "1"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "centerwrap" "1"
+ }
+
+ "ToolBG"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "ToolBG"
+ "font" "HudFontSmallBold"
+ "labelText" ""
+ "textAlignment" "east"
+ "xpos" "10"
+ "ypos" "10"
+ "zpos" "-1"
+ "wide" "84"
+ "tall" "64"
+ "autoResize" "1"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "paintbackground" "0"
+ "border" "BackpackItemBorder_SelfMade"
+ }
+
+ "tool_icon"
+ {
+ "ControlName" "ScalableImagePanel"
+ "fieldName" "tool_icon"
+ "xpos" "10"
+ "ypos" "10"
+ "zpos" "2"
+ "wide" "16"
+ "tall" "16"
+ "visible" "1"
+ "enabled" "1"
+ "image" "backpack_jewel_modify_target_b_g"
+ "tileImage" "0"
+ "tileVertically" "0"
+ "drawcolor" "112 176 74 255"
+ }
+
+ "tool_modelpanel"
+ {
+ "ControlName" "CItemModelPanel"
+ "fieldName" "tool_modelpanel"
+ "xpos" "10"
+ "ypos" "10"
+ "zpos" "1"
+ "wide" "84"
+ "tall" "64"
+ "visible" "1"
+ "bgcolor_override" "Transparent"
+ "noitem_textcolor" "TextColor"
+ "PaintBackgroundType" "2"
+ "paintborder" "0"
+ "model_xpos" "2"
+ "model_ypos" "5"
+ "model_wide" "80"
+ "model_tall" "54"
+ "text_ypos" "100"
+ "text_center" "1"
+ "name_only" "1"
+ "paint_icon_hide" "1"
+
+ "itemmodelpanel"
+ {
+ "use_item_rendertarget" "0"
+ "allow_rot" "0"
+ "inventory_image_type" "1"
+ }
+ }
+
+ "SubjectBG"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "SubjectBG"
+ "font" "HudFontSmallBold"
+ "labelText" ""
+ "textAlignment" "east"
+ "xpos" "300"
+ "ypos" "10"
+ "zpos" "-1"
+ "wide" "84"
+ "tall" "64"
+ "autoResize" "1"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "paintbackground" "0"
+ "border" "BackpackItemBorder_Vintage"
+ }
+
+ "subject_icon"
+ {
+ "ControlName" "ScalableImagePanel"
+ "fieldName" "subject_icon"
+ "xpos" "300"
+ "ypos" "10"
+ "zpos" "2"
+ "wide" "16"
+ "tall" "16"
+ "visible" "1"
+ "enabled" "1"
+ "image" "backpack_jewel_modify_target_b_g"
+ "tileImage" "0"
+ "tileVertically" "0"
+ "drawcolor" "71 98 145 255"
+ }
+
+ "subject_modelpanel"
+ {
+ "ControlName" "CItemModelPanel"
+ "fieldName" "subject_modelpanel"
+ "xpos" "300"
+ "ypos" "10"
+ "zpos" "1"
+ "wide" "84"
+ "tall" "64"
+ "visible" "1"
+ "bgcolor_override" "Transparent"
+ "noitem_textcolor" "TextColor"
+ "PaintBackgroundType" "2"
+ "paintborder" "0"
+ "model_xpos" "2"
+ "model_ypos" "5"
+ "model_wide" "80"
+ "model_tall" "54"
+ "text_ypos" "100"
+ "text_center" "1"
+ "name_only" "1"
+
+ "itemmodelpanel"
+ {
+ "use_item_rendertarget" "0"
+ "allow_rot" "0"
+ "inventory_image_type" "1"
+ }
+ }
+
+ "ConfirmLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "ConfirmLabel"
+ "font" "HudFontSmall"
+ "labelText" "%confirm_text%"
+ "textAlignment" "center"
+ "xpos" "20"
+ "ypos" "80"
+ "zpos" "0"
+ "wide" "360"
+ "tall" "20"
+ "autoResize" "1"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "fgcolor_override" "Yellow"
+ }
+
+ "OptionalAppendLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "OptionalAppendLabel"
+ "font" "HudFontSmall"
+ "labelText" "%optional_append%"
+ "textAlignment" "center"
+ "xpos" "20"
+ "ypos" "80"
+ "zpos" "0"
+ "wide" "360"
+ "tall" "60"
+ "autoResize" "1"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "fgcolor_override" "LightRed"
+ }
+
+ "CancelButton"
+ {
+ "ControlName" "CExButton"
+ "fieldName" "CancelButton"
+ "xpos" "50"
+ "ypos" "200"
+ "zpos" "1"
+ "wide" "130"
+ "tall" "20"
+ "autoResize" "0"
+ "pinCorner" "3"
+ "visible" "1"
+ "enabled" "1"
+ "tabPosition" "0"
+ "labelText" "#Cancel"
+ "font" "HudFontSmall"
+ "textAlignment" "center"
+ "dulltext" "0"
+ "brighttext" "0"
+ "default" "0"
+ "Command" "cancel"
+ "sound_depressed" "UI/buttonclick.wav"
+ "sound_released" "UI/buttonclickrelease.wav"
+ }
+
+ "OkButton"
+ {
+ "ControlName" "CExButton"
+ "fieldName" "OkButton"
+ "xpos" "220"
+ "ypos" "200"
+ "zpos" "1"
+ "wide" "130"
+ "tall" "20"
+ "autoResize" "0"
+ "pinCorner" "3"
+ "visible" "1"
+ "enabled" "1"
+ "tabPosition" "0"
+ "labelText" "#CraftNameConfirm"
+ "font" "HudFontSmall"
+ "textAlignment" "center"
+ "dulltext" "0"
+ "brighttext" "0"
+ "default" "1"
+ "Command" "apply"
+ "sound_depressed" "UI/buttonclick.wav"
+ "sound_released" "UI/buttonclickrelease.wav"
+ }
+} \ No newline at end of file
diff --git a/resource/ui/econ/genericwaitingdialog.res b/resource/ui/econ/genericwaitingdialog.res
index fa122eb..3c687d7 100644
--- a/resource/ui/econ/genericwaitingdialog.res
+++ b/resource/ui/econ/genericwaitingdialog.res
@@ -12,7 +12,7 @@
"bgcolor_override" "DarkGrey"
"paintbackgroundtype" "1"
"settitlebarvisible" "0"
- "border" "NoBorder"
+ "border" "CyanBorder"
}
"TitleLabel"
diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
index 02e4c82..3a20a22 100644
--- a/resource/ui/econ/inspectionpanel.res
+++ b/resource/ui/econ/inspectionpanel.res
@@ -532,6 +532,11 @@
"sound_released" "UI/buttonclickrelease.wav"
"command" "random_seed"
+ "defaultFgColor_override" "White"
+ "defaultBgColor_override" "Black"
+ "selectedFgColor_override" "Black"
+ "selectedBgColor_override" "White"
+
"consume_mode"
{
"visible" "0"
diff --git a/resource/ui/econ/itemmodelpanel.res b/resource/ui/econ/itemmodelpanel.res
index 8da8930..9e5aa8a 100644
--- a/resource/ui/econ/itemmodelpanel.res
+++ b/resource/ui/econ/itemmodelpanel.res
@@ -177,7 +177,7 @@
"xpos" "4"
"ypos" "4"
"zpos" "2"
- "wide" "14"
+ "wide" "17"
"tall" "10"
"autoResize" "0"
"pinCorner" "0"
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"
}
diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res
index a192e77..ed81ff3 100644
--- a/resource/ui/econ/tradingstartdialog.res
+++ b/resource/ui/econ/tradingstartdialog.res
@@ -357,7 +357,7 @@
"ypos" "40"
"zpos" "-1"
"wide" "400"
- "tall" "30"
+ "tall" "35"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"