diff options
| author | CriticalFlaw <[email protected]> | 2020-08-07 18:49:07 -0400 |
|---|---|---|
| committer | CriticalFlaw <[email protected]> | 2020-08-07 18:49:07 -0400 |
| commit | efba2d7f8d7c68205331fcc3accad683649faed8 (patch) | |
| tree | f489c6a79f4e8e919f0ca89ff18cf6e6dddd5d34 | |
| parent | 8ab130c7f27a40993c76e43c3b7275477c18cd7c (diff) | |
Visual Tweaks
- Increased the size of the item names on the loadout screen.
- Updated the tournament and building panels
- Added a panel shown when the player auto-switches teams.
- Fixed the reserve ammo sometimes being cutoff.
- Added additional panels, visual tweaks to multiple others.
81 files changed, 2558 insertions, 725 deletions
diff --git a/customizations/scoreboards/scoreboard.res b/customizations/scoreboards/scoreboard.res index 26e5f33..9af50ea 100644 --- a/customizations/scoreboards/scoreboard.res +++ b/customizations/scoreboards/scoreboard.res @@ -498,9 +498,9 @@ "font" "HudFontSmallest" "labelText" "%waitingtoplay%" "textAlignment" "west" - "xpos" "2" - "ypos" "42" - "zpos" "4" + "xpos" "5" + "ypos" "50" + "zpos" "999" "wide" "600" "tall" "20" "autoResize" "0" diff --git a/resource/chatscheme.res b/resource/chatscheme.res index 4cce613..1173f43 100644 --- a/resource/chatscheme.res +++ b/resource/chatscheme.res @@ -1,24 +1,27 @@ Scheme { + //////////////////////// COLORS /////////////////////////// + // color details + // this is a list of all the colors used by the scheme Colors { "TFDarkBrown" "60 56 53 255" - "TFDarkBrownTransparent" "60 56 53 190" - "TFTanBright" "236 227 203 150" - "TFTanLight" "201 188 162 150" - "TFTanMedium" "131 121 104 150" - "TFTanLightBright" "229 223 211 90" - "TFTanLightDark" "96 90 78 90" - "TFOrangeBright" "156 82 33 255" - "TFTextBright" "251 236 203 150" - "TFTextLight" "201 188 162 255" - "TFTextMedium" "131 121 104 255" - "TFTextMediumDark" "104 96 83 255" - "TFTextBlack" "42 39 37 255" - "TFTextDull" "131 121 104 255" - "TFMediumBrown" "69 64 58 255" - "QuickListBGDeselected" "69 64 58 255" - "QuickListBGSelected" "131 121 104 150" + "TFDarkBrownTransparent" "60 56 53 190" + "TFTanBright" "236 227 203 150" + "TFTanLight" "201 188 162 150" + "TFTanMedium" "131 121 104 150" + "TFTanLightBright" "229 223 211 90" + "TFTanLightDark" "96 90 78 90" + "TFOrangeBright" "156 82 33 255" + "TFTextBright" "251 236 203 150" + "TFTextLight" "201 188 162 255" + "TFTextMedium" "131 121 104 255" + "TFTextMediumDark" "104 96 83 255" + "TFTextBlack" "42 39 37 255" + "TFTextDull" "131 121 104 255" + "TFMediumBrown" "69 64 58 255" + "QuickListBGDeselected" "69 64 58 255" + "QuickListBGSelected" "131 121 104 150" "Blank" "0 0 0 0" "White" "255 255 255 255" "ControlBG" "76 88 68 255" @@ -30,8 +33,13 @@ Scheme "Green" "63 185 73 255" } + ///////////////////// BASE SETTINGS //////////////////////// + // + // default settings for all panels + // controls use these to determine their settings BaseSettings { + // vgui_controls color specifications Border.Bright "TFTanLightDark" Border.Dark "TFTanLightDark" Border.Selection "BorderSelection" @@ -128,8 +136,8 @@ Scheme ScrollBarButton.ArmedBgColor "Blank" ScrollBarButton.DepressedFgColor "Blank" ScrollBarButton.DepressedBgColor "Blank" - ScrollBarSlider.BgColor "Blank" ScrollBarSlider.FgColor "Blank" + ScrollBarSlider.BgColor "Blank" SectionedListPanel.HeaderTextColor "White" SectionedListPanel.HeaderBgColor "Blank" @@ -167,6 +175,7 @@ Scheme WizardSubPanel.BgColor "Blank" + // scheme-specific colors MainMenu.TextColor "White" MainMenu.ArmedTextColor "200 200 200 255" MainMenu.DepressedTextColor "192 186 80 255" @@ -187,11 +196,18 @@ Scheme TFColors.ChatTextTeamRed "255 63 53 255" } + //////////////////////// BITMAP FONT FILES ///////////////////////////// + // + // Bitmap Fonts are ****VERY*** expensive static memory resources so they are purposely sparse BitmapFontFiles { + // UI buttons, custom font, (256x64) "Buttons" "materials/vgui/fonts/buttons_32.vbf" } + //////////////////////// FONTS ///////////////////////////// + // + // describes all the fonts Fonts { "Default" @@ -241,6 +257,7 @@ Scheme } } + // this is the symbol font "Marlett" { "1" @@ -421,6 +438,10 @@ Scheme } } + // + //////////////////// BORDERS ////////////////////////////// + // + // describes all the border types Borders { BaseBorder DepressedBorder @@ -693,6 +714,7 @@ Scheme } } + // this is the border used for default buttons (the button that gets pressed when you hit enter) ButtonKeyFocusBorder { "inset" "0 0 1 1" @@ -788,6 +810,10 @@ Scheme } } + //////////////////////// CUSTOM FONT FILES ///////////////////////////// + // + // specifies all the custom (non-system) font files that need to be loaded to service the above described fonts + CustomFontFiles { "1" "resource/HALFLIFE2.ttf" diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res index e9c6cf5..361a539 100644 --- a/resource/scheme/clientscheme_fonts.res +++ b/resource/scheme/clientscheme_fonts.res @@ -339,7 +339,7 @@ Scheme } "2" { - "name" "Cerbetica_bold" + "name" "Cerbetica_edited" "tall" "12" "range" "0x0000 0x00FF" "weight" "800" @@ -727,7 +727,7 @@ Scheme { "1" { - "name" "Cerbetica Bold" + "name" "Cerbetica_edited" "tall" "24" "weight" "500" "additive" "0" @@ -839,7 +839,7 @@ Scheme { "1" { - "name" "Cerbetica Bold" + "name" "Cerbetica_edited" "tall" "12" "weight" "500" "additive" "0" @@ -1374,7 +1374,7 @@ Scheme "1" { "name" "Cerbetica_edited" - "tall" "9" + "tall" "10" "weight" "400" "additive" "0" "antialias" "1" @@ -1527,7 +1527,7 @@ Scheme { "1" { - "name" "Cerbetica Bold" + "name" "Cerbetica_edited" "tall" "36" "weight" "500" "range" "0x0000 0x007F" @@ -1851,7 +1851,7 @@ Scheme { "1" { - "name" "Cerbetica Bold" + "name" "Cerbetica_edited" "tall" "22" "weight" "900" } @@ -1860,7 +1860,7 @@ Scheme { "1" { - "name" "Cerbetica Bold" + "name" "Cerbetica_edited" "tall" "18" "weight" "900" } @@ -1951,7 +1951,7 @@ Scheme { "1" { - "name" "Cerbetica Bold" + "name" "Cerbetica_edited" "tall" "14" "weight" "900" "antialias" "1" @@ -2030,7 +2030,7 @@ Scheme "1" { "name" "Cerbetica_edited" - "tall" "8" + "tall" "10" "weight" "500" "additive" "0" "antialias" "1" @@ -2041,7 +2041,7 @@ Scheme "1" { "name" "Cerbetica_edited" - "tall" "10" + "tall" "12" "weight" "500" "additive" "0" "antialias" "1" @@ -2052,7 +2052,7 @@ Scheme "1" { "name" "Cerbetica_edited" - "tall" "12" + "tall" "14" "weight" "500" "additive" "0" "antialias" "1" @@ -2631,7 +2631,7 @@ Scheme { "1" { - "name" "Cerbetica Bold" + "name" "Cerbetica_edited" "tall" "14" "weight" "500" "additive" "0" @@ -2642,7 +2642,7 @@ Scheme { "1" { - "name" "Cerbetica Bold" + "name" "Cerbetica_edited" "tall" "24" "weight" "500" "additive" "0" @@ -2776,6 +2776,12 @@ Scheme "Buttons" "materials/vgui/fonts/buttons_32.vbf" } + //////////////////////// CUSTOM FONT FILES ///////////////////////////// + // + // specifies all the custom (non-system) font files that need to be loaded to service the above described fonts + // Range specificies the characters to be used from the custom font before falling back to a default font + // characters in the range not specificed in the font will appear empty + // For TF2: Any special character will need to be added to our font file CustomFontFiles { "1" "resource/tf.ttf" diff --git a/resource/scheme/clientscheme_settings.res b/resource/scheme/clientscheme_settings.res index 1f70bf4..66421f8 100644 --- a/resource/scheme/clientscheme_settings.res +++ b/resource/scheme/clientscheme_settings.res @@ -1,5 +1,8 @@ Scheme { + ///////////////////// BASE SETTINGS //////////////////////// + // default settings for all panels + // controls use these to determine their settings BaseSettings { // vgui_controls color specifications diff --git a/resource/sourcescheme.res b/resource/sourcescheme.res index aed9b7a..4e471b9 100644 --- a/resource/sourcescheme.res +++ b/resource/sourcescheme.res @@ -2,6 +2,9 @@ Scheme { + //////////////////////// COLORS /////////////////////////// + // color details + // this is a list of all the colors used by the scheme Colors { // HUD COLORS @@ -125,7 +128,7 @@ Scheme Menu.BgColor "HudBlack" Menu.ArmedFgColor "Black" Menu.ArmedBgColor "White" -` Menu.DividerColor "Border.Dark" + Menu.DividerColor "Border.Dark" ScrollBarButton.FgColor "White" ScrollBarButton.BgColor "Black" diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res index ae54bc7..804fc26 100644 --- a/resource/ui/charinfopanel.res +++ b/resource/ui/charinfopanel.res @@ -133,8 +133,9 @@ "tabskv" { "textinsetx" "25" - "textAlignment" "center" - "font" "Cerbetica18" + "textinsety" "5" + "textAlignment" "north" + "font" "HudFontSmall" "selectedcolor" "TanLight" "unselectedcolor" "TanDark" "defaultBgColor_override" "DarkGrey" diff --git a/resource/ui/controlpointicon.res b/resource/ui/controlpointicon.res index ef975a3..30bb3d3 100644 --- a/resource/ui/controlpointicon.res +++ b/resource/ui/controlpointicon.res @@ -92,7 +92,7 @@ "dulltext" "0" "brighttext" "0" "wrap" "0" - "font" "Cerbetica16" + "font" "HudFontSmallishBold" } "CPTimerBG" diff --git a/resource/ui/controlpointprogressbar.res b/resource/ui/controlpointprogressbar.res index e3bba2b..ebe6289 100644 --- a/resource/ui/controlpointprogressbar.res +++ b/resource/ui/controlpointprogressbar.res @@ -9,8 +9,6 @@ "zpos" "20" "wide" "100" "tall" "65" - "wide_minmode" "65" - "tall_minmode" "42" "visible" "0" "enabled" "1" } diff --git a/resource/ui/craftingstatusdialog.res b/resource/ui/craftingstatusdialog.res index d6268af..7cbef76 100644 --- a/resource/ui/craftingstatusdialog.res +++ b/resource/ui/craftingstatusdialog.res @@ -9,10 +9,10 @@ "ypos" "200" "wide" "200" "tall" "110" - "bgcolor_override" "DarkerGrey" + "bgcolor_override" "DarkGrey" "paintbackgroundtype" "0" "settitlebarvisible" "0" - "border" "CyanBorderThick" + "border" "CyanBorder" } "CenterPositioner" @@ -74,7 +74,7 @@ { "ControlName" "Label" "fieldName" "EllipsesLabel" - "font" "HudFontSmallBold" + "font" "HudFontSmall" "xpos" "0" "ypos" "0" "zpos" "0" @@ -109,7 +109,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#GameUI_Ok" - "font" "HudFontSmallBold" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" diff --git a/resource/ui/disguise_menu/heavy_red.res b/resource/ui/disguise_menu/heavy_red.res index 17198ba..ba6513d 100644 --- a/resource/ui/disguise_menu/heavy_red.res +++ b/resource/ui/disguise_menu/heavy_red.res @@ -4,7 +4,7 @@ { "ControlName" "CExLabel" "fieldName" "ItemName" - "font" "HudFontSmall" + "font" "HudFontSmallest" "xpos" "20" "ypos" "0" "zpos" "1" @@ -56,7 +56,7 @@ { "ControlName" "CExLabel" "fieldName" "NumberLabel" - "font" "HudFontSmall" + "font" "HudFontSmallest" "fgcolor" "HUDRedTeamSolid" "xpos" "5" "ypos" "3" @@ -77,7 +77,7 @@ { "ControlName" "CExLabel" "fieldName" "NumberLabel" - "font" "HudFontSmall" + "font" "HudFontSmallest" "fgcolor" "HUDRedTeamSolid" "xpos" "5" "ypos" "3" diff --git a/resource/ui/disguisestatuspanel.res b/resource/ui/disguisestatuspanel.res index 2aa04d2..dd185c2 100644 --- a/resource/ui/disguisestatuspanel.res +++ b/resource/ui/disguisestatuspanel.res @@ -73,7 +73,7 @@ "xpos" "35" "ypos" "0" "zpos" "1" - "wide" "120" + "wide" "115" "tall" "15" "autoResize" "0" "pinCorner" "0" @@ -93,7 +93,7 @@ "xpos" "-1" "ypos" "-1" "zpos" "1" - "wide" "120" + "wide" "115" "tall" "15" "autoResize" "0" "pinCorner" "0" @@ -118,7 +118,7 @@ "xpos" "35" "ypos" "15" "zpos" "1" - "wide" "120" + "wide" "115" "tall" "15" "autoResize" "0" "pinCorner" "0" @@ -138,7 +138,7 @@ "xpos" "-1" "ypos" "-1" "zpos" "1" - "wide" "120" + "wide" "115" "tall" "15" "autoResize" "0" "pinCorner" "0" diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res index 386f5f0..67398f6 100644 --- a/resource/ui/econ/backpackpanel.res +++ b/resource/ui/econ/backpackpanel.res @@ -245,8 +245,8 @@ "labelText" "#ShowBaseItemsCheckBox" "font" "HudFontSmallestBold" "textAlignment" "east" - "xpos" "c-165" - "ypos" "36" + "xpos" "c-60" + "ypos" "15" "zpos" "1" "wide" "120" "tall" "20" diff --git a/resource/ui/econ/comboboxbackpackoverlaydialog.res b/resource/ui/econ/comboboxbackpackoverlaydialog.res index b0932ca..0771a93 100644 --- a/resource/ui/econ/comboboxbackpackoverlaydialog.res +++ b/resource/ui/econ/comboboxbackpackoverlaydialog.res @@ -19,7 +19,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica22" + "font" "HudFontMediumBold" "labelText" "#TF_Item_SelectStyle" "textAlignment" "center" "xpos" "0" diff --git a/resource/ui/econ/confirmapplygiftwrapdialog.res b/resource/ui/econ/confirmapplygiftwrapdialog.res index 4d2a5d8..ea7e427 100644 --- a/resource/ui/econ/confirmapplygiftwrapdialog.res +++ b/resource/ui/econ/confirmapplygiftwrapdialog.res @@ -58,7 +58,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica22" + "font" "HudFontMediumBold" "labelText" "dynamic" "textAlignment" "center" "xpos" "100" @@ -219,7 +219,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" @@ -244,7 +244,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" diff --git a/resource/ui/econ/confirmapplypaintcandialog.res b/resource/ui/econ/confirmapplypaintcandialog.res index b162d70..20a49e1 100644 --- a/resource/ui/econ/confirmapplypaintcandialog.res +++ b/resource/ui/econ/confirmapplypaintcandialog.res @@ -58,7 +58,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica22" + "font" "HudFontMediumBold" "labelText" "dynamic" "textAlignment" "center" "xpos" "100" @@ -246,7 +246,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" @@ -271,7 +271,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" diff --git a/resource/ui/econ/confirmapplystrangepartapplicationdialog.res b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res index db74b25..92d0343 100644 --- a/resource/ui/econ/confirmapplystrangepartapplicationdialog.res +++ b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res @@ -17,16 +17,16 @@ "mouseoveritempanel" { - "ControlName" "CItemModelPanel" - "fieldName" "mouseoveritempanel" - "xpos" "c-70" - "ypos" "270" - "zpos" "100" - "wide" "300" - "tall" "300" - "visible" "0" - "bgcolor_override" "Transparent" - "noitem_textcolor" "TextColor" + "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" @@ -58,7 +58,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica22" + "font" "HudFontMediumBold" "labelText" "dynamic" "textAlignment" "center" "xpos" "100" @@ -159,7 +159,7 @@ "model_ypos" "5" "model_wide" "80" "model_tall" "54" - "text_ypos" "100" // Hide it off the bottom + "text_ypos" "100" "text_center" "1" "name_only" "1" @@ -167,6 +167,7 @@ { "use_item_rendertarget" "0" "allow_rot" "0" + "inventory_image_type" "1" } } @@ -197,7 +198,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" @@ -222,7 +223,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" diff --git a/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res b/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res new file mode 100644 index 0000000..16edfa4 --- /dev/null +++ b/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res @@ -0,0 +1,243 @@ +"Resource/UI/ConfirmApplyStrangeRestrictionApplicationDialog.res" +{ + "ConfirmApplyStrangeRestrictionApplicationDialog" + { + "fieldName" "ConfirmApplyStrangeRestrictionApplicationDialog" + "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_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_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" "#ToolStrangeRestrictionApplyConfirm" + "textAlignment" "center" + "xpos" "20" + "ypos" "80" + "zpos" "0" + "wide" "360" + "tall" "100" + "autoResize" "1" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fgcolor_override" "Yellow" + } + + "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/confirmapplystrangifierdialog.res b/resource/ui/econ/confirmapplystrangifierdialog.res index f217734..b31c461 100644 --- a/resource/ui/econ/confirmapplystrangifierdialog.res +++ b/resource/ui/econ/confirmapplystrangifierdialog.res @@ -17,16 +17,16 @@ "mouseoveritempanel" { - "ControlName" "CItemModelPanel" - "fieldName" "mouseoveritempanel" - "xpos" "c-70" - "ypos" "270" - "zpos" "100" - "wide" "300" - "tall" "300" - "visible" "0" - "bgcolor_override" "Transparent" - "noitem_textcolor" "TextColor" + "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" @@ -58,7 +58,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica22" + "font" "HudFontMediumBold" "labelText" "dynamic" "textAlignment" "center" "xpos" "100" @@ -110,7 +110,7 @@ "model_ypos" "5" "model_wide" "80" "model_tall" "54" - "text_ypos" "100" // Hide it off the bottom + "text_ypos" "100" "text_center" "1" "name_only" "1" "paint_icon_hide" "1" @@ -141,6 +141,7 @@ "paintbackground" "0" "border" "BackpackItemBorder_Vintage" } + "subject_modelpanel" { "ControlName" "CItemModelPanel" @@ -159,7 +160,7 @@ "model_ypos" "5" "model_wide" "80" "model_tall" "54" - "text_ypos" "100" // Hide it off the bottom + "text_ypos" "100" "text_center" "1" "name_only" "1" @@ -167,6 +168,7 @@ { "use_item_rendertarget" "0" "allow_rot" "0" + "inventory_image_type" "1" } } @@ -198,7 +200,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" @@ -223,7 +225,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" diff --git a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res index cac4cf7..a088d91 100644 --- a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res +++ b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res @@ -17,16 +17,16 @@ "mouseoveritempanel" { - "ControlName" "CItemModelPanel" - "fieldName" "mouseoveritempanel" - "xpos" "c-70" - "ypos" "270" - "zpos" "100" - "wide" "300" - "tall" "300" - "visible" "0" - "bgcolor_override" "Transparent" - "noitem_textcolor" "TextColor" + "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" @@ -58,7 +58,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica26" + "font" "HudFontMediumBold" "labelText" "dynamic" "textAlignment" "center" "xpos" "100" @@ -266,7 +266,7 @@ "pinCorner" "0" "visible" "0" "enabled" "1" - "fgcolor_override" "ColorCyan" + "fgcolor_override" "Yellow" } "CancelButton" @@ -277,7 +277,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" @@ -302,7 +302,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" diff --git a/resource/ui/econ/confirmcustomizetexturedialog.res b/resource/ui/econ/confirmcustomizetexturedialog.res new file mode 100644 index 0000000..b5e3696 --- /dev/null +++ b/resource/ui/econ/confirmcustomizetexturedialog.res @@ -0,0 +1,949 @@ +"Resource/UI/econ/ConfirmCustomizeTextureDialog.res" +{ + "ConfirmCustomizeTextureDialog" + { + "fieldName" "ConfirmCustomizeTextureDialog" + "visible" "1" + "enabled" "1" + "xpos" "c-280" + "ypos" "c-225" + "wide" "560" + "tall" "345" + "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" + "labelText" "%attriblist%" + "textAlignment" "center" + "fgcolor" "TextColor" + "centerwrap" "1" + } + } + + "ToolBG" + { + "ControlName" "CExLabel" + "fieldName" "ToolBG" + "font" "HudFontSmallBold" + "labelText" "" + "textAlignment" "east" + "xpos" "10" + "ypos" "10" + "zpos" "-1" + "wide" "84" + "tall" "64" + "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" + } + } + + "TitleLabel" + { + "ControlName" "CExLabel" + "fieldName" "TitleLabel" + "font" "HudFontMediumBold" + "labelText" "dynamic" + "textAlignment" "center" + "xpos" "100" + "ypos" "10" + "zpos" "0" + "wide" "365" + "tall" "60" + "centerwrap" "1" + } + + "SubjectBG" + { + "ControlName" "CExLabel" + "fieldName" "SubjectBG" + "font" "HudFontSmallBold" + "labelText" "" + "textAlignment" "east" + "xpos" "465" + "ypos" "10" + "zpos" "-1" + "wide" "84" + "tall" "64" + "paintbackground" "0" + "border" "BackpackItemBorder_3" + } + "subject_icon" + { + "ControlName" "ScalableImagePanel" + "fieldName" "subject_icon" + "xpos" "465" + "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" "465" + "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" + } + } + + // Dynamically sized and moded based on the current page + "paint_model" + { + "ControlName" "CItemModelPanel" + "fieldName" "paint_model" + "xpos" "275" + "ypos" "20" + "zpos" "100" + "wide" "160" + "tall" "160" + "visible" "1" + "bgcolor_override" "0 0 0 0" + "noitem_textcolor" "117 107 94 255" + //"PaintBackgroundType" "2" + "paintborder" "0" + "model_xpos" "00" + "model_ypos" "00" + "model_wide" "160" + "model_tall" "160" + //"text_ypos" "1" + //"text_center" "1" + //"name_only" "1" + "model_only" "1" + "paint_icon_hide" "1" + "itemmodelpanel" + { + "force_use_model" "1" + "use_item_rendertarget" "0" + "allow_rot" "1" + } + } + + // ---------------------------- + "SelectImagePage" + { + "ControlName" "EditablePanel" + "fieldName" "SelectImagePage" + "xpos" "10" + "ypos" "80" + "wide" "540" + "tall" "260" + "visible" "1" + "enabled" "1" + + "PageTitleLabel" + { + "ControlName" "CExLabel" + "fieldName" "PageTitleLabel" + "font" "HudFontMediumSmall" + "labelText" "#ToolCustomizeTextureStep1" + "textAlignment" "north-west" + "xpos" "0" + "ypos" "0" + "zpos" "0" + "wide" "540" + "tall" "20" + } + + "ImagePaletteGroupBox" + { + "ControlName" "EditablePanel" + "fieldName" "ImagePaletteGroupBox" + "xpos" "0" + "ypos" "25" + "zpos" "-1" + "wide" "350" + "tall" "200" + "border" "GrayDialogBorder" + "bgcolor_override" "DarkGrey" + + "UseAvatarRadio" + { + "ControlName" "RadioButton" + "fieldName" "UseAvatarRadio" + "xpos" "10" + "ypos" "10" + "wide" "330" + "tall" "20" + "labelText" "#ToolCustomizeTextureUseAvatarImage" + "textAlignment" "west" + "font" "HudFontSmallBold" + } + + "UseAnyImageRadio" + { + "ControlName" "RadioButton" + "fieldName" "UseAnyImageRadio" + "xpos" "10" + "ypos" "80" + "wide" "330" + "tall" "20" + "labelText" "#ToolCustomizeTextureUseAnyImage" + "textAlignment" "west" + "font" "HudFontSmallBold" + } + + "BrowseForNewImageButton" + { + "ControlName" "CExButton" + "fieldName" "BrowseForNewImageButton" + "xpos" "40" + "ypos" "110" + "zpos" "1" + "wide" "300" + "tall" "20" + "labelText" "#ToolCustomizeTextureBrowseButton" + "font" "HudFontSmallBold" + "Command" "pick_image" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + + "ForBestResultsLabel" + { + "ControlName" "CExLabel" + "fieldName" "ForBestResultsLabel" + "font" "HudFontSmall" + "xpos" "40" + "ypos" "140" + "wide" "300" + "tall" "40" + "labelText" "#ToolCustomizeTextureBestResults" + "textAlignment" "north-west" + "wrap" "1" + } + } + + "PreviewImageGroupBox" + { + "ControlName" "EditablePanel" + "fieldName" "PreviewImageGroupBox" + "xpos" "360" + "ypos" "25" + "zpos" "-1" + "wide" "180" + "tall" "200" + "border" "GrayDialogBorder" + "bgcolor_override" "DarkGrey" + + "PreviewCroppedImage" + { + "ControlName" "CRGBAImagePanel" + "fieldName" "PreviewCroppedImage" + "xpos" "20" + "ypos" "20" + "zpos" "-1" + "wide" "140" + "tall" "140" + } + + "SquarizeComboBox" + { + "ControlName" "ComboBox" + "fieldName" "SquarizeComboBox" + "xpos" "20" + "ypos" "170" + "zpos" "-1" + "wide" "140" + "tall" "15" + "editable" "0" + "font" "HudFontSmall" + + //"fgcolor_override" "235 226 202 255" + "bgcolor_override" "0 0 0 255" + //"disabledFgColor_override" "235 226 202 255" + "disabledBgColor_override" "0 0 0 255" + "selectionColor_override" "0 0 0 255" + "selectionTextColor_override" "235 226 202 255" + "defaultSelectionBG2Color_override" "0 0 0 0" + } + } + + "CancelButton" + { + "ControlName" "CExButton" + "fieldName" "CancelButton" + "xpos" "00" + "ypos" "230" + "zpos" "1" + "wide" "130" + "tall" "25" + "labelText" "#Cancel" + "font" "HudFontSmall" + "textAlignment" "center" + "Command" "cancel" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + + "NextButton" + { + "ControlName" "CExButton" + "fieldName" "NextButton" + "xpos" "410" + "ypos" "230" + "zpos" "1" + "wide" "130" + "tall" "25" + "labelText" "#TF_NextCarat" + "font" "HudFontSmall" + "textAlignment" "center" + "Command" "next_page" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + } + + // ---------------------------- + "AdjustFilterPage" + { + "ControlName" "EditablePanel" + "fieldName" "AdjustFilterPage" + "xpos" "10" + "ypos" "80" + "wide" "540" + "tall" "260" + "visible" "1" + "enabled" "1" + + "PageTitleLabel" + { + "ControlName" "CExLabel" + "fieldName" "PageTitleLabel" + "font" "HudFontMediumSmall" + "labelText" "#ToolCustomizeTextureStep2" + "textAlignment" "north-west" + "xpos" "0" + "ypos" "0" + "zpos" "0" + "wide" "540" + "tall" "20" + } + + "FilterOptionsGroupBox" + { + "ControlName" "EditablePanel" + "fieldName" "SelectFilterGroupBox" + "Font" "HudFontSmallestBold" + "xpos" "0" + "ypos" "25" + "zpos" "-1" + "wide" "160" + "tall" "200" + "border" "GrayDialogBorder" + "bgcolor_override" "DarkGrey" + + "FilterLabel" + { + "ControlName" "CExLabel" + "fieldName" "FilterLabel" + "font" "HudFontSmallBold" + "xpos" "10" + "ypos" "10" + "wide" "140" + "tall" "20" + "labelText" "Filter:" // !FIXME! Localize + "textAlignment" "north-west" + "visible" "0" + } + + "FilterComboBox" + { + "ControlName" "ComboBox" + "fieldName" "FilterComboBox" + "xpos" "10" + "ypos" "30" + "zpos" "-1" + "wide" "140" + "tall" "15" + "editable" "0" + "font" "HudFontSmall" + "visible" "0" + + //"fgcolor_override" "235 226 202 255" + "bgcolor_override" "0 0 0 255" + //"disabledFgColor_override" "235 226 202 255" + "disabledBgColor_override" "0 0 0 255" + "selectionColor_override" "0 0 0 255" + "selectionTextColor_override" "235 226 202 255" + "defaultSelectionBG2Color_override" "0 0 0 0" + } + + "PainterlyOptions" + { + "ControlName" "EditablePanel" + "fieldName" "PainterlyOptions" + "xpos" "10" + "ypos" "50" + "zpos" "-1" + "wide" "140" + "tall" "150" + + "FilterDescriptionLabel" + { + "ControlName" "CExLabel" + "fieldName" "FilterDescriptionLabel" + "xpos" "0" + "ypos" "0" + "wide" "140" + "tall" "80" + "labelText" "#ToolCustomizeTexturePainterlyDescription" + "textAlignment" "north-west" + "font" "HudFontSmall" + "wrap" "1" + } + } + + "StencilOptions" + { + "ControlName" "EditablePanel" + "fieldName" "StencilOptions" + "xpos" "10" + "ypos" "50" + "zpos" "-1" + "wide" "140" + "tall" "150" + + "FilterDescriptionLabel" + { + "ControlName" "CExLabel" + "fieldName" "FilterDescriptionLabel" + "xpos" "0" + "ypos" "0" + "wide" "120" + "tall" "60" + "labelText" "#ToolCustomizeTextureStencilDescription" + "textAlignment" "north-west" + "font" "HudFontSmall" + "wrap" "1" + "visible" "0" + } + + "ColorPaletteLabel" + { + "ControlName" "CExLabel" + "fieldName" "ColorPaletteLabel" + "xpos" "0" + "ypos" "60" + "wide" "140" + "tall" "15" + "labelText" "#ToolCustomizeTextureColorPalette" + "textAlignment" "north-west" + "font" "HudFontSmallBold" + } + + "PrevStencilPaletteButton" + { + "ControlName" "CExButton" + "fieldName" "PrevStencilPaletteButton" + "xpos" "0" + "ypos" "80" + "zpos" "1" + "wide" "65" + "tall" "15" + "labelText" "<<" + "font" "HudFontSmallBold" + "textAlignment" "center" + "Command" "prev_stencil_palette" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + + "NextStencilPaletteButton" + { + "ControlName" "CExButton" + "fieldName" "NextStencilPaletteButton" + "xpos" "75" + "ypos" "80" + "zpos" "1" + "wide" "65" + "tall" "15" + "labelText" ">>" + "font" "HudFontSmallBold" + "textAlignment" "center" + "Command" "next_stencil_palette" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + + "StencilGradientMap" + { + "ControlName" "CustomTextureStencilGradientMapWidget" + "fieldName" "StencilGradientMap" + "xpos" "0" + "ypos" "100" + "zpos" "1" + "wide" "140" + "tall" "20" + } + + "StencilModeComboBox" + { + "ControlName" "ComboBox" + "fieldName" "StencilModeComboBox" + "xpos" "0" + "ypos" "125" + "zpos" "-1" + "wide" "140" + "tall" "15" + "editable" "0" + "font" "HudFontSmall" + + //"fgcolor_override" "235 226 202 255" + "bgcolor_override" "0 0 0 255" + //"disabledFgColor_override" "235 226 202 255" + "disabledBgColor_override" "0 0 0 255" + "selectionColor_override" "0 0 0 255" + "selectionTextColor_override" "235 226 202 255" + "defaultSelectionBG2Color_override" "0 0 0 0" + } + } + } + + "PreviewImageGroupBox" + { + "ControlName" "EditablePanel" + "fieldName" "PreviewImageGroupBox" + "xpos" "170" + "ypos" "25" + "zpos" "-1" + "wide" "180" + "tall" "200" + "border" "GrayDialogBorder" + "bgcolor_override" "DarkGrey" + + "PreviewFilteredImage" + { + "ControlName" "CRGBAImagePanel" + "fieldName" "PreviewFilteredImage" + "xpos" "20" + "ypos" "30" + "zpos" "-1" + "wide" "140" + "tall" "140" + } + } + + "PreviewModelGroupBox" + { + "ControlName" "EditablePanel" + "fieldName" "PreviewModelGroupBox" + "xpos" "360" + "ypos" "25" + "zpos" "-1" + "wide" "180" + "tall" "200" + "border" "GrayDialogBorder" + "bgcolor_override" "DarkGrey" + + "GradientBgPanel" + { + "ControlName" "ImagePanel" + "FieldName" "GradientBgPanel" + "xpos" "10" + "ypos" "10" + "zpos" "1" + "wide" "160" + "tall" "180" + "visible" "1" + "tileImage" "0" + "scaleImage" "1" + "image" "loadout_bottom_gradient" + "border" "ButtonBorder" + "paintbackgroundtype" "2" + "paintbackground" "1" + } + + "DragToRotateLabel" + { + "ControlName" "CExLabel" + "fieldName" "DragToRotateLabel" + "font" "HudFontSmall" + "labelText" "#Store_PreviewItem" + "textAlignment" "center" + "xpos" "10" + "ypos" "170" + "zpos" "2" + "wide" "160" + "tall" "20" + "centerwrap" "1" + } + } + + "CancelButton" + { + "ControlName" "CExButton" + "fieldName" "CancelButton" + "xpos" "00" + "ypos" "230" + "zpos" "1" + "wide" "130" + "tall" "25" + "labelText" "#Cancel" + "font" "HudFontSmall" + "textAlignment" "center" + "Command" "cancel" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + + "BackButton" + { + "ControlName" "CExButton" + "fieldName" "BackButton" + "xpos" "270" + "ypos" "230" + "zpos" "1" + "wide" "130" + "tall" "25" + "labelText" "#TF_BackCarat" + "font" "HudFontSmall" + "textAlignment" "center" + "Command" "prev_page" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + + "NextButton" + { + "ControlName" "CExButton" + "fieldName" "NextButton" + "xpos" "410" + "ypos" "230" + "zpos" "1" + "wide" "130" + "tall" "25" + "labelText" "#TF_NextCarat" + "font" "HudFontSmall" + "textAlignment" "center" + "Command" "next_page" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + } + + // ---------------------------- + "FinalConfirmPage" + { + "ControlName" "EditablePanel" + "fieldName" "FinalConfirmPage" + "xpos" "10" + "ypos" "80" + "wide" "540" + "tall" "260" + + "PageTitleLabel" + { + "ControlName" "CExLabel" + "fieldName" "PageTitleLabel" + "font" "HudFontMediumSmall" + "labelText" "#ToolCustomizeTextureStep3" + "textAlignment" "north-west" + "xpos" "0" + "ypos" "0" + "zpos" "0" + "wide" "540" + "tall" "20" + } + + "WarningTextGroupBox" + { + "ControlName" "EditablePanel" + "fieldName" "WarningTextGroupBox" + "Font" "HudFontSmallestBold" + "xpos" "0" + "ypos" "25" + "zpos" "-1" + "wide" "350" + "tall" "200" + "border" "GrayDialogBorder" + "bgcolor_override" "DarkGrey" + + "WarningText" + { + "ControlName" "CExLabel" + "fieldName" "WarningText" + "font" "HudFontSmall" + "xpos" "10" + "ypos" "10" + "wide" "330" + "tall" "180" + "labelText" "#ToolCustomizeTextureConfirmWarning" + "textAlignment" "west" + "wrap" "1" + } + } + + "PreviewModelGroupBox" + { + "ControlName" "EditablePanel" + "fieldName" "PreviewModelGroupBox" + "xpos" "360" + "ypos" "25" + "zpos" "-1" + "wide" "180" + "tall" "200" + "border" "GrayDialogBorder" + "bgcolor_override" "DarkGrey" + + "GradientBgPanel" + { + "ControlName" "ImagePanel" + "FieldName" "GradientBgPanel" + "xpos" "10" + "ypos" "10" + "zpos" "1" + "wide" "160" + "tall" "180" + "visible" "1" + "tileImage" "0" + "scaleImage" "1" + "image" "loadout_bottom_gradient" + "border" "ButtonBorder" + "paintbackgroundtype" "2" + "paintbackground" "1" + } + + "DragToRotateLabel" + { + "ControlName" "CExLabel" + "fieldName" "DragToRotateLabel" + "font" "HudFontSmall" + "labelText" "#ToolCustomizeTextureDragToRotate" + "textAlignment" "center" + "xpos" "10" + "ypos" "170" + "zpos" "2" + "wide" "160" + "tall" "20" + "centerwrap" "1" + } + } + + "CancelButton" + { + "ControlName" "CExButton" + "fieldName" "CancelButton" + "xpos" "00" + "ypos" "230" + "zpos" "1" + "wide" "130" + "tall" "25" + "labelText" "#Cancel" + "font" "HudFontSmall" + "textAlignment" "center" + "default" "0" + "Command" "cancel" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + + "BackButton" + { + "ControlName" "CExButton" + "fieldName" "BackButton" + "xpos" "270" + "ypos" "230" + "zpos" "1" + "wide" "130" + "tall" "25" + "labelText" "#TF_BackCarat" + "font" "HudFontSmall" + "textAlignment" "center" + "Command" "prev_page" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + + "OkButton" + { + "ControlName" "CExButton" + "fieldName" "OkButton" + "xpos" "410" + "ypos" "230" + "zpos" "1" + "wide" "130" + "tall" "25" + "labelText" "#ToolCustomizeTextureOKButton" + "font" "HudFontSmall" + "textAlignment" "center" + "default" "1" + "Command" "apply" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + } + + // ---------------------------- + "PerformingActionPage" + { + "ControlName" "EditablePanel" + "fieldName" "PerformingActionPage" + "xpos" "10" + "ypos" "80" + "wide" "540" + "tall" "260" + + "PleaseWaitLabel" + { + "ControlName" "CExLabel" + "fieldName" "PleaseWaitLabel" + "font" "HudFontSmallBold" + "labelText" "#ToolCustomizeTexturePleaseWait" + "textAlignment" "center" + "xpos" "20" + "ypos" "25" + "zpos" "0" + "wide" "340" + "tall" "200" + "centerwrap" "1" + } + + "PreviewModelGroupBox" + { + "ControlName" "EditablePanel" + "fieldName" "PreviewModelGroupBox" + "xpos" "360" + "ypos" "25" + "zpos" "-1" + "wide" "180" + "tall" "200" + "border" "GrayDialogBorder" + "bgcolor_override" "DarkGrey" + + "GradientBgPanel" + { + "ControlName" "ImagePanel" + "FieldName" "GradientBgPanel" + "xpos" "10" + "ypos" "10" + "zpos" "1" + "wide" "160" + "tall" "180" + "visible" "1" + "tileImage" "0" + "scaleImage" "1" + "image" "loadout_bottom_gradient" + "border" "ButtonBorder" + "paintbackgroundtype" "2" + "paintbackground" "1" + } + + "DragToRotateLabel" + { + "ControlName" "CExLabel" + "fieldName" "DragToRotateLabel" + "font" "HudFontSmall" + "labelText" "#ToolCustomizeTextureDragToRotate" + "textAlignment" "center" + "xpos" "10" + "ypos" "170" + "zpos" "2" + "wide" "160" + "tall" "20" + "centerwrap" "1" + } + } + } +}
\ No newline at end of file diff --git a/resource/ui/econ/confirmdialog.res b/resource/ui/econ/confirmdialog.res index 1ebb33f..d473802 100644 --- a/resource/ui/econ/confirmdialog.res +++ b/resource/ui/econ/confirmdialog.res @@ -25,7 +25,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica32" + "font" "HudFontMediumBold" "labelText" "#ConfirmTitle" "textAlignment" "center" "xpos" "0" diff --git a/resource/ui/econ/confirmdialogabandonnopenalty.res b/resource/ui/econ/confirmdialogabandonnopenalty.res index 6c66fb1..b80230a 100644 --- a/resource/ui/econ/confirmdialogabandonnopenalty.res +++ b/resource/ui/econ/confirmdialogabandonnopenalty.res @@ -24,7 +24,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica32" + "font" "HudFontMediumBold" "labelText" "#ConfirmTitle" "textAlignment" "north" "xpos" "0" diff --git a/resource/ui/econ/confirmdialogabandonpenalty.res b/resource/ui/econ/confirmdialogabandonpenalty.res index f6aee8c..44cd4a1 100644 --- a/resource/ui/econ/confirmdialogabandonpenalty.res +++ b/resource/ui/econ/confirmdialogabandonpenalty.res @@ -24,7 +24,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica32" + "font" "HudFontMediumBold" "labelText" "#ConfirmTitle" "textAlignment" "north" "xpos" "0" @@ -77,11 +77,11 @@ { "ControlName" "CExButton" "fieldName" "CancelButton" - "xpos" "165" + "xpos" "190" "ypos" "165" "zpos" "20" - "wide" "125" - "tall" "25" + "wide" "100" + "tall" "20" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -105,8 +105,8 @@ "xpos" "10" "ypos" "165" "zpos" "20" - "wide" "125" - "tall" "25" + "wide" "175" + "tall" "20" "default" "1" "autoResize" "0" "pinCorner" "0" diff --git a/resource/ui/econ/confirmdialogabandonsafe.res b/resource/ui/econ/confirmdialogabandonsafe.res index 97269a7..268860b 100644 --- a/resource/ui/econ/confirmdialogabandonsafe.res +++ b/resource/ui/econ/confirmdialogabandonsafe.res @@ -24,7 +24,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica32" + "font" "HudFontMediumBold" "labelText" "#ConfirmTitle" "textAlignment" "north" "xpos" "0" @@ -63,11 +63,11 @@ { "ControlName" "CExButton" "fieldName" "CancelButton" - "xpos" "165" + "xpos" "190" "ypos" "165" "zpos" "20" - "wide" "125" - "tall" "25" + "wide" "100" + "tall" "20" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -91,8 +91,8 @@ "xpos" "10" "ypos" "165" "zpos" "20" - "wide" "125" - "tall" "25" + "wide" "175" + "tall" "20" "default" "1" "autoResize" "0" "pinCorner" "0" diff --git a/resource/ui/econ/genericwaitingdialog.res b/resource/ui/econ/genericwaitingdialog.res new file mode 100644 index 0000000..b09ec91 --- /dev/null +++ b/resource/ui/econ/genericwaitingdialog.res @@ -0,0 +1,104 @@ +"Resource/UI/GenericWaitingDialog.res" +{ + "GenericWaitingDialog" + { + "fieldName" "GenericWaitingDialog" + "visible" "1" + "enabled" "1" + "xpos" "c-100" + "ypos" "200" + "wide" "200" + "tall" "105" + "bgcolor_override" "DarkGrey" + "paintbackgroundtype" "1" + "settitlebarvisible" "0" + "border" "NoBorder" + } + + "TitleLabel" + { + "ControlName" "Label" + "fieldName" "TitleLabel" + "font" "HudFontMediumSmall" + "xpos" "0" + "ypos" "8" + "zpos" "0" + "wide" "200" + "tall" "42" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "wrap" "0" + "centerwrap" "1" + "labelText" "%updatetext%" + "textAlignment" "center" + "fgcolor_override" "255 255 255 255" + "bgcolor_override" "Transparent" + } + + "EllipsesLabel" + { + "ControlName" "Label" + "fieldName" "EllipsesLabel" + "font" "HudFontSmallest" + "xpos" "0" + "ypos" "42" + "zpos" "0" + "wide" "200" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "labelText" "%ellipses%" + "textAlignment" "north" + "fgcolor_override" "255 255 255 255" + "bgcolor_override" "Transparent" + } + + "DurationLabel" + { + "ControlName" "Label" + "fieldName" "DurationLabel" + "font" "HudFontSmallest" + "xpos" "0" + "ypos" "52" + "zpos" "0" + "wide" "200" + "tall" "60" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "labelText" "%duration%" + "textAlignment" "north" + "fgcolor_override" "255 255 255 255" + "bgcolor_override" "Transparent" + } + + "CloseButton" + { + "ControlName" "CExImageButton" + "fieldName" "CloseButton" + "xpos" "50" + "ypos" "70" + "zpos" "1" + "wide" "100" + "tall" "25" + "autoResize" "0" + "pinCorner" "3" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "#Cancel" + "font" "HudFontSmallest" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "1" + "Command" "user_close" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } +}
\ No newline at end of file diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res index 0569e6a..dc4a79f 100644 --- a/resource/ui/econ/inspectionpanel.res +++ b/resource/ui/econ/inspectionpanel.res @@ -255,7 +255,7 @@ "enabled" "1" "tabPosition" "0" "labeltext" "" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -500,7 +500,7 @@ { "ControlName" "Button" "fieldName" "NewSeedButton" - "font" "Cerbetica12" + "font" "HudFontSmall" "xpos" "8" "ypos" "75" @@ -598,7 +598,7 @@ "wide" "75" "tall" "20" "labelText" "#TF_ItemAd_ViewOnMarket" - "font" "Cerbetica12" + "font" "HudFontSmall" "textinsetx" "0" "textAlignment" "center" "proportionaltoparent" "1" diff --git a/resource/ui/econ/notificationtoastcontainer.res b/resource/ui/econ/notificationtoastcontainer.res index b41c85e..6f78626 100644 --- a/resource/ui/econ/notificationtoastcontainer.res +++ b/resource/ui/econ/notificationtoastcontainer.res @@ -32,7 +32,7 @@ "wrap" "1" "labelText" "" "textAlignment" "North" - "font" "ItemFontNameSmall" + "font" "TeamMenu" "textinsetx" "2" "textinsety" "7" } diff --git a/resource/ui/econ/notificationtoastcontrol.res b/resource/ui/econ/notificationtoastcontrol.res new file mode 100644 index 0000000..ad6f35d --- /dev/null +++ b/resource/ui/econ/notificationtoastcontrol.res @@ -0,0 +1,193 @@ +"Resource/UI/NotificationToastControl.res" +{ + "NotificationToastControl" + { + "ControlName" "CNotificationToastControl" + "fieldName" "NotificationToastControl" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "190" + "tall" "30" + "visible" "1" + "enabled" "1" + "border" "NoBorder" + "paintborder" "1" + "paintbackground" "1" + "PaintBackgroundType" "0" + "defaultbgcolor_override" "TanLight" + "bgcolor_override" "TanLight" + } + + "DeleteButton" + { + "ControlName" "CExImageButton" + "fieldName" "DeleteButton" + "xpos" "165" + "ypos" "5" + "zpos" "10" + "wide" "20" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "labeltext" "" + "font" "TFFontSmall" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "1" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "Command" "delete" + "armedBgColor_override" "LightRed" + + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "2" + "ypos" "2" + "zpos" "1" + "wide" "16" + "tall" "16" + "visible" "1" + "enabled" "1" + "image" "replay/thumbnails/close" + "scaleImage" "1" + } + } + + "TriggerButton" + { + "ControlName" "CExImageButton" + "fieldName" "TriggerButton" + "xpos" "144" + "if_one_button" + { + "xpos" "165" + } + "ypos" "5" + "zpos" "10" + "wide" "20" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "labeltext" "" + "font" "TFFontSmall" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "1" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "Command" "trigger" + "armedBgColor_override" "CreditsGreen" + + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "2" + "ypos" "2" + "zpos" "1" + "wide" "16" + "tall" "16" + "visible" "1" + "enabled" "1" + "image" "glyph_view" + "scaleImage" "1" + } + } + + "AcceptButton" + { + "ControlName" "CExImageButton" + "fieldName" "AcceptButton" + "xpos" "144" + "if_one_button" + { + "xpos" "165" + } + "ypos" "5" + "zpos" "10" + "wide" "20" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "labeltext" "" + "font" "TFFontSmall" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "1" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "Command" "accept" + "armedBgColor_override" "CreditsGreen" + + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "2" + "ypos" "2" + "zpos" "1" + "wide" "16" + "tall" "16" + "visible" "1" + "enabled" "1" + "image" "glyph_view" + "scaleImage" "1" + } + } + + "DeclineButton" + { + "ControlName" "CExImageButton" + "fieldName" "DeclineButton" + "xpos" "165" + "ypos" "5" + "zpos" "10" + "wide" "20" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "1" + "tabPosition" "0" + "labeltext" "" + "font" "TFFontSmall" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "1" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "Command" "decline" + "armedBgColor_override" "LightRed" + + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "2" + "ypos" "2" + "zpos" "1" + "wide" "16" + "tall" "16" + "visible" "1" + "enabled" "1" + "image" "replay/thumbnails/close" + "scaleImage" "1" + } + } +}
\ No newline at end of file diff --git a/resource/ui/econ/paintkitconsumedialog.res b/resource/ui/econ/paintkitconsumedialog.res new file mode 100644 index 0000000..f338514 --- /dev/null +++ b/resource/ui/econ/paintkitconsumedialog.res @@ -0,0 +1,295 @@ +"Resource/UI/PaintkitConsumeDialog.res" +{ + "PaintkitConsume" + { + "fieldName" "PaintkitConsume" + "xpos" "cs-0.5" + "ypos" "cs-0.5" + "wide" "400" + "tall" "400" + "visible" "1" + "zpos" "1000" + } + + "Title" + { + "ControlName" "Label" + "fieldName" "Title" + "font" "HudFontMedium" + "labelText" "#TF_UsePaintkit_Panel_Title" + "textAlignment" "north" + "xpos" "cs-0.5" + "ypos" "10" + "zpos" "10" + "wide" "f20" + "tall" "30" + "visible" "1" + "enabled" "1" + "fgcolor_override" "TanLight" + "proportionaltoparent" "1" + } + + "DescText" + { + "ControlName" "Label" + "fieldName" "DescText" + "font" "HudFontSmall" + "labelText" "#TF_UsePaintkit_Panel_Desc" + "textAlignment" "north" + "xpos" "cs-0.5" + "ypos" "r60" + "zpos" "10" + "wide" "f20" + "tall" "30" + "visible" "0" + "enabled" "0" + "fgcolor_override" "White" + "proportionaltoparent" "1" + } + + "BGPanel" + { + "fieldName" "BGPanel" + "controlname" "EditablePanel" + "xpos" "0" + "ypos" "0" + "wide" "f0" + "tall" "f0" + "proportionaltoparent" "1" + "border" "CyanBorderThick" + "bgcolor_override" "DarkGrey" + } + + "Shade" + { + "fieldName" "Shade" + "controlname" "EditablePanel" + "xpos" "0" + "ypos" "0" + "zpos" "100" + "wide" "f0" + "tall" "f0" + "visible" "0" + "proportionaltoparent" "1" + "mouseinputenabled" "1" + "bgcolor_override" "0 0 0 150" + } + + "RedeemingPanel" + { + "fieldName" "RedeemingPanel" + "controlname" "EditablePanel" + "xpos" "cs-0.5" + "ypos" "cs-0.5" + "zpos" "101" + "wide" "250" + "tall" "150" + "proportionaltoparent" "1" + "visible" "0" + "border" "CyanBorderThick" + "bgcolor_override" "DarkGrey" + + "CTFLogoPanel" + { + "fieldName" "WorkingLogo" + "controlname" "CTFLogoPanel" + "xpos" "cs-0.5" + "ypos" "cs-0.5-15" + "zpos" "1" + "wide" "100" + "tall" "o1" + "proportionaltoparent" "1" + "velocity" "200" + "radius" "30" + "fgcolor_override" "TanDark" + } + + "WorkingText" + { + "ControlName" "Label" + "fieldName" "WorkingText" + "font" "HudFontSmallBold" + "labelText" "#TF_UsePaintkit_Working" + "textAlignment" "north" + "xpos" "cs-0.5" + "ypos" "r30" + "wide" "f20" + "tall" "30" + "visible" "1" + "enabled" "1" + "fgcolor_override" "TanLight" + "proportionaltoparent" "1" + } + } + + "SuccessPanel" + { + "fieldName" "SuccessPanel" + "controlname" "EditablePanel" + "xpos" "cs-0.5" + "ypos" "cs-0.5" + "zpos" "101" + "wide" "250" + "tall" "150" + "proportionaltoparent" "1" + "visible" "0" + "border" "CyanBorderThick" + "bgcolor_override" "DarkGrey" + + "CTFLogoPanel" + { + "fieldName" "SuccessLogo" + "controlname" "CTFLogoPanel" + "xpos" "cs-0.5" + "ypos" "cs-0.5-15" + "zpos" "1" + "wide" "100" + "tall" "o1" + "proportionaltoparent" "1" + "velocity" "0" + "radius" "30" + "fgcolor_override" "CreditsGreen" + } + + "SuccessText" + { + "ControlName" "Label" + "fieldName" "SuccessText" + "font" "HudFontMediumBold" + "labelText" "#AbuseReport_SucceededTitle" + "textAlignment" "north" + "xpos" "cs-0.5" + "ypos" "r40" + "wide" "f20" + "tall" "30" + "visible" "1" + "enabled" "1" + "fgcolor_override" "CreditsGreen" + "proportionaltoparent" "1" + } + } + + "FailurePanel" + { + "fieldName" "FailurePanel" + "controlname" "EditablePanel" + "xpos" "cs-0.5" + "ypos" "cs-0.5" + "zpos" "101" + "wide" "250" + "tall" "150" + "proportionaltoparent" "1" + "visible" "0" + "border" "CyanBorderThick" + "bgcolor_override" "DarkGrey" + + "CTFLogoPanel" + { + "fieldName" "FailureLogo" + "controlname" "CTFLogoPanel" + "xpos" "cs-0.5" + "ypos" "cs-0.5-15" + "zpos" "1" + "wide" "100" + "tall" "o1" + "proportionaltoparent" "1" + "velocity" "0" + "radius" "30" + "fgcolor_override" "RedSolid" + } + + "FailureText" + { + "ControlName" "Label" + "fieldName" "FailureText" + "font" "HudFontSmallBold" + "labelText" "#TF_UsePaintkit_Failed" + "textAlignment" "north" + "xpos" "cs-0.5" + "ypos" "r40" + "wide" "f20" + "tall" "30" + "visible" "1" + "enabled" "1" + "fgcolor_override" "RedSolid" + "proportionaltoparent" "1" + "centerwrap" "1" + } + } + + "InspectionPanel" + { + "fieldName" "InspectionPanel" + "xpos" "0" + "ypos" "40" + "zpos" "10" + "wide" "f0" + "tall" "350" + "proportionaltoparent" "1" + } + + "CancelButton" + { + "ControlName" "CExButton" + "fieldName" "CancelButton" + "xpos" "rs1-50" + "ypos" "rs1-15" + "zpos" "20" + "wide" "100" + "tall" "25" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "#GameUI_CancelBold" + "font" "HudFontSmall" + "textAlignment" "center" + "textinsetx" "50" + "dulltext" "0" + "brighttext" "0" + "Command" "cancel" + "proportionaltoparent" "1" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "border_default" "Econ.Button.Border.Default" + "border_armed" "Econ.Button.Border.Armed" + "armedBgColor_override" "Econ.Button.ArmedBgColor" + "armedFgColor_override" "Econ.Button.ArmedFgColor" + "depressedBgColor_override" "Econ.Button.DepressedBgColor" + "depressedFgColor_override" "Econ.Button.DepressedFgColor" + } + + "ConfirmButton" + { + "ControlName" "CExButton" + "fieldName" "ConfirmButton" + "xpos" "50" + "ypos" "rs1-15" + "zpos" "20" + "wide" "140" + "tall" "25" + "default" "1" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "#TF_QuestView_RedeemReward" + "font" "HudFontSmall" + "textAlignment" "center" + "textinsetx" "50" + "dulltext" "0" + "brighttext" "0" + "Command" "accept" + "proportionaltoparent" "1" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "border_default" "Econ.Button.Border.Default" + "border_armed" "Econ.Button.Border.Armed" + "armedBgColor_override" "Econ.Button.ArmedBgColor" + "armedFgColor_override" "Econ.Button.ArmedFgColor" + "depressedBgColor_override" "Econ.Button.DepressedBgColor" + "depressedFgColor_override" "Econ.Button.DepressedFgColor" + } +}
\ No newline at end of file diff --git a/resource/ui/econ/store/v2/storepage.res b/resource/ui/econ/store/v2/storepage.res index af24210..8341467 100644 --- a/resource/ui/econ/store/v2/storepage.res +++ b/resource/ui/econ/store/v2/storepage.res @@ -697,7 +697,7 @@ { "ControlName" "CExLabel" "fieldName" "BackpackSpaceLabel" - "font" "Cerbetica12" + "font" "HudFontSmallest" "labelText" "%freebackpackspace%" "textAlignment" "west" "xpos" "c-300" @@ -715,7 +715,7 @@ { "ControlName" "CExButton" "fieldName" "CartButton" - "font" "Cerbetica14" + "font" "HudFontSmall" "labelText" "%storecart%" "textAlignment" "east" "xpos" "c-300" diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res index 97c26a6..163b8ee 100644 --- a/resource/ui/econ/store/v2/storepanel.res +++ b/resource/ui/econ/store/v2/storepanel.res @@ -162,7 +162,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "Exit Store (&Q)" - "font" "Cerbetica14" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -221,7 +221,7 @@ "zpos" "5" "wide" "70" "tall" "100" - "font" "Cerbetica8" + "font" "HudFontSmallest" "wrap" "1" "labelText" "#Store_ConfirmStampDonationAddTitle" "visible" "0" @@ -242,7 +242,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#Store_Checkout" - "font" "Cerbetica14" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res index e06cd2b..ff6f033 100644 --- a/resource/ui/econ/tradingstartdialog.res +++ b/resource/ui/econ/tradingstartdialog.res @@ -66,7 +66,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica22" + "font" "HudFontMedium" "labelText" "#TF_TradeStartDialog_Title" "textAlignment" "north" "xpos" "0" @@ -121,7 +121,7 @@ { "ControlName" "CExLabel" "fieldName" "QueryLabel" - "font" "Cerbetica12" + "font" "HudFontSmallest" "labelText" "#TF_TradeStartDialog_Select" "textAlignment" "north" "xpos" "0" @@ -151,7 +151,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_TradeStartDialog_SelectFriends" - "font" "Cerbetica14" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -175,7 +175,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_TradeStartDialog_SelectServer" - "font" "Cerbetica14" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -199,7 +199,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_TradeStartDialog_SelectProfile" - "font" "Cerbetica14" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -450,7 +450,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_TradeStartDialog_ProfileGo" - "font" "Cerbetica14" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -476,7 +476,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#Cancel" - "font" "Cerbetica14" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" diff --git a/resource/ui/flagstatus.res b/resource/ui/flagstatus.res index 0e706a6..daffae7 100644 --- a/resource/ui/flagstatus.res +++ b/resource/ui/flagstatus.res @@ -12,6 +12,10 @@ "visible" "1" "enabled" "1" "scaleImage" "1" + + "if_mvm" { + "ypos" "0" + } } "Briefcase" @@ -30,9 +34,15 @@ "if_mvm" { + "ypos" "14" "wide" "24" "tall" "24" } + + "if_specialdelivery" + { + "visible" "0" + } } "StatusIcon" @@ -53,5 +63,10 @@ { "visible" "0" } + + "if_specialdelivery" + { + "visible" "0" + } } }
\ No newline at end of file diff --git a/resource/ui/freezepanel_basic.res b/resource/ui/freezepanel_basic.res index 9c4a1fa..2e7f8cc 100644 --- a/resource/ui/freezepanel_basic.res +++ b/resource/ui/freezepanel_basic.res @@ -41,7 +41,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fillcolor" "0 0 0 100" + "fillcolor" "TransparentBlack" } "TitleBackground" @@ -57,7 +57,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fillcolor" "0 0 0 100" + "fillcolor" "TransparentBlack" } "itemmodelpanel" @@ -72,7 +72,7 @@ { "ControlName" "CExLabel" "fieldName" "ItemLabel" - "font" "Cerbetica12" + "font" "HudFontSmall" "xpos" "10" "ypos" "3" "zpos" "1" @@ -138,7 +138,7 @@ { "ControlName" "Label" "fieldName" "FreezeLabel" - "font" "Cerbetica12" + "font" "HudFontSmall" "xpos" "25" "ypos" "15" "zpos" "1" @@ -176,7 +176,7 @@ { "ControlName" "CExLabel" "fieldName" "FreezeLabelKiller" - "font" "Cerbetica12" + "font" "HudFontSmall" "xpos" "25" "ypos" "30" "zpos" "1" diff --git a/resource/ui/hud_obj_dispenser.res b/resource/ui/hud_obj_dispenser.res index 4c31572..89a5d5c 100644 --- a/resource/ui/hud_obj_dispenser.res +++ b/resource/ui/hud_obj_dispenser.res @@ -6,7 +6,7 @@ "fieldName" "BuildingStatusItem" "xpos" "0" "ypos" "0" - "wide" "150" + "wide" "140" "tall" "31" "autoResize" "0" "pinCorner" "0" @@ -29,7 +29,7 @@ { "ControlName" "CIconPanel" "fieldName" "Icon" - "xpos" "24" + "xpos" "21" "ypos" "1" "wide" "28" "tall" "28" @@ -54,7 +54,7 @@ { "ControlName" "CExLabel" "fieldName" "NotBuiltLabel" - "font" "Cerbetica10" + "font" "Default" "xpos" "60" "ypos" "0" "wide" "200" @@ -178,8 +178,8 @@ "ControlName" "CBuildingHealthBar" "fieldName" "Health" "font" "Default" - "xpos" "13" - "ypos" "3" + "xpos" "10" + "ypos" "4" "wide" "8" "tall" "24" "autoResize" "0" diff --git a/resource/ui/hud_obj_sentrygun.res b/resource/ui/hud_obj_sentrygun.res index 2da4f01..3a71de0 100644 --- a/resource/ui/hud_obj_sentrygun.res +++ b/resource/ui/hud_obj_sentrygun.res @@ -6,8 +6,8 @@ "fieldName" "BuildingStatusItem" "xpos" "0" "ypos" "0" - "wide" "160" - "tall" "206" + "wide" "140" + "tall" "35" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -29,10 +29,10 @@ { "ControlName" "CIconPanel" "fieldName" "Icon_Sentry_1" - "xpos" "22" - "ypos" "158" - "wide" "36" - "tall" "36" + "xpos" "21" + "ypos" "1" + "wide" "28" + "tall" "28" "visible" "1" "enabled" "1" "scaleImage" "1" @@ -44,10 +44,10 @@ { "ControlName" "CIconPanel" "fieldName" "Icon_Sentry_2" - "xpos" "22" - "ypos" "158" - "wide" "36" - "tall" "36" + "xpos" "21" + "ypos" "1" + "wide" "28" + "tall" "28" "visible" "0" "enabled" "1" "scaleImage" "1" @@ -59,10 +59,10 @@ { "ControlName" "CIconPanel" "fieldName" "Icon_Sentry_3" - "xpos" "22" - "ypos" "158" - "wide" "36" - "tall" "36" + "xpos" "21" + "ypos" "1" + "wide" "28" + "tall" "28" "visible" "0" "enabled" "1" "scaleImage" "1" @@ -75,20 +75,20 @@ "ControlName" "EditablePanel" "fieldName" "NotBuiltPanel" "xpos" "0" - "ypos" "152" + "ypos" "0" "wide" "160" - "tall" "60" + "tall" "35" "visible" "1" "NotBuiltLabel" { "ControlName" "CExLabel" "fieldName" "NotBuiltLabel" - "font" "Cerbetica10" + "font" "Default" "xpos" "60" "ypos" "0" "wide" "200" - "tall" "60" + "tall" "35" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -105,9 +105,9 @@ "ControlName" "EditablePanel" "fieldName" "BuiltPanel" "xpos" "0" - "ypos" "146" + "ypos" "0" "wide" "160" - "tall" "60" + "tall" "35" "visible" "0" "Icon_Upgrade_1" @@ -162,11 +162,10 @@ { "ControlName" "CBuildingStatusAlertTray" "fieldName" "AlertTray" - "xpos" "114" + "xpos" "113" "ypos" "0" - "zpos" "-2" - "wide" "44" - "tall" "60" + "wide" "34" + "tall" "35" "visible" "1" "enabled" "1" "icon" "obj_status_alert_background_tall" @@ -177,10 +176,10 @@ "ControlName" "CIconPanel" "fieldName" "WrenchIcon" "xpos" "121" - "ypos" "18" + "ypos" "7" "zpos" "1" - "wide" "27" - "tall" "27" + "wide" "19" + "tall" "19" "visible" "0" "enabled" "1" "scaleImage" "1" @@ -193,10 +192,10 @@ "ControlName" "CIconPanel" "fieldName" "SapperIcon" "xpos" "117" - "ypos" "12" + "ypos" "5" "zpos" "1" - "wide" "35" - "tall" "35" + "wide" "25" + "tall" "25" "visible" "0" "enabled" "1" "scaleImage" "1" @@ -209,10 +208,10 @@ "ControlName" "CBuildingHealthBar" "fieldName" "Health" "font" "Default" - "xpos" "13" - "ypos" "3" + "xpos" "10" + "ypos" "4" "wide" "8" - "tall" "53" + "tall" "24" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -229,16 +228,16 @@ "xpos" "60" "ypos" "0" "wide" "100" - "tall" "60" + "tall" "35" "visible" "0" "BuildingLabel" { "ControlName" "CExLabel" "fieldName" "BuildingLabel" - "font" "DefaultSmall" + "font" "Default" "xpos" "0" - "ypos" "18" + "ypos" "5" "wide" "200" "tall" "12" "autoResize" "0" @@ -257,7 +256,7 @@ "fieldName" "BuildingProgress" "font" "Default" "xpos" "0" - "ypos" "29" + "ypos" "16" "wide" "50" "tall" "8" "autoResize" "0" @@ -277,7 +276,7 @@ "xpos" "60" "ypos" "0" "wide" "100" - "tall" "60" + "tall" "35" "visible" "0" "KillIcon" @@ -285,7 +284,7 @@ "ControlName" "ImagePanel" "fieldName" "KillIcon" "xpos" "0" - "ypos" "12" + "ypos" "0" "zpos" "1" "wide" "10" "tall" "10" @@ -300,17 +299,17 @@ { "ControlName" "CExLabel" "fieldName" "KillsLabel" - "font" "DefaultSmall" + "font" "Default" "xpos" "12" - "ypos" "13" - "wide" "200" - "tall" "22" + "ypos" "2" + "wide" "38" + "tall" "8" "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" "labelText" "#Building_hud_sentry_kills_assists" - "textAlignment" "north-west" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" } @@ -320,7 +319,7 @@ "ControlName" "ImagePanel" "fieldName" "ShellIcon" "xpos" "0" - "ypos" "25" + "ypos" "12" "zpos" "1" "wide" "10" "tall" "10" @@ -337,7 +336,7 @@ "fieldName" "Shells" "font" "Default" "xpos" "12" - "ypos" "26" + "ypos" "12" "wide" "38" "tall" "8" "autoResize" "0" @@ -354,11 +353,11 @@ "ControlName" "ImagePanel" "fieldName" "RocketIcon" "xpos" "0" - "ypos" "38" + "ypos" "23" "zpos" "1" "wide" "10" "tall" "10" - "visible" "0" + "visible" "1" "enabled" "1" "scaleImage" "1" "image" "../hud/hud_obj_status_rockets_64" @@ -371,12 +370,12 @@ "fieldName" "Rockets" "font" "Default" "xpos" "12" - "ypos" "39" + "ypos" "23" "wide" "38" "tall" "8" "autoResize" "0" "pinCorner" "0" - "visible" "0" + "visible" "1" "enabled" "1" "textAlignment" "Left" "dulltext" "0" @@ -388,7 +387,7 @@ "ControlName" "CIconPanel" "fieldName" "UpgradeIcon" "xpos" "0" - "ypos" "38" + "ypos" "24" "zpos" "1" "wide" "10" "tall" "10" @@ -405,7 +404,7 @@ "fieldName" "Upgrade" "font" "Default" "xpos" "12" - "ypos" "39" + "ypos" "23" "wide" "38" "tall" "8" "autoResize" "0" diff --git a/resource/ui/hud_obj_sentrygun_disp.res b/resource/ui/hud_obj_sentrygun_disp.res index abad62a..8835042 100644 --- a/resource/ui/hud_obj_sentrygun_disp.res +++ b/resource/ui/hud_obj_sentrygun_disp.res @@ -54,7 +54,7 @@ { "ControlName" "CExLabel" "fieldName" "NotBuiltLabel" - "font" "Cerbetica10" + "font" "Default" "xpos" "60" "ypos" "0" "wide" "200" diff --git a/resource/ui/hud_obj_tele.res b/resource/ui/hud_obj_tele.res index da40541..aef1143 100644 --- a/resource/ui/hud_obj_tele.res +++ b/resource/ui/hud_obj_tele.res @@ -6,7 +6,7 @@ "fieldName" "BuildingStatusItem" "xpos" "0" "ypos" "0" - "wide" "150" + "wide" "140" "tall" "31" "autoResize" "0" "pinCorner" "0" @@ -29,7 +29,7 @@ { "ControlName" "CIconPanel" "fieldName" "Icon" - "xpos" "24" + "xpos" "21" "ypos" "1" "wide" "28" "tall" "28" @@ -54,7 +54,7 @@ { "ControlName" "CExLabel" "fieldName" "NotBuiltLabel" - "font" "Cerbetica10" + "font" "Default" "xpos" "60" "ypos" "0" "wide" "200" @@ -178,8 +178,8 @@ "ControlName" "CBuildingHealthBar" "fieldName" "Health" "font" "Default" - "xpos" "13" - "ypos" "3" + "xpos" "10" + "ypos" "6" "wide" "8" "tall" "24" "autoResize" "0" @@ -205,7 +205,7 @@ { "ControlName" "CExLabel" "fieldName" "BuildingLabel" - "font" "DefaultSmall" + "font" "Default" "xpos" "0" "ypos" "5" "wide" "200" diff --git a/resource/ui/hud_obj_tele_entrance.res b/resource/ui/hud_obj_tele_entrance.res index fb70295..0e82ac5 100644 --- a/resource/ui/hud_obj_tele_entrance.res +++ b/resource/ui/hud_obj_tele_entrance.res @@ -6,7 +6,7 @@ "fieldName" "BuildingStatusItem" "xpos" "0" "ypos" "0" - "wide" "150" + "wide" "140" "tall" "31" "autoResize" "0" "pinCorner" "0" @@ -29,7 +29,7 @@ { "ControlName" "CIconPanel" "fieldName" "Icon" - "xpos" "24" + "xpos" "21" "ypos" "1" "wide" "28" "tall" "28" @@ -54,7 +54,7 @@ { "ControlName" "CExLabel" "fieldName" "NotBuiltLabel" - "font" "Cerbetica10" + "font" "Default" "xpos" "60" "ypos" "0" "wide" "200" @@ -178,8 +178,8 @@ "ControlName" "CBuildingHealthBar" "fieldName" "Health" "font" "Default" - "xpos" "13" - "ypos" "3" + "xpos" "10" + "ypos" "4" "wide" "8" "tall" "24" "autoResize" "0" @@ -205,7 +205,7 @@ { "ControlName" "CExLabel" "fieldName" "BuildingLabel" - "font" "DefaultSmall" + "font" "Default" "xpos" "0" "ypos" "5" "wide" "200" @@ -308,7 +308,7 @@ { "ControlName" "CExLabel" "fieldName" "TimesUsedLabel" - "font" "DefaultSmall" + "font" "Default" "xpos" "12" "ypos" "5" "wide" "200" diff --git a/resource/ui/hud_obj_tele_exit.res b/resource/ui/hud_obj_tele_exit.res index 35ef965..2c4ab9a 100644 --- a/resource/ui/hud_obj_tele_exit.res +++ b/resource/ui/hud_obj_tele_exit.res @@ -6,7 +6,7 @@ "fieldName" "BuildingStatusItem" "xpos" "0" "ypos" "0" - "wide" "150" + "wide" "140" "tall" "31" "autoResize" "0" "pinCorner" "0" @@ -29,7 +29,7 @@ { "ControlName" "CIconPanel" "fieldName" "Icon" - "xpos" "24" + "xpos" "21" "ypos" "1" "wide" "28" "tall" "28" @@ -54,7 +54,7 @@ { "ControlName" "CExLabel" "fieldName" "NotBuiltLabel" - "font" "Cerbetica10" + "font" "Default" "xpos" "60" "ypos" "0" "wide" "200" @@ -77,7 +77,7 @@ "xpos" "0" "ypos" "0" "wide" "160" - "tall" "43" + "tall" "31" "visible" "0" "Icon_Upgrade_1" @@ -178,8 +178,8 @@ "ControlName" "CBuildingHealthBar" "fieldName" "Health" "font" "Default" - "xpos" "13" - "ypos" "3" + "xpos" "10" + "ypos" "4" "wide" "8" "tall" "24" "autoResize" "0" @@ -205,7 +205,7 @@ { "ControlName" "CExLabel" "fieldName" "BuildingLabel" - "font" "DefaultSmall" + "font" "Default" "xpos" "0" "ypos" "5" "wide" "200" diff --git a/resource/ui/hudammoweapons.res b/resource/ui/hudammoweapons.res index a1e14ed..3139259 100644 --- a/resource/ui/hudammoweapons.res +++ b/resource/ui/hudammoweapons.res @@ -24,7 +24,7 @@ "xpos" "0" "ypos" "0" "zpos" "5" - "wide" "65" + "wide" "60" "tall" "50" "visible" "0" "enabled" "1" @@ -41,7 +41,7 @@ "xpos" "-2" "ypos" "-2" "zpos" "5" - "wide" "65" + "wide" "60" "tall" "50" "visible" "0" "enabled" "1" @@ -60,10 +60,10 @@ "font" "CerbeticaBold32" "font_minmode" "CerbeticaBold20" "fgcolor" "Ammo In Reserve" - "xpos" "70" + "xpos" "65" "ypos" "0" "zpos" "7" - "wide" "100" + "wide" "f0" "tall" "50" "visible" "0" "enabled" "1" @@ -80,7 +80,7 @@ "xpos" "-2" "ypos" "-2" "zpos" "7" - "wide" "100" + "wide" "f0" "tall" "50" "visible" "0" "enabled" "1" @@ -102,7 +102,7 @@ "xpos" "0" "ypos" "0" "zpos" "5" - "wide" "100" + "wide" "110" "tall" "50" "visible" "0" "enabled" "1" @@ -119,7 +119,7 @@ "xpos" "-2" "ypos" "-2" "zpos" "4" - "wide" "100" + "wide" "110" "tall" "50" "visible" "0" "enabled" "1" diff --git a/resource/ui/hudarenanotification.res b/resource/ui/hudarenanotification.res index 0ab2238..36b20b1 100644 --- a/resource/ui/hudarenanotification.res +++ b/resource/ui/hudarenanotification.res @@ -2,36 +2,35 @@ { "HudArenaNotificationBG" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "HudArenaNotificationBG" - "xpos" "20" + "xpos" "0" "ypos" "0" "zpos" "-1" "wide" "280" - "tall" "100" - "autoResize" "0" - "pinCorner" "0" + "tall" "75" "visible" "1" "enabled" "1" - "fillcolor" "0 0 0 230" - "border" "CyanBorderThick" + "bgcolor_override" "TransparentBlack" + "PaintBackgroundType" "2" + "border" "CyanBorderThick" } "WarningLabel" { "ControlName" "Label" "fieldName" "WarningLabel" - "font" "CerbeticaBold72" - "xpos" "40" - "ypos" "15" + "font" "HudFontGiantBold" + "xpos" "0" + "ypos" "0" "zpos" "1" - "wide" "72" - "tall" "72" + "wide" "50" + "tall" "75" "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" - "wrap" "1" + "wrap" "0" "labelText" "!" "textAlignment" "center" } @@ -40,12 +39,12 @@ { "ControlName" "Label" "fieldName" "BalanceLabel" - "font" "CerbeticaBold20" - "xpos" "70" + "font" "HudFontSmall" + "xpos" "50" "ypos" "0" "zpos" "1" "wide" "230" - "tall" "64" + "tall" "40" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -59,12 +58,12 @@ { "ControlName" "Label" "fieldName" "BalanceLabelTip" - "font" "CerbeticaBold16" - "xpos" "70" - "ypos" "34" + "font" "HudFontSmall" + "xpos" "50" + "ypos" "30" "zpos" "1" "wide" "230" - "tall" "64" + "tall" "35" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -79,7 +78,7 @@ "ControlName" "CTFImagePanel" "fieldName" "SwitchImage" "xpos" "25" - "ypos" "23" + "ypos" "0" "zpos" "1" "wide" "50" "tall" "50" diff --git a/resource/ui/hudarenateammenu.res b/resource/ui/hudarenateammenu.res index 9f46458..167a203 100644 --- a/resource/ui/hudarenateammenu.res +++ b/resource/ui/hudarenateammenu.res @@ -12,6 +12,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" + "fgcolor" "255 0 0 255" "tabPosition" "0" } @@ -21,13 +22,13 @@ "fieldName" "SidePanelBG" "xpos" "0" "ypos" "0" - "zpos" "1" + "zpos" "0" "wide" "255" "tall" "f0" "visible" "1" "enabled" "1" "scaleImage" "1" - "fillcolor" "0 0 0 60" + "fillcolor" "0 0 0 120" } "SysMenu" @@ -97,30 +98,10 @@ "paintborder" "0" "command" "jointeam spectate" "font" "CerbeticaBold20" - - "defaultFgColor_override" "255 255 255 128" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "255 255 255 128" - "selectedFgColor_override" "TanLight" - - "defaultBgColor_override" "0 0 0 200" - "armedBgColor_override" "TanDarker" - "depressedBgColor_override" "0 0 0 200" - "selectedBgColor_override" "TanDarker" - } - - "JoinBG" - { - "ControlName" "ImagePanel" - "fieldName" "JoinBG" - "xpos" "0" - "ypos" "c-35" - "zpos" "0" - "wide" "255" - "tall" "30" - "visible" "1" - "enabled" "1" - "fillcolor" "0 0 0 200" + "defaultFgColor_override" "255 255 255 128" + "armedFgColor_override" "235 226 202 255" + "depressedFgColor_override" "255 255 255 128" + "selectedFgColor_override" "235 226 202 255" } "teambutton3" @@ -144,37 +125,24 @@ "paintborder" "0" "command" "jointeam spectatearena" "font" "CerbeticaBold20" - - "defaultFgColor_override" "255 255 255 128" - "armedFgColor_override" "TanLight" - "depressedFgColor_override" "255 255 255 128" - "selectedFgColor_override" "TanLight" - - "defaultBgColor_override" "0 0 0 200" - "armedBgColor_override" "TanDarker" - "depressedBgColor_override" "0 0 0 200" - "selectedBgColor_override" "TanDarker" - } - - "CancelButton" - { - "ControlName" "CExButton" - "fieldName" "CancelButton" - "wide" "0" + "defaultFgColor_override" "255 255 255 128" + "armedFgColor_override" "235 226 202 255" + "depressedFgColor_override" "255 255 255 128" + "selectedFgColor_override" "235 226 202 255" } - "SpecBG" + "SpectateBG" { - "ControlName" "ImagePanel" - "fieldName" "SpecBG" + "ControlName" "EditablePanel" + "fieldName" "SpectateBG" "xpos" "0" - "ypos" "c5" + "ypos" "c-35" "zpos" "0" "wide" "255" "tall" "30" "visible" "1" "enabled" "1" - "fillcolor" "0 0 0 200" + "bgcolor_override" "HudBlack" } "MenuBG" @@ -193,38 +161,10 @@ "fillcolor" "255 255 255 200" } - "TeamMenuAuto" - { - "ControlName" "CExLabel" - "fieldName" "TeamMenuAuto" - "xpos" "9999" - } - - "TeamMenuSpectate" - { - "ControlName" "CExLabel" - "fieldName" "TeamMenuSpectate" - "xpos" "9999" - } - - "ShadedBar" - { - "ControlName" "ImagePanel" - "fieldName" "ShadedBar" - "xpos" "9999" - } - - "autodoor" - { - "ControlName" "CModelPanel" - "fieldName" "autodoor" - "xpos" "9999" - } - - "spectate" + "CancelButton" { - "ControlName" "CModelPanel" - "fieldName" "spectate" - "xpos" "9999" + "ControlName" "CExButton" + "fieldName" "CancelButton" + "wide" "0" } }
\ No newline at end of file diff --git a/resource/ui/hudcurrencyaccount.res b/resource/ui/hudcurrencyaccount.res index 13dd95e..5437b3c 100644 --- a/resource/ui/hudcurrencyaccount.res +++ b/resource/ui/hudcurrencyaccount.res @@ -4,7 +4,7 @@ { "ControlName" "CExLabel" "fieldName" "Currency" - "font" "Cerbetica14" + "font" "HudFontSmall" "fgcolor" "CreditsGreen" "xpos" "45" "ypos" "0" @@ -28,7 +28,7 @@ "tall" "20" "visible" "1" "enabled" "1" - "bgcolor_override" "0 0 0 200" + "bgcolor_override" "TransparentBlack" "PaintBackgroundType" "2" } @@ -36,7 +36,7 @@ { "ControlName" "CExLabel" "fieldName" "CurrencyLabel" - "font" "Cerbetica14" + "font" "HudFontSmall" "fgcolor" "TanLight" "xpos" "4" "ypos" "0" diff --git a/resource/ui/huddemomancharge.res b/resource/ui/huddemomancharge.res index 2a22772..85d6a4c 100644 --- a/resource/ui/huddemomancharge.res +++ b/resource/ui/huddemomancharge.res @@ -42,8 +42,7 @@ "textAlignment" "west" "dulltext" "0" "brighttext" "0" - "font" "Cerbetica11" - "font_minmode" "Cerbetica8" + "font" "HudFontSmallest" "fgcolor_override" "White" } }
\ No newline at end of file diff --git a/resource/ui/huddemomanpipes.res b/resource/ui/huddemomanpipes.res index 3948a53..09e9473 100644 --- a/resource/ui/huddemomanpipes.res +++ b/resource/ui/huddemomanpipes.res @@ -19,7 +19,7 @@ "textAlignment" "west" "dulltext" "0" "brighttext" "0" - "font" "Cerbetica10" + "font" "HudFontSmall" } "ChargeMeter" @@ -75,7 +75,7 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "font" "CerbeticaBold32" + "font" "CerbeticaBold28" "font_minmode" "CerbeticaBold20" } "NumPipesLabelDropshadow" @@ -97,7 +97,7 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "font" "CerbeticaBold32" + "font" "CerbeticaBold28" "font_minmode" "CerbeticaBold20" "fgcolor" "TransparentBlack" diff --git a/resource/ui/hudinspectpanel.res b/resource/ui/hudinspectpanel.res new file mode 100644 index 0000000..9637e87 --- /dev/null +++ b/resource/ui/hudinspectpanel.res @@ -0,0 +1,59 @@ +"Resource/UI/HudInspectPanel.res" +{ + "itempanel" + { + "ControlName" "CItemModelPanel" + "fieldName" "itempanel" + "xpos" "0" + "ypos" "0" + "zpos" "10" + "wide" "190" + "tall" "100" + "visible" "0" + "bgcolor_override" "TransparentBlack" + "PaintBackgroundType" "0" + + "model_ypos" "10" + "model_center_x" "1" + "model_wide" "90" + "model_tall" "60" + + "text_xpos" "10" + "text_ypos" "10" + "text_wide" "170" + "text_center" "1" + + "max_text_height" "100" + "padding_height" "10" + "resize_to_text" "1" + "text_forcesize" "2" + + "itemmodelpanel" + { + "fieldName" "itemmodelpanel" + "use_item_rendertarget" "0" + "useparentbg" "1" + "inventory_image_type" "1" + } + + "ItemLabel" + { + "ControlName" "Label" + "fieldName" "ItemLabel" + "font" "HudFontSmall" + "xpos" "10" + "ypos" "3" + "zpos" "1" + "wide" "270" + "tall" "9" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "labelText" "#FreezePanel_Item" + "textAlignment" "Left" + "dulltext" "0" + "brighttext" "0" + } + } +}
\ No newline at end of file diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res index 4555cd0..400c293 100644 --- a/resource/ui/hudmatchstatus.res +++ b/resource/ui/hudmatchstatus.res @@ -342,8 +342,8 @@ "tall" "50" "zpos" "1" - "color_portrait_bg_red" "119 62 61 255" - "color_portrait_bg_blue" "62 81 101 255" + "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" "84 191 58 255" @@ -495,7 +495,7 @@ { "ControlName" "CExLabel" "fieldName" "respawntime" - "font" "Cerbetica8" + "font" "HudFontSmallest" "xpos" "cs-0.5" "ypos" "0" "zpos" "5" @@ -681,7 +681,7 @@ "enabled" "1" "tabPosition" "0" "autoresize" "3" - "linespacing" "26" + "linespacing" "25" "linegap" "4" //"show_columns" "1" @@ -819,7 +819,7 @@ "enabled" "1" "tabPosition" "0" "autoresize" "3" - "linespacing" "26" + "linespacing" "25" "linegap" "4" //"show_columns" "1" diff --git a/resource/ui/hudmatchsummary.res b/resource/ui/hudmatchsummary.res index 3901f7d..9b076a9 100644 --- a/resource/ui/hudmatchsummary.res +++ b/resource/ui/hudmatchsummary.res @@ -255,7 +255,7 @@ "visible" "1" "enabled" "1" "border" "DarkBlueTeamBorder" - "bgcolor_override" "70 130 180 153" + "bgcolor_override" "Blue" if_large { @@ -530,7 +530,7 @@ "visible" "1" "enabled" "1" "border" "DarkRedTeamBorder" - "bgcolor_override" "205 50 50 153" + "bgcolor_override" "Red" if_large { diff --git a/resource/ui/hudobjectivekothtimepanel.res b/resource/ui/hudobjectivekothtimepanel.res index 583864a..5da7350 100644 --- a/resource/ui/hudobjectivekothtimepanel.res +++ b/resource/ui/hudobjectivekothtimepanel.res @@ -10,7 +10,7 @@ "BlueTimer" { - "ControlName" "ImagePanel" + "ControlName" "CTFHudTimeStatus" "fieldName" "BlueTimer" "xpos" "0" "ypos" "0" @@ -24,7 +24,7 @@ { "proportionaltoparent" "1" "xpos" "cs-.7" - "ypos" "4" + "ypos" "5" "delta_item_x" "10" "delta_item_start_y" "12" "delta_item_end_y" "50" @@ -64,7 +64,7 @@ "RedTimer" { - "ControlName" "ImagePanel" + "ControlName" "CTFHudTimeStatus" "fieldName" "RedTimer" "xpos" "50" "ypos" "0" @@ -78,7 +78,7 @@ { "proportionaltoparent" "1" "xpos" "cs-0.77" - "ypos" "4" + "ypos" "5" "delta_item_x" "50" "delta_item_start_y" "12" "delta_item_end_y" "50" @@ -118,7 +118,7 @@ "ActiveTimerBG" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "ActiveTimerBG" "xpos" "15" "ypos" "25" @@ -127,6 +127,7 @@ "tall" "3" "visible" "0" "enabled" "1" - "fillcolor" "TanLight" + "bgcolor_override" "TanLight" + "PaintBackgroundType" "0" } }
\ No newline at end of file diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res index aaea503..e4daef3 100644 --- a/resource/ui/hudobjectivetimepanel.res +++ b/resource/ui/hudobjectivetimepanel.res @@ -2,7 +2,7 @@ { "TimePanelBG" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "TimePanelBG" "xpos" "25" "ypos" "0" @@ -11,12 +11,8 @@ "tall" "24" "visible" "1" "enabled" "1" - "fillcolor" "HudBlack" - "scaleImage" "1" - "src_corner_height" "3" - "src_corner_width" "3" - "draw_corner_width" "0" - "draw_corner_height" "0" + "bgcolor_override" "TransparentBlack" + "PaintBackgroundType" "0" if_match { @@ -63,7 +59,7 @@ "dulltext" "0" "brighttext" "0" "wrap" "0" - "font" "Cerbetica12" + "font" "HudFontSmall" if_match { @@ -93,7 +89,7 @@ "dulltext" "0" "brighttext" "0" "wrap" "0" - "font" "Cerbetica12" + "font" "HudFontSmall" if_match { @@ -123,7 +119,7 @@ "dulltext" "0" "brighttext" "0" "wrap" "0" - "font" "Cerbetica12" + "font" "HudFontSmall" if_match { @@ -153,7 +149,7 @@ "dulltext" "0" "brighttext" "0" "wrap" "0" - "font" "Cerbetica12" + "font" "HudFontSmall" if_match { @@ -183,12 +179,17 @@ "dulltext" "0" "brighttext" "0" "wrap" "0" - "font" "Cerbetica12" + "font" "HudFontSmallest" if_match { "xpos" "30" } + + if_mvm + { + "visible" "0" + } } "ServerTimeLimitLabelBG" diff --git a/resource/ui/hudroundcounter.res b/resource/ui/hudroundcounter.res index 350ee33..a697fe3 100644 --- a/resource/ui/hudroundcounter.res +++ b/resource/ui/hudroundcounter.res @@ -101,7 +101,7 @@ "tall" "16" "visible" "1" "enabled" "1" - "fillcolor" "0 0 0 100" + "fillcolor" "TransparentBlack" "proportionaltoparent" "1" } }
\ No newline at end of file diff --git a/resource/ui/hudstopwatch.res b/resource/ui/hudstopwatch.res index cf357ba..98e32f0 100644 --- a/resource/ui/hudstopwatch.res +++ b/resource/ui/hudstopwatch.res @@ -11,7 +11,7 @@ "tall" "15" "visible" "1" "enabled" "1" - "bgcolor_override" "0 0 0 150" + "bgcolor_override" "TransparentBlack" "PaintBackgroundType" "2" } @@ -46,7 +46,7 @@ { "ControlName" "CExLabel" "fieldName" "TimePanelValue" - "font" "Cerbetica12" + "font" "HudFontSmallest" "fgcolor" "TanLight" "xpos" "0" "ypos" "0" @@ -63,7 +63,7 @@ { "ControlName" "CExLabel" "fieldName" "StopWatchScoreToBeat" - "font" "Cerbetica12" + "font" "HudFontSmallest" "labelText" "%scoretobeat%" "textAlignment" "center" "xpos" "0" @@ -81,7 +81,7 @@ { "ControlName" "CExLabel" "fieldName" "StopWatchPointsLabel" - "font" "Cerbetica12" + "font" "HudFontSmallest" "labelText" "points in" "textAlignment" "center" "xpos" "15" @@ -100,12 +100,12 @@ { "ControlName" "CExLabel" "fieldName" "StopWatchLabel" - "font" "Cerbetica10" + "font" "HudFontSmallest" "labelText" "%stopwatchlabel%" "textAlignment" "center" "xpos" "0" "ypos" "0" - "zpos" "4" + "zpos" "1" "wide" "80" "tall" "15" "autoResize" "0" diff --git a/resource/ui/hudteamgoaltournament.res b/resource/ui/hudteamgoaltournament.res index 118424f..483ba66 100644 --- a/resource/ui/hudteamgoaltournament.res +++ b/resource/ui/hudteamgoaltournament.res @@ -5,10 +5,10 @@ "ControlName" "EditablePanel" "fieldName" "HudStopWatchObjective" "xpos" "9999" - "ypos" "9999" + "ypos" "105" "zpos" "1" "wide" "275" - "tall" "190" + "tall" "130" "visible" "0" "enabled" "1" @@ -20,7 +20,7 @@ "ypos" "0" "zpos" "-1" "wide" "275" - "tall" "170" + "tall" "130" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -40,7 +40,7 @@ "ypos" "0" "zpos" "-1" "wide" "275" - "tall" "100" + "tall" "80" "autoResize" "0" "pinCorner" "0" "visible" "0" @@ -114,7 +114,7 @@ "xpos" "25" "ypos" "75" "wide" "225" - "tall" "165" + "tall" "150" "wrap" "1" "autoResize" "1" "pinCorner" "1" diff --git a/resource/ui/hudteamswitch.res b/resource/ui/hudteamswitch.res new file mode 100644 index 0000000..fdbf642 --- /dev/null +++ b/resource/ui/hudteamswitch.res @@ -0,0 +1,83 @@ +"Resource/UI/HudTeamSwitch.res" +{ + "HudTeamSwitchBG" + { + "ControlName" "CTFImagePanel" + "fieldName" "HudTeamSwitchBG" + "xpos" "0" + "ypos" "0" + "zpos" "-1" + "wide" "246" + "tall" "31" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "image" "../hud/death_panel_blue_bg" + "scaleImage" "1" + "teambg_2" "../hud/death_panel_red_bg" + "teambg_3" "../hud/death_panel_blue_bg" + "paintborder" "1" + "border" "NoBorder" + "src_corner_height" "23" + "src_corner_width" "23" + "draw_corner_width" "0" + "draw_corner_height" "0" + } + "SwitchLabel" + { + "ControlName" "Label" + "fieldName" "SwitchLabel" + "font" "HudFontSmallest" + "xpos" "31" + "ypos" "3" + "zpos" "1" + "wide" "212" + "tall" "10" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "wrap" "1" + "labelText" "#TF_teambalanced" + "textAlignment" "North" + "fgcolor_override" "White" + "textinsetx" "5" + } + "BalanceLabel" + { + "ControlName" "Label" + "fieldName" "BalanceLabel" + "font" "HudFontSmallest" + "xpos" "31" + "ypos" "13" + "zpos" "1" + "wide" "212" + "tall" "40" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "wrap" "1" + "labelText" "" + "textAlignment" "North" + "fgcolor_override" "White" + "textinsetx" "5" + } + "SwitchImage" + { + "ControlName" "CTFImagePanel" + "fieldName" "SwitchImage" + "xpos" "3" + "ypos" "3" + "zpos" "1" + "wide" "25" + "tall" "25" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "image" "../hud/ico_teambalance" + "scaleImage" "1" + } +}
\ No newline at end of file diff --git a/resource/ui/hudtournament.res b/resource/ui/hudtournament.res index 4b066ce..e2d7138 100644 --- a/resource/ui/hudtournament.res +++ b/resource/ui/hudtournament.res @@ -67,7 +67,7 @@ "ControlName" "ImagePanel" "fieldName" "ModeImage" "xpos" "cs-0.5" - "ypos" "60" + "ypos" "50" "zpos" "0" "wide" "60" "tall" "60" @@ -87,12 +87,11 @@ "playerpanels_kv" { "visible" "0" - "wide" "40" - "tall" "33" + "wide" "50" + "tall" "35" "zpos" "1" - "tabPosition" "0" "color_ready" "0 255 0 220" - "color_notready" "0 0 0 220" + "color_notready" "TransparentBlack" if_competitive { @@ -104,16 +103,16 @@ { "ControlName" "ImagePanel" "fieldName" "PanelBG" - "xpos" "0" - "ypos" "0" - "zpos" "0" - "wide" "55" - "tall" "35" + "xpos" "1" + "ypos" "1" + "zpos" "2" + "wide" "48" + "tall" "24" "autoResize" "0" "pinCorner" "0" - "visible" "0" - "enabled" "0" - "fillcolor" "ColorBlack" + "visible" "1" + "enabled" "1" + "fillcolor" "TransparentBlack" if_competitive { @@ -126,17 +125,17 @@ { "ControlName" "CExLabel" "fieldName" "playername" - "font" "DefaultVerySmall" - "xpos" "5" - "ypos" "24" + "font" "Default" + "xpos" "1" + "ypos" "25" "zpos" "5" - "wide" "50" - "tall" "9" + "wide" "48" + "tall" "10" "autoResize" "0" "pinCorner" "0" "visible" "1" "labelText" "%playername%" - "textAlignment" "north-west" + "textAlignment" "center" if_competitive { @@ -152,11 +151,11 @@ { "ControlName" "CTFClassImage" "fieldName" "classimage" - "xpos" "2" - "ypos" "2" - "zpos" "2" - "wide" "22" - "tall" "22" + "xpos" "1" + "ypos" "1" + "zpos" "3" + "wide" "24" + "tall" "24" "visible" "1" "enabled" "1" "image" "../hud/class_scoutred" @@ -184,13 +183,14 @@ { "ControlName" "Panel" "fieldName" "classimagebg" - "xpos" "8" - "ypos" "-2" - "wide" "25" - "tall" "28" + "xpos" "1" + "ypos" "1" + "zpos" "3" + "wide" "24" + "tall" "24" "visible" "0" "enabled" "1" - "bgcolor_override" "0 0 0 100" + "bgcolor_override" "TransparentBlack" "PaintBackgroundType" "0" if_mvm @@ -200,6 +200,8 @@ if_competitive { + "wide" "20" + "tall" "20" "visible" "1" } @@ -213,13 +215,13 @@ { "ControlName" "EditablePanel" "fieldName" "HealthIcon" - "xpos" "8" - "ypos" "6" + "xpos" "22" + "ypos" "-3" "zpos" "3" - "wide" "0" - "tall" "0" - "visible" "0" - "enabled" "0" + "wide" "32" + "tall" "32" + "visible" "1" + "enabled" "1" "HealthBonusPosAdj" "10" "HealthDeathWarning" "0.49" "TFFont" "HudFontSmallest" @@ -236,15 +238,15 @@ { "ControlName" "ScalableImagePanel" "fieldName" "ReadyBG" - "xpos" "0" - "ypos" "0" - "zpos" "2" - "wide" "55" - "tall" "26" + "xpos" "29" + "ypos" "5" + "zpos" "3" + "wide" "16" + "tall" "16" "autoResize" "0" "pinCorner" "0" "visible" "0" - "enabled" "1" + "enabled" "0" "image" "../HUD/tournament_panel_brown" "src_corner_height" "22" // pixels inside the image @@ -273,11 +275,11 @@ { "ControlName" "ImagePanel" "fieldName" "ReadyImage" - "xpos" "0" - "ypos" "0" - "zpos" "1" - "wide" "9999" - "tall" "26" + "xpos" "31" + "ypos" "7" + "zpos" "4" + "wide" "12" + "tall" "12" "autoResize" "0" "pinCorner" "0" "visible" "0" @@ -367,10 +369,10 @@ "ControlName" "ImagePanel" "fieldName" "MainBG" "xpos" "c-125" - "ypos" "26" + "ypos" "16" "zpos" "-1" "wide" "250" - "tall" "17" + "tall" "14" "pinCorner" "0" "visible" "1" "enabled" "1" @@ -401,7 +403,7 @@ "ControlName" "ScalableImagePanel" "fieldName" "HudTournamentBLUEBG" "xpos" "c-125" - "ypos" "10" + "ypos" "0" "zpos" "-1" "wide" "125" "tall" "16" @@ -434,12 +436,12 @@ { "ControlName" "Label" "fieldName" "TournamentBLUELabel" - "font" "Cerbetica16" - "xpos" "c-121" - "ypos" "10" + "font" "HudFontSmall" + "xpos" "-5" + "ypos" "0" "zpos" "1" "wide" "65" - "tall" "15" + "tall" "16" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -448,6 +450,10 @@ "labelText" "%bluenamelabel%" "textAlignment" "west" + "pin_to_sibling" "HudTournamentBLUEBG" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPLEFT" + if_mvm { "visible" "0" @@ -468,12 +474,12 @@ { "ControlName" "Label" "fieldName" "TournamentBLUEStateLabel" - "font" "Cerbetica16" - "xpos" "c-69" - "ypos" "10" + "font" "HudFontSmallest" + "xpos" "-5" + "ypos" "0" "zpos" "1" "wide" "65" - "tall" "15" + "tall" "16" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -482,6 +488,10 @@ "labelText" "%bluestate%" "textAlignment" "east" + "pin_to_sibling" "HudTournamentBLUEBG" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + if_mvm { "visible" "0" @@ -503,7 +513,7 @@ "ControlName" "ScalableImagePanel" "fieldName" "HudTournamentREDBG" "xpos" "c0" - "ypos" "10" + "ypos" "0" "zpos" "-1" "wide" "125" "tall" "16" @@ -536,12 +546,12 @@ { "ControlName" "Label" "fieldName" "TournamentREDLabel" - "font" "Cerbetica16" - "xpos" "c55" - "ypos" "10" + "font" "HudFontSmall" + "xpos" "-5" + "ypos" "0" "zpos" "1" "wide" "65" - "tall" "15" + "tall" "16" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -550,6 +560,10 @@ "labelText" "%rednamelabel%" "textAlignment" "east" + "pin_to_sibling" "HudTournamentREDBG" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + if_mvm { "visible" "0" @@ -570,12 +584,12 @@ { "ControlName" "Label" "fieldName" "TournamentREDStateLabel" - "font" "Cerbetica16" - "xpos" "c5" - "ypos" "10" + "font" "HudFontSmallest" + "xpos" "-5" + "ypos" "0" "zpos" "1" "wide" "65" - "tall" "15" + "tall" "16" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -584,6 +598,10 @@ "labelText" "%redstate%" "textAlignment" "west" + "pin_to_sibling" "HudTournamentREDBG" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPLEFT" + if_mvm { "visible" "0" @@ -604,13 +622,13 @@ { "ControlName" "CExLabel" "fieldName" "TournamentConditionLabel" - "font" "Cerbetica14" + "font" "HudFontSmallest" "fgcolor" "TanLight" "xpos" "c-125" "ypos" "16" "zpos" "1" "wide" "250" - "tall" "37" + "tall" "14" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -641,11 +659,11 @@ { "ControlName" "CExLabel" "fieldName" "TournamentInstructionsLabel" - "font" "Cerbetica11" + "font" "HudFontSmallest" "xpos" "c-125" - "ypos" "42" + "ypos" "30" "wide" "250" - "tall" "13" + "tall" "12" "zpos" "1" "autoResize" "0" "pinCorner" "0" @@ -724,7 +742,7 @@ "fieldName" "CountdownLabelShadow" "font" "Cerbetica24" "xpos" "229" - "ypos" "r53" + "ypos" "r54" "wide" "40" "tall" "40" "zpos" "3" diff --git a/resource/ui/hudtournamentsetup.res b/resource/ui/hudtournamentsetup.res index d150b62..cabb9e1 100644 --- a/resource/ui/hudtournamentsetup.res +++ b/resource/ui/hudtournamentsetup.res @@ -4,33 +4,29 @@ { "ControlName" "ImagePanel" "fieldName" "HudTournamentSetupBG" - "xpos" "0" + "xpos" "30" "ypos" "0" "zpos" "-1" - "wide" "180" - "tall" "65" + "wide" "130" + "tall" "55" "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" - "fillcolor" "0 0 0 205" - - "src_corner_height" "20" - "src_corner_width" "20" - "draw_corner_width" "0" - "draw_corner_height" "0" + "fillcolor" "TransparentBlack" + "border" "CyanBorder" } "TournamentSetupLabel" { "ControlName" "Label" "fieldName" "TournamentLabel" - "font" "Cerbetica16" - "xpos" "0" + "font" "HudFontSmall" + "xpos" "30" "ypos" "0" "zpos" "1" - "wide" "180" - "tall" "35" + "wide" "130" + "tall" "20" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -45,10 +41,10 @@ "ControlName" "Label" "fieldName" "TournamentTeamNameLabel" "font" "Cerbetica12" - "xpos" "87" - "ypos" "28" + "xpos" "35" + "ypos" "20" "zpos" "1" - "wide" "74" + "wide" "75" "tall" "15" "autoResize" "0" "pinCorner" "0" @@ -63,10 +59,10 @@ { "ControlName" "TextEntry" "fieldName" "TournamentNameEdit" - "xpos" "30" - "ypos" "27" - "wide" "120" - "tall" "16" + "xpos" "105" + "ypos" "20" + "wide" "45" + "tall" "15" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -96,10 +92,10 @@ { "ControlName" "CExButton" "fieldName" "TournamentNotReadyButton" - "xpos" "12" - "ypos" "46" - "wide" "70" - "tall" "14" + "xpos" "90" + "ypos" "37" + "wide" "55" + "tall" "15" "zpos" "0" "autoResize" "0" "pinCorner" "2" @@ -112,24 +108,24 @@ "command" "teamnotready" "default" "1" "font" "CerbeticaBold12" - "fgcolor" "Red" + "fgcolor" "ColorRed" - "border_default" "" - "border_armed" "" - "paintbackground" "0" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "Button Color" - "depressedFgColor_override" "Button Color" + "defaultBgColor_override" "Blank" + "defaultFgColor_override" "TanLight" + "armedBgColor_override" "Blank" + "armedFgColor_override" "ColorRed" + "depressedBgColor_override" "Blank" + "depressedFgColor_override" "ColorRed" } "TournamentReadyButton" { "ControlName" "CExButton" "fieldName" "TournamentReadyButton" - "xpos" "96" - "ypos" "46" - "wide" "70" - "tall" "14" + "xpos" "35" + "ypos" "37" + "wide" "55" + "tall" "15" "zpos" "0" "autoResize" "0" "pinCorner" "2" @@ -143,13 +139,13 @@ "paintborder" "0" "default" "1" "font" "CerbeticaBold12" - "fgcolor" "FooterBGBlack" + "fgcolor" "ColorGreen" - "border_default" "" - "border_armed" "" - "paintbackground" "0" - "defaultFgColor_override" "TanLight" - "armedFgColor_override" "Button Color" - "depressedFgColor_override" "Button Color" + "defaultBgColor_override" "Blank" + "defaultFgColor_override" "TanLight" + "armedBgColor_override" "Blank" + "armedFgColor_override" "ColorGreen" + "depressedBgColor_override" "Blank" + "depressedFgColor_override" "ColorGreen" } }
\ No newline at end of file diff --git a/resource/ui/hudupgradepanel.res b/resource/ui/hudupgradepanel.res index b6167d5..761738c 100644 --- a/resource/ui/hudupgradepanel.res +++ b/resource/ui/hudupgradepanel.res @@ -618,7 +618,7 @@ { "ControlName" "CExLabel" "fieldName" "UpgradeItemStatsLabel" - "font" "Cerbetica10" + "font" "HudFontSmallest" "labelText" "" "textAlignment" "north-west" "xpos" "30" @@ -655,7 +655,7 @@ { "ControlName" "CExLabel" "fieldName" "CreditsTextLabel" - "font" "Cerbetica10" + "font" "HudFontSmallest" "labelText" "#TF_PVE_UpgradeAmount" "textAlignment" "west" "xpos" "250" @@ -683,7 +683,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_PVE_UpgradeCancel" - "font" "Cerbetica10" + "font" "HudFontSmallest" "textAlignment" "center" "textinsetx" "50" "dulltext" "0" @@ -708,7 +708,7 @@ "enabled" "0" "tabPosition" "0" "labelText" "#TF_PVE_UpgradeDone" - "font" "Cerbetica10" + "font" "HudFontSmallest" "textAlignment" "center" "textinsetx" "50" "dulltext" "0" @@ -733,7 +733,7 @@ "enabled" "0" "tabPosition" "0" "labelText" "#TF_PVE_UpgradeRespec" - "font" "Cerbetica10" + "font" "HudFontSmallest" "textAlignment" "center" "textinsetx" "50" "dulltext" "0" diff --git a/resource/ui/itemquickswitch.res b/resource/ui/itemquickswitch.res index 9ec2a6e..f3a1fd3 100644 --- a/resource/ui/itemquickswitch.res +++ b/resource/ui/itemquickswitch.res @@ -5,9 +5,9 @@ "ControlName" "EditablePanel" "fieldName" "ItemQuickSwitchPanel" "xpos" "c-135" - "ypos" "330" + "ypos" "360" "wide" "270" - "tall" "140" + "tall" "115" "autoResize" "0" "pinCorner" "0" "visible" "0" @@ -134,7 +134,7 @@ "ControlName" "CLoadoutPresetPanel" "FieldName" "loadout_preset_panel" "xpos" "240" - "ypos" "15" + "ypos" "5" "zpos" "20" "wide" "25" "tall" "110" diff --git a/resource/ui/itemrenameconfirmationdialog.res b/resource/ui/itemrenameconfirmationdialog.res index 9467969..befe771 100644 --- a/resource/ui/itemrenameconfirmationdialog.res +++ b/resource/ui/itemrenameconfirmationdialog.res @@ -6,10 +6,10 @@ "visible" "1" "enabled" "1" "xpos" "c-200" - "ypos" "c-200" + "ypos" "105" "wide" "400" "tall" "240" - "bgcolor_override" "DarkerGrey" + "bgcolor_override" "DarkGrey" "paintbackgroundtype" "0" "settitlebarvisible" "0" "border" "CyanBorderThick" @@ -19,7 +19,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "HudFontSmall" + "font" "HudFontMediumBold" "labelText" "dynamic" "textAlignment" "center" "xpos" "100" @@ -153,7 +153,7 @@ { "ControlName" "CExLabel" "fieldName" "GivenName" - "font" "HudFontMediumSecondary" + "font" "HudFontSmall" "labelText" "%name%" "textAlignment" "center" "xpos" "20" @@ -196,7 +196,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" @@ -221,7 +221,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" diff --git a/resource/ui/itemrenamedialog.res b/resource/ui/itemrenamedialog.res index f8157c0..ec6c0a8 100644 --- a/resource/ui/itemrenamedialog.res +++ b/resource/ui/itemrenamedialog.res @@ -345,14 +345,14 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" "enabled" "1" "tabPosition" "0" "labelText" "#Cancel" - "font" "HudFontSmallBold" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -370,14 +370,14 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" "enabled" "1" "tabPosition" "0" "labelText" "#CraftNameOk" - "font" "HudFontSmallBold" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" diff --git a/resource/ui/itemrenameinvaliddialog.res b/resource/ui/itemrenameinvaliddialog.res index 3b14664..2c2ab6a 100644 --- a/resource/ui/itemrenameinvaliddialog.res +++ b/resource/ui/itemrenameinvaliddialog.res @@ -9,7 +9,7 @@ "ypos" "105" "wide" "400" "tall" "240" - "bgcolor_override" "DarkerGrey" + "bgcolor_override" "DarkGrey" "paintbackgroundtype" "0" "settitlebarvisible" "0" "border" "CyanBorderThick" @@ -19,7 +19,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "HudFontSmall" + "font" "HudFontMediumBold" "labelText" "dynamic" "textAlignment" "center" "xpos" "100" @@ -197,7 +197,7 @@ "ypos" "200" "zpos" "1" "wide" "130" - "tall" "25" + "tall" "20" "autoResize" "0" "pinCorner" "3" "visible" "1" diff --git a/resource/ui/mapinfomenu.res b/resource/ui/mapinfomenu.res index af4f992..c92e949 100644 --- a/resource/ui/mapinfomenu.res +++ b/resource/ui/mapinfomenu.res @@ -74,7 +74,7 @@ { "ControlName" "CExRichText" "fieldName" "MapInfoText" - "font" "Cerbetica12" + "font" "HudFontSmall" "xpos" "c-170" "ypos" "c-90" "zpos" "3" diff --git a/resource/ui/matchmakingdashboard.res b/resource/ui/matchmakingdashboard.res index d58d383..fb0bce6 100644 --- a/resource/ui/matchmakingdashboard.res +++ b/resource/ui/matchmakingdashboard.res @@ -333,7 +333,7 @@ "tall" "f0" "visible" "1" "enabled" "1" - "font" "HudFontSmallestBold" + "font" "HudFontSmall" "fgcolor_override" "TanLight" "textAlignment" "west" "labelText" "%queue_state%" @@ -396,7 +396,7 @@ "ControlName" "CExImageButton" "fieldName" "CloseButton" "xpos" "rs1-6" - "ypos" "11" + "ypos" "12" "zpos" "10" "wide" "14" "tall" "14" @@ -637,6 +637,7 @@ "defaultFgColor_override" "TanLight" "armedFgColor_override" "TanLight" + "image_drawcolor" "TanLight" "image_armedcolor" "TanLight" @@ -743,7 +744,6 @@ "textinsetx" "25" "textinsety" "5" "use_proportional_insets" "1" - "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" diff --git a/resource/ui/matchmakingdashboardmvmmodeselect.res b/resource/ui/matchmakingdashboardmvmmodeselect.res index dd30655..a10d0a6 100644 --- a/resource/ui/matchmakingdashboardmvmmodeselect.res +++ b/resource/ui/matchmakingdashboardmvmmodeselect.res @@ -141,8 +141,7 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - - "defaultBgColor_override" "HudBlack" + "defaultBgColor_override" "TransparentBlack" } "PlayForBraggingRightsExplanation" @@ -259,8 +258,7 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - - "defaultBgColor_override" "HudBlack" + "defaultBgColor_override" "TransparentBlack" } "PlayOnCommunityServerExplanation" diff --git a/resource/ui/matchmakingdashboardpopup_newmatch.res b/resource/ui/matchmakingdashboardpopup_newmatch.res index 59b3da4..becfea1 100644 --- a/resource/ui/matchmakingdashboardpopup_newmatch.res +++ b/resource/ui/matchmakingdashboardpopup_newmatch.res @@ -15,7 +15,7 @@ "mouseinputenabled" "1" "collapsed_height" "0" - "expanded_height" "30" + "expanded_height" "60" "pinCorner" "2" "autoResize" "1" @@ -91,7 +91,7 @@ "tall" "20" "visible" "1" "enabled" "1" - "font" "Cerbetica12" + "font" "HudFontSmall" "fgcolor_override" "TanLight" "textAlignment" "center" "labelText" "%auto_join%" @@ -113,7 +113,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "font" "HudFontSmallest" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -150,7 +150,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "font" "HudFontSmallest" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -180,7 +180,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "font" "HudFontSmallest" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -206,7 +206,7 @@ "tall" "20" "visible" "1" "enabled" "1" - "font" "HudFontSmallest" + "font" "HudFontSmall" "fgcolor_override" "TanLight" "textAlignment" "east" "labelText" "#TF_Matchmaking_RollingQueue_MatchReadyJoining" diff --git a/resource/ui/matchmakingdashboardsidepanel.res b/resource/ui/matchmakingdashboardsidepanel.res index 5e92123..b30a70a 100644 --- a/resource/ui/matchmakingdashboardsidepanel.res +++ b/resource/ui/matchmakingdashboardsidepanel.res @@ -97,7 +97,7 @@ "proportionaltoparent" "1" "command" "nav_close" "textAlignment" "east" - "font" "Cerbetica14" + "font" "HudFontSmall" "armedBgColor_override" "Transparent" "defaultBgColor_override" "Transparent" @@ -126,7 +126,7 @@ "command" "nav_to" "labelText" "<" "textAlignment" "west" - "font" "Cerbetica14" + "font" "HudFontSmall" "armedBgColor_override" "Transparent" "defaultBgColor_override" "Transparent" diff --git a/resource/ui/mvmcreditspendpanel.res b/resource/ui/mvmcreditspendpanel.res index 950b67e..2c1e8cb 100644 --- a/resource/ui/mvmcreditspendpanel.res +++ b/resource/ui/mvmcreditspendpanel.res @@ -24,7 +24,7 @@ "wide" "190" "tall" "42" "visible" "1" - "bgcolor_override" "TransparentBlack" + "bgcolor_override" "Transparent" } "UpgradesLabel" @@ -34,9 +34,9 @@ "font" "HudFontSmall" "labelText" "#TF_PVE_Upgrades" "textAlignment" "north-west" - "xpos" "10" + "xpos" "0" "ypos" "15" - "wide" "90" + "wide" "70" "tall" "20" "fgcolor" "TanLight" } @@ -48,7 +48,7 @@ "font" "HudFontSmall" "labelText" "%upgrades%" "textAlignment" "north-east" - "xpos" "100" + "xpos" "75" "ypos" "15" "wide" "30" "tall" "20" @@ -62,9 +62,9 @@ "font" "HudFontSmall" "labelText" "#TF_PVE_Buybacks" "textAlignment" "north-west" - "xpos" "10" + "xpos" "0" "ypos" "27" - "wide" "90" + "wide" "70" "tall" "20" "fgcolor" "TanLight" } @@ -76,7 +76,7 @@ "font" "HudFontSmall" "labelText" "%buybacks%" "textAlignment" "north-east" - "xpos" "100" + "xpos" "75" "ypos" "27" "wide" "30" "tall" "20" @@ -90,9 +90,9 @@ "font" "HudFontSmall" "labelText" "#TF_PVE_Bottles" "textAlignment" "north-west" - "xpos" "10" + "xpos" "0" "ypos" "39" - "wide" "90" + "wide" "70" "tall" "20" "fgcolor" "TanLight" } @@ -104,7 +104,7 @@ "font" "HudFontSmall" "labelText" "%bottles%" "textAlignment" "north-east" - "xpos" "100" + "xpos" "75" "ypos" "39" "wide" "30" "tall" "20" diff --git a/resource/ui/mvmcreditsubpanel.res b/resource/ui/mvmcreditsubpanel.res index 2f23c00..e36437f 100644 --- a/resource/ui/mvmcreditsubpanel.res +++ b/resource/ui/mvmcreditsubpanel.res @@ -24,7 +24,7 @@ "wide" "190" "tall" "42" "visible" "1" - "bgcolor_override" "20 20 20 200" + "bgcolor_override" "Transparent" } "CreditCollectedTextLabel" @@ -34,7 +34,7 @@ "font" "HudFontSmall" "labelText" "#TF_PVE_Collected" "textAlignment" "north-west" - "xpos" "9" + "xpos" "0" "ypos" "15" "wide" "70" "tall" "12" @@ -48,7 +48,7 @@ "font" "HudFontSmall" "labelText" "%creditscollected%" "textAlignment" "north-east" - "xpos" "100" + "xpos" "75" "ypos" "15" "wide" "30" "tall" "12" @@ -62,7 +62,7 @@ "font" "HudFontSmall" "labelText" "#TF_PVE_Missed" "textAlignment" "north-west" - "xpos" "10" + "xpos" "0" "ypos" "27" "wide" "70" "tall" "12" @@ -76,7 +76,7 @@ "font" "HudFontSmall" "labelText" "%creditsmissed%" "textAlignment" "north-east" - "xpos" "100" + "xpos" "75" "ypos" "27" "wide" "30" "tall" "12" @@ -90,7 +90,7 @@ "font" "HudFontSmall" "labelText" "#TF_PVE_Bonus" "textAlignment" "north-west" - "xpos" "10" + "xpos" "0" "ypos" "39" "wide" "70" "tall" "12" @@ -104,7 +104,7 @@ "font" "HudFontSmall" "labelText" "%creditbonus%" "textAlignment" "north-east" - "xpos" "100" + "xpos" "75" "ypos" "39" "wide" "30" "tall" "12" @@ -118,8 +118,8 @@ "font" "HudFontMediumBold" "labelText" "%rating%" "textAlignment" "center" - "xpos" "125" - "ypos" "25" + "xpos" "66" + "ypos" "-3" "zpos" "1" "wide" "70" "tall" "20" diff --git a/resource/ui/mvminworldcurrency.res b/resource/ui/mvminworldcurrency.res index 7373fad..22ee96f 100644 --- a/resource/ui/mvminworldcurrency.res +++ b/resource/ui/mvminworldcurrency.res @@ -11,7 +11,7 @@ "tall" "20" "visible" "1" "enabled" "1" - "bgcolor_override" "0 0 0 200" + "bgcolor_override" "TransparentBlack" "PaintBackgroundType" "2" } @@ -19,7 +19,7 @@ { "ControlName" "CExLabel" "fieldName" "CurrencyLabel" - "font" "Cerbetica14" + "font" "HudFontSmall" "fgcolor" "TanLight" "xpos" "4" "ypos" "0" @@ -36,7 +36,7 @@ { "ControlName" "CExLabel" "fieldName" "CurrencyGood" - "font" "Cerbetica14" + "font" "HudFontSmall" "fgcolor" "CreditsGreen" "xpos" "45" "ypos" "0" @@ -53,7 +53,7 @@ { "ControlName" "CExLabel" "fieldName" "CurrencyBad" - "font" "Cerbetica14" + "font" "HudFontSmall" "fgcolor" "225 30 30 255" "xpos" "45" "ypos" "0" diff --git a/resource/ui/mvmscoreboard.res b/resource/ui/mvmscoreboard.res index 367d7e9..e72987f 100644 --- a/resource/ui/mvmscoreboard.res +++ b/resource/ui/mvmscoreboard.res @@ -49,7 +49,7 @@ "PlayerListBG" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "PlayerListBG" "xpos" "c-270" "ypos" "244" @@ -59,7 +59,8 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fillcolor" "TransparentBlack" + "bgcolor_override" "TransparentBlack" + "PaintBackgroundType" "0" } "MvMPlayerList" @@ -109,6 +110,21 @@ "draw_corner_width" "0" "draw_corner_height" "0" } + "CreditStatsBG" + { + "ControlName" "EditablePanel" + "fieldName" "CreditStatsBG" + "xpos" "0" + "ypos" "25" + "zpos" "-1" + "wide" "335" + "tall" "115" + "visible" "1" + "enabled" "1" + "bgcolor_override" "TransparentBlack" + "PaintBackgroundType" "2" + + } "CreditsLabel" { diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res index 8187b87..8a211f8 100644 --- a/resource/ui/objectivestatusescort.res +++ b/resource/ui/objectivestatusescort.res @@ -510,14 +510,6 @@ "visible" "0" "enabled" "0" - "if_multiple_trains" - { - "xpos" "9999" - "ypos" "9999" - "wide" "65" - "tall" "42" - } - "Teardrop" { "ControlName" "CIconPanel" @@ -527,7 +519,7 @@ "zpos" "0" "wide" "34" "tall" "41" - "visible" "1" + "visible" "0" "enabled" "1" "scaleImage" "1" "icon" "cappoint_progressbar_teardrop" diff --git a/resource/ui/pvprankpanel.res b/resource/ui/pvprankpanel.res index 2dda030..b76491c 100644 --- a/resource/ui/pvprankpanel.res +++ b/resource/ui/pvprankpanel.res @@ -409,7 +409,6 @@ "progress" "0" "fgcolor_override" "CreditsGreen" - "bgcolor_override" "0 0 0 0" } "Frame" diff --git a/resource/ui/replaybrowser/mainpanel.res b/resource/ui/replaybrowser/mainpanel.res index a88c053..e29e45a 100644 --- a/resource/ui/replaybrowser/mainpanel.res +++ b/resource/ui/replaybrowser/mainpanel.res @@ -161,7 +161,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "Back (&Q)" - "font" "HudFontSmallBold" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" diff --git a/resource/ui/spectator.res b/resource/ui/spectator.res index cd49e19..d18efc5 100644 --- a/resource/ui/spectator.res +++ b/resource/ui/spectator.res @@ -70,7 +70,7 @@ "enabled" "1" "labelText" "#game_respawntime_in_secs" "textAlignment" "center" - "font" "Cerbetica24" + "font" "HudFontMedium" } "BuyBackLabel" @@ -87,9 +87,7 @@ "enabled" "1" "labelText" "#TF_PVE_Buyback" "textAlignment" "center" - "wrap" "1" - "centerwrap" "1" - "font" "Cerbetica24" + "font" "HudFontMedium" if_mvm { @@ -209,7 +207,7 @@ { "ControlName" "Label" "fieldName" "ItemLabel" - "font" "Cerbetica12" + "font" "HudFontSmallest" "xpos" "10" "ypos" "3" "zpos" "1" diff --git a/resource/ui/spectatortournament.res b/resource/ui/spectatortournament.res index 309bea5..853ac9d 100644 --- a/resource/ui/spectatortournament.res +++ b/resource/ui/spectatortournament.res @@ -329,10 +329,6 @@ "labelText" "#game_respawntime_in_secs" "textAlignment" "center" "font" "Cerbetica24" - - if_mvm{ - "ypos" "82" - } } "BuyBackLabel" { @@ -370,49 +366,19 @@ "fieldName" "ClassOrTeamLabel" "visible" "0" } - "SwitchCamModeKeyLabel" - { - "ControlName" "CExLabel" - "fieldName" "SwitchCamModeKeyLabel" - "visible" "0" - - } - "SwitchCamModeLabel" - { - "ControlName" "CExLabel" - "fieldName" "SwitchCamModeLabel" - "visible" "0" - } "CycleTargetFwdKeyLabel" { "ControlName" "CExLabel" "fieldName" "CycleTargetFwdKeyLabel" "visible" "0" } - "CycleTargetFwdLabel" - { - "ControlName" "CExLabel" - "fieldName" "CycleTargetFwdLabel" - "visible" "0" - } "CycleTargetRevKeyLabel" { "ControlName" "CExLabel" "fieldName" "CycleTargetRevKeyLabel" "visible" "0" } - "CycleTargetRevLabel" - { - "ControlName" "CExLabel" - "fieldName" "CycleTargetRevLabel" - "visible" "0" - } - "TipLabel" - { - "ControlName" "CExLabel" - "fieldName" "TipLabel" - "visible" "0" - } + "itempanel" { "ControlName" "CItemModelPanel" @@ -441,38 +407,6 @@ "resize_to_text" "1" "text_forcesize" "2" - "ItemBackground" - { - "ControlName" "ImagePanel" - "fieldName" "ItemBackground" - "xpos" "0" - "ypos" "0" - "zpos" "-1" - "wide" "240" - "tall" "900" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "fillcolor" "0 0 0 100" - } - - "TitleBackground" - { - "ControlName" "ImagePanel" - "fieldName" "TitleBackground" - "xpos" "4" - "ypos" "4" - "zpos" "-1" - "wide" "232" - "tall" "14" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "fillcolor" "0 0 0 100" - } - "itemmodelpanel" { "fieldName" "itemmodelpanel" @@ -501,18 +435,4 @@ "brighttext" "0" } } - - "spectator_extras" - { - "ControlName" "EditablePanel" - "fieldName" "spectator_extras" - "xpos" "0" - "ypos" "0" - "wide" "f0" - "tall" "480" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - } }
\ No newline at end of file diff --git a/resource/ui/spectatortournamentguihealth.res b/resource/ui/spectatortournamentguihealth.res index 92aebb2..3a023e4 100644 --- a/resource/ui/spectatortournamentguihealth.res +++ b/resource/ui/spectatortournamentguihealth.res @@ -59,8 +59,8 @@ { "ControlName" "CExLabel" "fieldName" "GuiPlayerHealthShadow" - "xpos" "2" - "ypos" "2" + "xpos" "-1" + "ypos" "-2" "zpos" "4" "wide" "25" "tall" "16" diff --git a/resource/ui/steamworkshopdialog.res b/resource/ui/steamworkshopdialog.res index 09c1959..06516ae 100644 --- a/resource/ui/steamworkshopdialog.res +++ b/resource/ui/steamworkshopdialog.res @@ -101,7 +101,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "Cerbetica22" + "font" "HudFontSmall" "labelText" "#TF_SteamWorkshop_Title" "textAlignment" "center" "xpos" "0" @@ -151,7 +151,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_SteamWorkshop_LearnHow" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "center" "Command" "learn_more" "sound_depressed" "UI/buttonclick.wav" @@ -262,7 +262,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "<" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -275,7 +275,7 @@ { "ControlName" "CExLabel" "fieldName" "CurPageLabel" - "font" "Cerbetica12" + "font" "HudFontSmall" "labelText" "%page%" "textAlignment" "center" "xpos" "460" @@ -305,7 +305,7 @@ "enabled" "1" "tabPosition" "0" "labelText" ">" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -329,7 +329,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_SteamWorkshop_ViewPublished" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "center" "textinsetx" "50" "dulltext" "0" @@ -355,7 +355,7 @@ "tabPosition" "0" "textinsetx" "25" "use_proportional_insets" "1" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "west" "dulltext" "0" "brighttext" "0" @@ -400,7 +400,7 @@ "tabPosition" "0" "textinsetx" "25" "use_proportional_insets" "1" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "west" "dulltext" "0" "brighttext" "0" @@ -445,7 +445,7 @@ "tabPosition" "0" "textinsetx" "25" "use_proportional_insets" "1" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "west" "dulltext" "0" "brighttext" "0" @@ -491,7 +491,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_SteamWorkshop_BrowseTheWorkshop" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "center" "Command" "browse" "sound_depressed" "UI/buttonclick.wav" @@ -514,7 +514,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_SteamWorkshop_Test" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "center" "Command" "itemtest" "sound_depressed" "UI/buttonclick.wav" @@ -537,7 +537,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_SteamWorkshop_Publish" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "center" "Command" "publish" "sound_depressed" "UI/buttonclick.wav" @@ -560,7 +560,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_SteamWorkshop_Instructions" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "center" "Command" "learn_more" "sound_depressed" "UI/buttonclick.wav" @@ -583,7 +583,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#TF_SteamWorkshop_Legal" - "font" "Cerbetica12" + "font" "HudFontSmall" "textAlignment" "center" "textinsetx" "50" "dulltext" "0" @@ -608,8 +608,8 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "#Store_CANCEL" - "font" "Cerbetica12" + "labelText" "#TF_Close" + "font" "HudFontSmall" "textAlignment" "center" "textinsetx" "50" "dulltext" "0" diff --git a/resource/ui/targetid.res b/resource/ui/targetid.res index 9c79d31..de60c3c 100644 --- a/resource/ui/targetid.res +++ b/resource/ui/targetid.res @@ -204,7 +204,7 @@ "visible" "1" "enabled" "1" "icon" "obj_status_alert_background_tall_nocolor" - "iconColor" "65 65 65 255" + "iconColor" "TransparentBlack" "scaleImage" "1" } @@ -239,31 +239,11 @@ "scaleImage" "1" } - "MoveableKeyText" - { - "ControlName" "CExLabel" - "fieldName" "MoveableKeyText" - "font_minmode" "Cerbetica12" - "xpos" "0" - "ypos" "0" - "zpos" "6" - "wide" "12" - "tall" "0" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "Pick Up" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - } - "MoveableKeyLabel" { "ControlName" "Label" "fieldName" "MoveableKeyLabel" - "font" "Cerbetica12" + "font" "HudFontSmallest" "xpos" "0" "ypos" "29" "zpos" "6" @@ -273,7 +253,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "labelText" "%movekey%" + "labelText" "" "textAlignment" "center" "dulltext" "0" "brighttext" "0" diff --git a/resource/ui/testitemroot.res b/resource/ui/testitemroot.res index 5d04e8e..56ee3ba 100644 --- a/resource/ui/testitemroot.res +++ b/resource/ui/testitemroot.res @@ -20,7 +20,7 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "HudFontMediumBold" + "font" "HudFontMedium" "labelText" "#IT_Title" "textAlignment" "north" "xpos" "0" @@ -70,7 +70,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox0" "labelText" "#IT_Classes_All" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "45" "ypos" "15" @@ -90,7 +90,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox1" "labelText" "#TF_Class_Name_Scout" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "145" "ypos" "15" @@ -110,7 +110,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox2" "labelText" "#TF_Class_Name_Sniper" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "220" "ypos" "15" @@ -130,7 +130,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox3" "labelText" "#TF_Class_Name_Soldier" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "295" "ypos" "15" @@ -150,7 +150,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox4" "labelText" "#TF_Class_Name_Demoman" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "145" "ypos" "40" @@ -170,7 +170,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox5" "labelText" "#TF_Class_Name_Medic" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "220" "ypos" "40" @@ -190,7 +190,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox6" "labelText" "#TF_Class_Name_HWGuy" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "295" "ypos" "40" @@ -210,7 +210,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox7" "labelText" "#TF_Class_Name_Pyro" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "145" "ypos" "65" @@ -230,7 +230,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox8" "labelText" "#TF_Class_Name_Spy" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "220" "ypos" "65" @@ -250,7 +250,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox9" "labelText" "#TF_Class_Name_Engineer" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "295" "ypos" "65" @@ -318,7 +318,7 @@ { "ControlName" "CExLabel" "fieldName" "TestItemEntry0" - "font" "HudFontSmallestBold" + "font" "HudFontSmallest" "labelText" "#IT_TestingSlot_Empty" "textAlignment" "center" "xpos" "95" @@ -385,7 +385,7 @@ { "ControlName" "CExLabel" "fieldName" "TestingHeadgearLabel" - "font" "HudFontSmallestBold" + "font" "HudFontSmallest" "labelText" "#IT_TestingSlot_Headgear" "textAlignment" "east" "xpos" "0" @@ -402,7 +402,7 @@ { "ControlName" "CExLabel" "fieldName" "TestItemEntry1" - "font" "HudFontSmallestBold" + "font" "HudFontSmallest" "labelText" "#IT_TestingSlot_Empty" "textAlignment" "center" "xpos" "95" @@ -469,7 +469,7 @@ { "ControlName" "CExLabel" "fieldName" "TestingMisc1Label" - "font" "HudFontSmallestBold" + "font" "HudFontSmallest" "labelText" "#IT_TestingSlot_Misc1" "textAlignment" "east" "xpos" "0" @@ -486,7 +486,7 @@ { "ControlName" "CExLabel" "fieldName" "TestItemEntry2" - "font" "HudFontSmallestBold" + "font" "HudFontSmallest" "labelText" "#IT_TestingSlot_Empty" "textAlignment" "center" "xpos" "95" @@ -553,7 +553,7 @@ { "ControlName" "CExLabel" "fieldName" "TestingMisc2Label" - "font" "HudFontSmallestBold" + "font" "HudFontSmallest" "labelText" "#IT_TestingSlot_Misc2" "textAlignment" "east" "xpos" "0" @@ -570,7 +570,7 @@ { "ControlName" "CExLabel" "fieldName" "TestItemEntry3" - "font" "HudFontSmallestBold" + "font" "HudFontSmallest" "labelText" "#IT_TestingSlot_Empty" "textAlignment" "center" "xpos" "95" @@ -670,7 +670,7 @@ "ControlName" "CheckButton" "fieldName" "AutoAddBotsCheckBox" "labelText" "#IT_Bot_AutoAdd" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "10" "ypos" "20" @@ -691,7 +691,7 @@ "ControlName" "CheckButton" "fieldName" "AutoAddBotsCheckBox" "labelText" "#IT_Bot_BlueTeam" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "textAlignment" "west" "xpos" "110" "ypos" "20" @@ -736,7 +736,7 @@ { "ControlName" "ComboBox" "fieldName" "BotSelectionComboBox" - "Font" "HudFontSmallestBold" + "Font" "HudFontSmallest" "xpos" "95" "ypos" "45" "zpos" "1" @@ -815,7 +815,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#IT_ExportLoadout" - "font" "HudFontSmallBold" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -840,7 +840,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#IT_ImportLoadout" - "font" "HudFontSmallBold" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -865,7 +865,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#IT_ImportLast" - "font" "HudFontSmallBold" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -890,7 +890,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#Cancel" - "font" "HudFontSmallBold" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -915,7 +915,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "#IT_Ok" - "font" "HudFontSmallBold" + "font" "HudFontSmall" "textAlignment" "center" "dulltext" "0" "brighttext" "0" @@ -953,7 +953,7 @@ "textinsetx" "25" "textalignment" "center" "use_proportional_insets" "1" - "font" "HudFontSmallBold" + "font" "HudFontSmall" "textAlignment" "west" "dulltext" "0" "brighttext" "0" @@ -1000,7 +1000,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "R" - "font" "HudFontSmallestBold" + "font" "HudFontSmall" "textAlignment" "center" "textinsetx" "50" "dulltext" "0" diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res index 38d6a73..93fb1e5 100644 --- a/scripts/hudlayout.res +++ b/scripts/hudlayout.res @@ -50,7 +50,7 @@ "visible" "1" "enabled" "1" "xpos" "0" - "ypos" "1" + "ypos" "0" "wide" "f0" "tall" "480" } @@ -262,7 +262,7 @@ "fieldName" "DisguiseStatus" "visible" "1" "enabled" "1" - "xpos" "c55" + "xpos" "15" "ypos" "r40" "wide" "150" "tall" "30" @@ -326,7 +326,7 @@ "visible" "1" "enabled" "1" "xpos" "0" - "ypos" "c-100" + "ypos" "c70" "wide" "640" "tall" "480" "PaintBackgroundType" "2" @@ -471,7 +471,7 @@ "visible" "1" "enabled" "1" "xpos" "r592" - "ypos" "20" + "ypos" "22" "wide" "580" "tall" "468" "MaxDeathNotices" "5" @@ -485,7 +485,7 @@ "TeamRed" "HUDRedTeamSolid" "IconColor" "HudWhite" "LocalPlayerColor" "65 65 65 255" - "BaseBackgroundColor" "46 43 42 175" + "BaseBackgroundColor" "TransparentBlack" "LocalBackgroundColor" "245 229 196 200" } @@ -1037,10 +1037,10 @@ "fieldName" "HudArenaNotification" "visible" "0" "enabled" "1" - "xpos" "c-160" + "xpos" "c-140" "ypos" "75" - "wide" "320" - "tall" "150" + "wide" "280" + "tall" "75" } HudArenaCapPointCountdown @@ -1073,13 +1073,9 @@ "enabled" "1" "xpos" "c-125" "ypos" "0" - "xpos_minmode" "0" - "ypos_minmode" "0" "zpos" "12" "wide" "250" "tall" "80" - "wide_minmode" "f0" - "tall_minmode" "480" } HudTournamentSetup @@ -1087,10 +1083,10 @@ "fieldName" "HudTournamentSetup" "visible" "0" "enabled" "1" - "xpos" "c-90" + "xpos" "c0" "ypos" "-70" "wide" "180" - "tall" "65" + "tall" "55" } HudStopWatch @@ -1098,7 +1094,7 @@ "fieldName" "HudStopWatch" "visible" "1" "enabled" "1" - "xpos" "c-40" + "xpos" "c-44" "ypos" "27" "zpos" "0" "wide" "80" |