From 42631205b8f43f94260effc478c24425f8d0d0d5 Mon Sep 17 00:00:00 2001 From: GreySux Date: Fri, 5 Jan 2024 17:26:42 -0800 Subject: [PATCH] 1.1.2 --- README.md | 11 +- .../scoreboard_12v12_/scoreboard_12v12.res | 34 ++++-- .../scoreboard_6v6_/scoreboard_6v6.res | 27 ++++- .../ubericons/targetidubericons.res | 9 ++ resource/chat_english.txt | Bin 8532 -> 9362 bytes resource/ui/hudmatchstatus_base.res | 2 +- resource/ui/scoreboard_base.res | 30 ++++- scripts/HudAnimations_ciba.txt | 110 ------------------ scripts/HudAnimations_goog.txt | 4 +- sound/sound.cache | Bin 62 -> 62 bytes 10 files changed, 89 insertions(+), 138 deletions(-) create mode 100644 customizations/ubericons/targetidubericons.res delete mode 100644 scripts/HudAnimations_ciba.txt diff --git a/README.md b/README.md index c8c4cb4..e9e0d96 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,10 @@ To install, press the green "Code" on github, then download ZIP. Once downloaded, open/unzip the file and drag the folder "googhud-main" into \Team Fortress 2\tf\custom -Currently 1.1 release. this upodate includes: -- new customization menu -- new customization folder with many options such as health, chat, scoreboard, etc. -- new and better file layouts -- many color updates to various parts -- better resolution compatibility -- many many many many fixes +Currently 1.1.2 release. this upodate includes: +- added map name to scoreboard +- fixed 12v12 scoreboard +-fixed scoreboard death timers being misaligned 1.1 is the result of a ton of work from myself individually, as i am still working on this more or less alone. thanks to the folks that helped me with testing though!!! please don't be afraid to reach out if you'd like to give assistance. diff --git a/customizations/scoreboard_12v12_/scoreboard_12v12.res b/customizations/scoreboard_12v12_/scoreboard_12v12.res index 6184efd..94dc007 100644 --- a/customizations/scoreboard_12v12_/scoreboard_12v12.res +++ b/customizations/scoreboard_12v12_/scoreboard_12v12.res @@ -645,7 +645,7 @@ "fieldName" "HorizontalLine" "xpos" "9999" "ypos" "9999" - "ypos_minmode" "9999"" + "ypos_minmode" "9999" "zpos" "3" "wide" "465" "wide_lodef" "434" @@ -687,7 +687,25 @@ "visible" "0" } } - + "MapNameReal" + { + "ControlName" "CExLabel" + "fieldName" "mapname" + "font" "GameFont12" + "labelText" "%mapname%" + "textAlignment" "center" + "xpos" "c-61" + "ypos" "c112" + "ypos_minmode" "c112" + "zpos" "3" + "wide" "116" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fgcolor" "255 255 255 255" + } "LocalPlayerDuelStatsPanel" { "ControlName" "EditablePanel" @@ -715,7 +733,7 @@ "labelText" "#TF_ScoreBoard_Dueling" "textAlignment" "center" "xpos" "250" - "ypos" "2 " + "ypos" "2" "zpos" "3" "wide" "100" "tall" "20" @@ -905,7 +923,7 @@ "fieldName" "LocalPlayerStatsPanel" "xpos" "c-225" "ypos" "321" - "ypos_minmode" "295" + "ypos_minmode" "321" "zpos" "3" "wide" "450" "tall" "150" @@ -1028,11 +1046,11 @@ { "ControlName" "CExLabel" "fieldName" "mapname" - "font" "GameFont24" + "font" "GameFont12" "labelText" "%mapname%" "textAlignment" "center" - "xpos" "162" - "ypos" "35" + "xpos" "164" + "ypos" "30" "zpos" "3" "wide" "116" "tall" "20" @@ -1040,7 +1058,7 @@ "pinCorner" "0" "visible" "0" "enabled" "1" - "fgcolor" "236 227 203 255" + "fgcolor" "255 255 255 255" } "GameType" { diff --git a/customizations/scoreboard_6v6_/scoreboard_6v6.res b/customizations/scoreboard_6v6_/scoreboard_6v6.res index 11e7cb6..5fbdbd9 100644 --- a/customizations/scoreboard_6v6_/scoreboard_6v6.res +++ b/customizations/scoreboard_6v6_/scoreboard_6v6.res @@ -687,6 +687,25 @@ "visible" "0" } } +"MapNameReal" + { + "ControlName" "CExLabel" + "fieldName" "mapname" + "font" "GameFont12" + "labelText" "%mapname%" + "textAlignment" "center" + "xpos" "c-61" + "ypos" "c86" + "ypos_minmode" "c86" + "zpos" "3" + "wide" "116" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fgcolor" "255 255 255 255" + } "LocalPlayerDuelStatsPanel" { @@ -1026,13 +1045,13 @@ } "MapName" { - "ControlName" "CExLabel" + "ControlName" "CExLabel" "fieldName" "mapname" - "font" "GameFont24" + "font" "GameFont12" "labelText" "%mapname%" "textAlignment" "center" "xpos" "162" - "ypos" "35" + "ypos" "30" "zpos" "3" "wide" "116" "tall" "20" @@ -1040,7 +1059,7 @@ "pinCorner" "0" "visible" "0" "enabled" "1" - "fgcolor" "236 227 203 255" + "fgcolor" "255 255 255 255" } "GameType" { diff --git a/customizations/ubericons/targetidubericons.res b/customizations/ubericons/targetidubericons.res new file mode 100644 index 0000000..55554b2 --- /dev/null +++ b/customizations/ubericons/targetidubericons.res @@ -0,0 +1,9 @@ +"Resource/UI/TargetID.res" +// adds icons to every medigun type instead of medigun name +{ + "TargetDataLabel" + { + "font" "TargetIDIcons" + } + +} diff --git a/resource/chat_english.txt b/resource/chat_english.txt index c18130ff8769153eb3029a7b003ccb63ecb06089..35fe3b78d47438e886b84c1897c9130fd26f2948 100644 GIT binary patch delta 497 zcmccOG|7|c|Gy0((vu^kMkzx9LpnndLn1>8*p2B7N|XDgMJM-3u}$8=!2{Ca zPDn>Q&;^(-Q3ARh1y24guLv^F71cbDy=g#L0yHBL7*eQyQDSffhFmI8yb@>{C`=4d q!z38hv?8F|WQGi&Nku?^fkGYVBebvy!lK3sZn`Ri(q?aIRyF`524q|S delta 18 ZcmbQ_dBtfXQ;78DX>xy9S$G+^7yv`S1(yH- diff --git a/resource/ui/hudmatchstatus_base.res b/resource/ui/hudmatchstatus_base.res index 687275b..6ac540b 100644 --- a/resource/ui/hudmatchstatus_base.res +++ b/resource/ui/hudmatchstatus_base.res @@ -544,7 +544,7 @@ "fieldName" "RespawnTime" "font" "HudFontSmall" "xpos" "0" - "ypos" "0" + "ypos" "15" "zpos" "10" "wide" "f0" "tall" "f0" diff --git a/resource/ui/scoreboard_base.res b/resource/ui/scoreboard_base.res index 17bffbb..fbde25a 100644 --- a/resource/ui/scoreboard_base.res +++ b/resource/ui/scoreboard_base.res @@ -687,7 +687,25 @@ "visible" "0" } } - + "MapNameReal" + { + "ControlName" "CExLabel" + "fieldName" "mapname" + "font" "GameFont12" + "labelText" "%mapname%" + "textAlignment" "center" + "xpos" "c-61" + "ypos" "c112" + "ypos_minmode" "c86" + "zpos" "3" + "wide" "116" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fgcolor" "255 255 255 255" + } "LocalPlayerDuelStatsPanel" { "ControlName" "EditablePanel" @@ -1011,7 +1029,7 @@ "ControlName" "CExLabel" "fieldName" "Deaths2" "font" "GameFont40" - "font_minmode" "GameFont30" + "font_minmode" "GameFont30" "labelText" "%deaths%" "textAlignment" "west" "xpos" "229" @@ -1026,13 +1044,13 @@ } "MapName" { - "ControlName" "CExLabel" + "ControlName" "CExLabel" "fieldName" "mapname" - "font" "GameFont24" + "font" "GameFont12" "labelText" "%mapname%" "textAlignment" "center" "xpos" "162" - "ypos" "35" + "ypos" "30" "zpos" "3" "wide" "116" "tall" "20" @@ -1040,7 +1058,7 @@ "pinCorner" "0" "visible" "0" "enabled" "1" - "fgcolor" "236 227 203 255" + "fgcolor" "255 255 255 255" } "GameType" { diff --git a/scripts/HudAnimations_ciba.txt b/scripts/HudAnimations_ciba.txt deleted file mode 100644 index 96e4f8f..0000000 --- a/scripts/HudAnimations_ciba.txt +++ /dev/null @@ -1,110 +0,0 @@ -//==================================================================================================================== - -event FlagOutline -{ - RunEvent FlagOutlineHide 0.0 - Animate OutlineImage Alpha "0" Linear 0.1 0.2 - - Animate OutlineImage Position "c-200 140" Linear 0.1 0.2 - Animate OutlineImage Size "400 200" Linear 0.1 0.2 - - Animate OutlineImage Position "c-50 r137" Linear 0.7 0.2 - Animate OutlineImage Position "c-50 r158" Linear 0.7 0.2 - Animate OutlineImage Size "100 50" Linear 0.7 0.2 - - Animate OutlineImage Alpha "0" Linear 0.9 0.1 -} - -//==================================================================================================================== - -event HudSpyDisguiseChanged -{ - Animate PlayerStatusSpyOutlineImage Alpha "0" Linear 0.0 0.2 - - Animate PlayerStatusSpyOutlineImage Position "c-200 c-200" Linear 0.0 0.2 - Animate PlayerStatusSpyOutlineImage Size "400 400" Linear 0.0 0.2 - - RunEvent HudSpyDisguiseHide 0.7 -} - -//==================================================================================================================== - -event HudTournamentSetupPanelOpen -{ - Animate HudTournamentSetup Position "c-90 -70" Linear 0.0 0.001 - Animate HudTournamentSetup Position "c-90 47" Spline 0.001 0.2 -} - -event HudTournamentSetupPanelClose -{ - Animate HudTournamentSetup Position "c-90 47" Linear 0.0 0.001 - Animate HudTournamentSetup Position "c-90 -70" Spline 0.001 0.2 -} - -//==================================================================================================================== - -event RDPositiveScorePulse -{ - Animate Score FgColor "Green" Linear 0.0 0.0 - Animate Score FgColor "White" Linear 0.1 0.2 -} - -event RDNegativeScorePulse -{ - Animate Score FgColor "Low Health Pulse" Linear 0.0 0.0 - Animate Score FgColor "White" Linear 0.1 0.2 -} - -//==================================================================================================================== - -event TeamStatus_PlayerDead -{ - SetVisible DeathPanel 0 0 - SetVisible SkullPanel 0 0 - SetVisible respawntime 1 0 - - Animate DeathPanel ypos 15 Accel 0 0.2 - Animate SkullPanel ypos 15 Accel 0 0.2 - Animate respawntime ypos 15 Accel 0 0.2 -} - -event TeamStatus_PlayerAlive -{ - Animate DeathPanel ypos 15 Accel 0 0.2 - Animate SkullPanel ypos 15 Accel 0 0.2 - Animate respawntime ypos 15 Accel 0 0.2 - - SetVisible DeathPanel 0 0.2 - SetVisible SkullPanel 0 0.2 - SetVisible respawntime 0 0.2 -} - -//==================================================================================================================== - -event CompetitiveGame_LowerChatWindow -{ - Animate HudChat ypos "17" Accel 0 0 -} - -event CompetitiveGame_RestoreChatWindow -{ - Animate HudChat ypos "17" Accel 0 0 -} - -event HudTournament_MoveChatWindow -{ - RunEvent CompetitiveGame_LowerChatWindow 0 - RunEvent CompetitiveGame_RestoreChatWindow 10 -} - -//==================================================================================================================== - -event HudSnapShotReminderIn -{ - RunEvent HudHealthDyingPulseStop 10.0 - RunEvent HudHealthBonusPulseStop 10.0 - RunEvent HudLowAmmoPulseStop 10.0 - RunEvent HudMedicChargedStop 10.0 -} - -//==================================================================================================================== \ No newline at end of file diff --git a/scripts/HudAnimations_goog.txt b/scripts/HudAnimations_goog.txt index 96e4f8f..51f3ae7 100644 --- a/scripts/HudAnimations_goog.txt +++ b/scripts/HudAnimations_goog.txt @@ -65,13 +65,13 @@ event TeamStatus_PlayerDead Animate DeathPanel ypos 15 Accel 0 0.2 Animate SkullPanel ypos 15 Accel 0 0.2 - Animate respawntime ypos 15 Accel 0 0.2 + Animate respawntime ypos 15 Accel 0 0.2 } event TeamStatus_PlayerAlive { Animate DeathPanel ypos 15 Accel 0 0.2 - Animate SkullPanel ypos 15 Accel 0 0.2 + Animate SkullPanel ypos 15 Accel 0 0.2 Animate respawntime ypos 15 Accel 0 0.2 SetVisible DeathPanel 0 0.2 diff --git a/sound/sound.cache b/sound/sound.cache index ca2f8c985a4a9c96453d85c4412428f191008194..409cdb1e38685cf410d46b9394792ede68025ab8 100644 GIT binary patch delta 30 ccmcDso1iKg;a!)?#2~2600PQNU4dIi9t}C0R*0215;oE0BK(ZBLDyZ