diff options
| author | CriticalFlaw <[email protected]> | 2021-04-14 23:19:28 -0400 |
|---|---|---|
| committer | CriticalFlaw <[email protected]> | 2021-04-14 23:19:28 -0400 |
| commit | 3d9d0684b148d5b834aacd90482a504fd64f27a6 (patch) | |
| tree | 71162e4b023e8efe115597121b520e842ba1be53 | |
| parent | 1d131b0e92939a7893e7ea7efd54d7379674cce0 (diff) | |
Customizations Update
- Reworked how customizations work. Now customization files must be moved into the #customizations/_enabled folder to be enabled. This effectively makes the hud incompatible with the older version of the editor/installer, so please update to the latest version (2.0)
- Fixed a black bar appearing in tournament mode (#163)
- Fixed the class selection page not display class limits.
- Bumped version number.
| -rw-r--r-- | #customizations/_stock/classselection.res (renamed from customizations/team_menu/classselection.res) | 36 | ||||
| -rw-r--r-- | #customizations/_stock/hudplayerclass.res (renamed from customizations/player_model/hudplayerclass.res) | 0 | ||||
| -rw-r--r-- | #customizations/_stock/hudplayerhealth.res (renamed from customizations/player_health/hudplayerhealth.res) | 0 | ||||
| -rw-r--r-- | #customizations/_stock/mainmenuoverride.res (renamed from customizations/main_menu/mainmenuoverride.res) | 0 | ||||
| -rw-r--r-- | #customizations/_stock/scoreboard.res (renamed from customizations/scoreboards/scoreboard.res) | 0 | ||||
| -rw-r--r-- | #customizations/_stock/teammenu.res (renamed from customizations/team_menu/teammenu.res) | 0 | ||||
| -rw-r--r-- | #customizations/classselection-center.res (renamed from customizations/team_menu/classselection-center.res) | 36 | ||||
| -rw-r--r-- | #customizations/hudplayerclass-left.res (renamed from customizations/player_model/hudplayerclass-left.res) | 0 | ||||
| -rw-r--r-- | #customizations/hudplayerhealth-broesel.res (renamed from customizations/player_health/hudplayerhealth-broesel.res) | 0 | ||||
| -rw-r--r-- | #customizations/hudplayerhealth-cross.res (renamed from customizations/player_health/hudplayerhealth-cross.res) | 0 | ||||
| -rw-r--r-- | #customizations/mainmenuoverride-classic.res (renamed from customizations/main_menu/mainmenuoverride-classic.res) | 34 | ||||
| -rw-r--r-- | #customizations/scoreboard-minimal.res (renamed from customizations/scoreboards/scoreboard-minimal.res) | 0 | ||||
| -rw-r--r-- | #customizations/teammenu-center.res (renamed from customizations/team_menu/teammenu-center.res) | 0 | ||||
| -rw-r--r-- | materials/console/background_classic.vtf (renamed from materials/console/backgrounds/background_classic.vtf) | bin | 2796384 -> 2796384 bytes | |||
| -rw-r--r-- | materials/console/background_classic_widescreen.vtf (renamed from materials/console/backgrounds/background_classic_widescreen.vtf) | bin | 2796384 -> 2796384 bytes | |||
| -rw-r--r-- | materials/console/background_modern.vtf (renamed from materials/console/backgrounds/background_modern.vtf) | bin | 2796384 -> 2796384 bytes | |||
| -rw-r--r-- | materials/console/background_modern_widescreen.vtf (renamed from materials/console/backgrounds/background_modern_widescreen.vtf) | bin | 2796384 -> 2796384 bytes | |||
| -rw-r--r-- | materials/console/background_upward.vmt | 2 | ||||
| -rw-r--r-- | materials/console/background_upward_widescreen.vmt | 2 | ||||
| -rw-r--r-- | resource/ui/classselection.res | 4 | ||||
| -rw-r--r-- | resource/ui/hudplayerclass.res | 4 | ||||
| -rw-r--r-- | resource/ui/hudplayerhealth.res | 6 | ||||
| -rw-r--r-- | resource/ui/hudtournament.res | 38 | ||||
| -rw-r--r-- | resource/ui/mainmenuoverride.res | 6 | ||||
| -rw-r--r-- | resource/ui/scoreboard.res | 4 | ||||
| -rw-r--r-- | resource/ui/teammenu.res | 4 |
26 files changed, 78 insertions, 98 deletions
diff --git a/customizations/team_menu/classselection.res b/#customizations/_stock/classselection.res index 6ec2ea4..fc413d4 100644 --- a/customizations/team_menu/classselection.res +++ b/#customizations/_stock/classselection.res @@ -736,7 +736,7 @@ "xpos" "175" "ypos" "275" "zpos" "5" - "wide" "10" + "wide" "80" "tall" "16" "autoResize" "1" "pinCorner" "2" @@ -744,7 +744,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "%numScout%" - "textAlignment" "center" + "textAlignment" "west" "font" "Cerbetica16" "fgcolor" "235 226 202 255" } @@ -756,7 +756,7 @@ "xpos" "175" "ypos" "291" "zpos" "5" - "wide" "10" + "wide" "80" "tall" "16" "autoResize" "1" "pinCorner" "2" @@ -764,7 +764,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "%numSoldier%" - "textAlignment" "center" + "textAlignment" "west" "font" "Cerbetica16" "fgcolor" "235 226 202 255" } @@ -776,7 +776,7 @@ "xpos" "175" "ypos" "307" "zpos" "5" - "wide" "10" + "wide" "80" "tall" "16" "autoResize" "1" "pinCorner" "2" @@ -784,7 +784,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "%numPyro%" - "textAlignment" "center" + "textAlignment" "west" "font" "Cerbetica16" "fgcolor" "235 226 202 255" } @@ -796,7 +796,7 @@ "xpos" "175" "ypos" "327" "zpos" "5" - "wide" "10" + "wide" "80" "tall" "16" "autoResize" "1" "pinCorner" "2" @@ -804,7 +804,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "%numDemoman%" - "textAlignment" "center" + "textAlignment" "west" "font" "Cerbetica16" "fgcolor" "235 226 202 255" } @@ -816,7 +816,7 @@ "xpos" "175" "ypos" "343" "zpos" "5" - "wide" "10" + "wide" "80" "tall" "16" "autoResize" "1" "pinCorner" "2" @@ -824,7 +824,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "%numHeavy%" - "textAlignment" "center" + "textAlignment" "west" "font" "Cerbetica16" "fgcolor" "235 226 202 255" } @@ -836,7 +836,7 @@ "xpos" "175" "ypos" "359" "zpos" "5" - "wide" "10" + "wide" "80" "tall" "16" "autoResize" "1" "pinCorner" "2" @@ -844,7 +844,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "%numEngineer%" - "textAlignment" "center" + "textAlignment" "west" "font" "Cerbetica16" "fgcolor" "235 226 202 255" } @@ -856,7 +856,7 @@ "xpos" "175" "ypos" "379" "zpos" "5" - "wide" "10" + "wide" "80" "tall" "16" "autoResize" "1" "pinCorner" "2" @@ -864,7 +864,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "%numMedic%" - "textAlignment" "center" + "textAlignment" "west" "font" "Cerbetica16" "fgcolor" "235 226 202 255" } @@ -876,7 +876,7 @@ "xpos" "175" "ypos" "395" "zpos" "5" - "wide" "10" + "wide" "80" "tall" "16" "autoResize" "1" "pinCorner" "2" @@ -884,7 +884,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "%numSniper%" - "textAlignment" "center" + "textAlignment" "west" "font" "Cerbetica16" "fgcolor" "235 226 202 255" } @@ -896,7 +896,7 @@ "xpos" "175" "ypos" "411" "zpos" "5" - "wide" "10" + "wide" "80" "tall" "16" "autoResize" "1" "pinCorner" "2" @@ -904,7 +904,7 @@ "enabled" "1" "tabPosition" "0" "labelText" "%numSpy%" - "textAlignment" "center" + "textAlignment" "west" "font" "Cerbetica16" "fgcolor" "235 226 202 255" } diff --git a/customizations/player_model/hudplayerclass.res b/#customizations/_stock/hudplayerclass.res index d476dab..d476dab 100644 --- a/customizations/player_model/hudplayerclass.res +++ b/#customizations/_stock/hudplayerclass.res diff --git a/customizations/player_health/hudplayerhealth.res b/#customizations/_stock/hudplayerhealth.res index b514365..b514365 100644 --- a/customizations/player_health/hudplayerhealth.res +++ b/#customizations/_stock/hudplayerhealth.res diff --git a/customizations/main_menu/mainmenuoverride.res b/#customizations/_stock/mainmenuoverride.res index 44caa70..44caa70 100644 --- a/customizations/main_menu/mainmenuoverride.res +++ b/#customizations/_stock/mainmenuoverride.res diff --git a/customizations/scoreboards/scoreboard.res b/#customizations/_stock/scoreboard.res index ad97352..ad97352 100644 --- a/customizations/scoreboards/scoreboard.res +++ b/#customizations/_stock/scoreboard.res diff --git a/customizations/team_menu/teammenu.res b/#customizations/_stock/teammenu.res index 9368fb8..9368fb8 100644 --- a/customizations/team_menu/teammenu.res +++ b/#customizations/_stock/teammenu.res diff --git a/customizations/team_menu/classselection-center.res b/#customizations/classselection-center.res index c2c587f..c797213 100644 --- a/customizations/team_menu/classselection-center.res +++ b/#customizations/classselection-center.res @@ -85,83 +85,65 @@ } "numScout" { - "xpos" "c158" + "xpos" "c185" "ypos" "164" - "wide" "100" "tall" "12" - "textAlignment" "center" } "numSoldier" { - "xpos" "c158" + "xpos" "c185" "ypos" "180" - "wide" "100" "tall" "12" - "textAlignment" "center" } "numPyro" { - "xpos" "c158" + "xpos" "c185" "ypos" "196" - "wide" "100" "tall" "12" - "textAlignment" "center" } "numDemoman" { - "xpos" "c158" + "xpos" "c185" "ypos" "212" - "wide" "100" "tall" "12" - "textAlignment" "center" } "numHeavy" { - "xpos" "c158" + "xpos" "c185" "ypos" "232" - "wide" "100" "tall" "12" - "textAlignment" "center" } "numEngineer" { - "xpos" "c158" + "xpos" "c185" "ypos" "248" - "wide" "100" "tall" "12" - "textAlignment" "center" } "numMedic" { - "xpos" "c158" + "xpos" "c185" "ypos" "264" - "wide" "100" "tall" "12" - "textAlignment" "center" } "numSniper" { - "xpos" "c158" + "xpos" "c185" "ypos" "284" - "wide" "100" "tall" "12" - "textAlignment" "center" } "numSpy" { - "xpos" "c158" + "xpos" "c185" "ypos" "300" - "wide" "100" "tall" "12" - "textAlignment" "center" } "MvMUpgradeImageScout" diff --git a/customizations/player_model/hudplayerclass-left.res b/#customizations/hudplayerclass-left.res index ab0c98f..ab0c98f 100644 --- a/customizations/player_model/hudplayerclass-left.res +++ b/#customizations/hudplayerclass-left.res diff --git a/customizations/player_health/hudplayerhealth-broesel.res b/#customizations/hudplayerhealth-broesel.res index 6351d22..6351d22 100644 --- a/customizations/player_health/hudplayerhealth-broesel.res +++ b/#customizations/hudplayerhealth-broesel.res diff --git a/customizations/player_health/hudplayerhealth-cross.res b/#customizations/hudplayerhealth-cross.res index 2febbec..2febbec 100644 --- a/customizations/player_health/hudplayerhealth-cross.res +++ b/#customizations/hudplayerhealth-cross.res diff --git a/customizations/main_menu/mainmenuoverride-classic.res b/#customizations/mainmenuoverride-classic.res index 22b0bd1..ca470ec 100644 --- a/customizations/main_menu/mainmenuoverride-classic.res +++ b/#customizations/mainmenuoverride-classic.res @@ -172,6 +172,40 @@ } } + "HudName" + { + "ControlName" "CExImageButton" + "fieldName" "HudName" + "xpos" "9999" + "ypos" "58" + "zpos" "1" + "wide" "56" + "tall" "25" + "autoResize" "0" + "pinCorner" "3" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "rayshud" + "font" "HudFontMediumSecondary" + "textAlignment" "west" + "textinsetx" "0" + "use_proportional_insets" "1" + "dulltext" "0" + "brighttext" "0" + "default" "1" + "paintbackground""0" + "sound_depressed" "" + "sound_released" "UI/wooo_tree.wav" + + "defaultFgColor_override" "235 226 202 255" + "armedFgColor_override" "72 255 255 255" + "depressedFgColor_override" "72 255 255 255" + + "image_drawcolor" "235 226 202 255" + "image_armedcolor" "72 255 255 255" + } + "TFLogoImage" { "ControlName" "ImagePanel" diff --git a/customizations/scoreboards/scoreboard-minimal.res b/#customizations/scoreboard-minimal.res index cfde065..cfde065 100644 --- a/customizations/scoreboards/scoreboard-minimal.res +++ b/#customizations/scoreboard-minimal.res diff --git a/customizations/team_menu/teammenu-center.res b/#customizations/teammenu-center.res index 3ffe965..3ffe965 100644 --- a/customizations/team_menu/teammenu-center.res +++ b/#customizations/teammenu-center.res diff --git a/materials/console/backgrounds/background_classic.vtf b/materials/console/background_classic.vtf Binary files differindex 3dd1d6d..3dd1d6d 100644 --- a/materials/console/backgrounds/background_classic.vtf +++ b/materials/console/background_classic.vtf diff --git a/materials/console/backgrounds/background_classic_widescreen.vtf b/materials/console/background_classic_widescreen.vtf Binary files differindex 3dd1d6d..3dd1d6d 100644 --- a/materials/console/backgrounds/background_classic_widescreen.vtf +++ b/materials/console/background_classic_widescreen.vtf diff --git a/materials/console/backgrounds/background_modern.vtf b/materials/console/background_modern.vtf Binary files differindex 6eae25d..6eae25d 100644 --- a/materials/console/backgrounds/background_modern.vtf +++ b/materials/console/background_modern.vtf diff --git a/materials/console/backgrounds/background_modern_widescreen.vtf b/materials/console/background_modern_widescreen.vtf Binary files differindex 6eae25d..6eae25d 100644 --- a/materials/console/backgrounds/background_modern_widescreen.vtf +++ b/materials/console/background_modern_widescreen.vtf diff --git a/materials/console/background_upward.vmt b/materials/console/background_upward.vmt index 13876d5..59fe0ee 100644 --- a/materials/console/background_upward.vmt +++ b/materials/console/background_upward.vmt @@ -1,6 +1,6 @@ "UnlitGeneric" { - "$baseTexture" "console/backgrounds/background_modern" + "$baseTexture" "console/background_modern" "$vertexcolor" "1" "$vertexalpha" "1" "$ignorez" "1" diff --git a/materials/console/background_upward_widescreen.vmt b/materials/console/background_upward_widescreen.vmt index f66e203..9df6b63 100644 --- a/materials/console/background_upward_widescreen.vmt +++ b/materials/console/background_upward_widescreen.vmt @@ -1,6 +1,6 @@ "UnlitGeneric" { - "$baseTexture" "console/backgrounds/background_modern_widescreen" + "$baseTexture" "console/background_modern_widescreen" "$vertexcolor" "1" "$vertexalpha" "1" "$ignorez" "1" diff --git a/resource/ui/classselection.res b/resource/ui/classselection.res index 1cd65c2..47cbc56 100644 --- a/resource/ui/classselection.res +++ b/resource/ui/classselection.res @@ -1,2 +1,2 @@ -//"#base" "../../customizations/team_menu/classselection-center.res" -"#base" "../../customizations/team_menu/classselection.res" +"#base" "../../#customizations/_enabled/classselection-center.res" +"#base" "../../#customizations/_stock/classselection.res" diff --git a/resource/ui/hudplayerclass.res b/resource/ui/hudplayerclass.res index ed6a676..b16a076 100644 --- a/resource/ui/hudplayerclass.res +++ b/resource/ui/hudplayerclass.res @@ -1,2 +1,2 @@ -//"#base" "../../customizations/player_model/hudplayerclass-left.res" -"#base" "../../customizations/player_model/hudplayerclass.res" +"#base" "../../#customizations/_enabled/hudplayerclass-left.res" +"#base" "../../#customizations/_stock/hudplayerclass.res" diff --git a/resource/ui/hudplayerhealth.res b/resource/ui/hudplayerhealth.res index ed9cb0e..63963c8 100644 --- a/resource/ui/hudplayerhealth.res +++ b/resource/ui/hudplayerhealth.res @@ -1,3 +1,3 @@ -//"#base" "../../customizations/player_health/hudplayerhealth-broesel.res" -//"#base" "../../customizations/player_health/hudplayerhealth-cross.res" -"#base" "../../customizations/player_health/hudplayerhealth.res" +"#base" "../../#customizations/_enabled/hudplayerhealth-broesel.res" +"#base" "../../#customizations/_enabled/hudplayerhealth-cross.res" +"#base" "../../#customizations/_stock/hudplayerhealth.res"
\ No newline at end of file diff --git a/resource/ui/hudtournament.res b/resource/ui/hudtournament.res index fc75a4e..992bb33 100644 --- a/resource/ui/hudtournament.res +++ b/resource/ui/hudtournament.res @@ -90,7 +90,7 @@ "tall" "25" "autoResize" "0" "pinCorner" "0" - "visible" "1" + "visible" "0" "enabled" "1" "fillcolor" "TransparentBlack" } @@ -155,21 +155,6 @@ "enabled" "1" "bgcolor_override" "TransparentBlack" "PaintBackgroundType" "0" - - if_mvm - { - "visible" "1" - } - - if_competitive - { - "visible" "1" - } - - if_readymode - { - "visible" "1" - } } "HealthIcon" @@ -325,27 +310,6 @@ } } - "MainBG" - { - "ControlName" "ImagePanel" - "fieldName" "MainBG" - "xpos" "c-125" - "ypos" "16" - "zpos" "-1" - "wide" "250" - "tall" "14" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "fillcolor" "TransparentBlack" - - if_mvm - { - "visible" "0" - } - } - "HudTournamentBG" { "ControlName" "ScalableImagePanel" diff --git a/resource/ui/mainmenuoverride.res b/resource/ui/mainmenuoverride.res index 2e419f4..10ac6b3 100644 --- a/resource/ui/mainmenuoverride.res +++ b/resource/ui/mainmenuoverride.res @@ -1,6 +1,6 @@ "#base" "../../resource/preload.res" -//"#base" "../../customizations/main_menu/mainmenuoverride-classic.res" -"#base" "../../customizations/main_menu/mainmenuoverride.res" +"#base" "../../#customizations/_enabled/mainmenuoverride-classic.res" +"#base" "../../#customizations/_stock/mainmenuoverride.res" "Resource/UI/MainMenuOverride.res" { @@ -9,7 +9,7 @@ "ControlName" "CExLabel" "fieldName" "VersionLabel" "font" "HudFontSmall" - "labelText" "v2021.0201" + "labelText" "v2021.0415" "xpos" "r135" "ypos" "r15" "wide" "130" diff --git a/resource/ui/scoreboard.res b/resource/ui/scoreboard.res index 0c3198d..fe68e38 100644 --- a/resource/ui/scoreboard.res +++ b/resource/ui/scoreboard.res @@ -1,2 +1,2 @@ -//"#base" "../../customizations/scoreboards/scoreboard-minimal.res" -"#base" "../../customizations/scoreboards/scoreboard.res" +"#base" "../../#customizations/_enabled/scoreboard-minimal.res" +"#base" "../../#customizations/_stock/scoreboard.res"
\ No newline at end of file diff --git a/resource/ui/teammenu.res b/resource/ui/teammenu.res index df6e31b..ab751d4 100644 --- a/resource/ui/teammenu.res +++ b/resource/ui/teammenu.res @@ -1,2 +1,2 @@ -//"#base" "../../customizations/team_menu/teammenu-center.res" -"#base" "../../customizations/team_menu/teammenu.res" +"#base" "../../#customizations/_enabled/teammenu-center.res" +"#base" "../../#customizations/_stock/teammenu.res" |
