From 44345934957a2bca38181e7d99da28e425ed35bd Mon Sep 17 00:00:00 2001 From: EliteAsian Date: Thu, 11 May 2023 21:45:46 -0400 Subject: [PATCH 1/3] Update Credits.txt --- Assets/Credits.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/Credits.txt b/Assets/Credits.txt index f5fd86285..e086a2786 100644 --- a/Assets/Credits.txt +++ b/Assets/Credits.txt @@ -25,6 +25,9 @@ EscapeNumber001 grishhung jtanan44 NevesPT +Pixelated_Pope +NyxTheShield +JayDiddyThaGOAT Lead-Artists From e341f1bec41b600cca9d6b2e9009c78799983570 Mon Sep 17 00:00:00 2001 From: EliteAsian Date: Sat, 13 May 2023 18:09:28 -0400 Subject: [PATCH 2/3] Added `dev` branch warning to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c44a4236a..332b09085 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,8 @@ Windows: # 🔨 Building +### If you plan on contributing, please work on the `dev` branch. PRs to `master` will not be accepted. + > **Warning** > > If you would like to build the game yourself, please follow these instructions. From 1f2df8b867e04e439d4b5228577d1485d3c87978 Mon Sep 17 00:00:00 2001 From: jnack <55568980+jnackmclain@users.noreply.github.com> Date: Tue, 6 Jun 2023 21:18:53 -0500 Subject: [PATCH 3/3] add kick bounce toggle --- Assets/Script/PlayMode/DrumsTrack.cs | 4 ++-- Assets/Script/Settings/SettingsManager.Settings.cs | 1 + Assets/Script/Settings/SettingsManager.cs | 1 + Assets/Settings/Localization/Settings Shared Data.asset | 4 ++++ Assets/Settings/Localization/Settings_en-US.asset | 4 ++++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Assets/Script/PlayMode/DrumsTrack.cs b/Assets/Script/PlayMode/DrumsTrack.cs index b80d10ca3..99f173c88 100644 --- a/Assets/Script/PlayMode/DrumsTrack.cs +++ b/Assets/Script/PlayMode/DrumsTrack.cs @@ -300,7 +300,7 @@ private void DrumHitAction(int drum, bool cymbal) { // otherwise only play it when actually hitting a kick if (Chart.Count < 1 || CurrentTime < Chart[0].time || CurrentTime >= Chart[^1].time) { commonTrack.kickFlash.PlayAnimation(); - if (shakeOnKick) { + if (shakeOnKick && SettingsManager.Settings.KickBounce.Data) { trackAnims.PlayKickShakeCameraAnim(); } } @@ -333,7 +333,7 @@ private void DrumHitAction(int drum, bool cymbal) { // Play kick flash/shake if (note.fret == kickIndex) { commonTrack.kickFlash.PlayAnimation(); - if (shakeOnKick) { + if (shakeOnKick && SettingsManager.Settings.KickBounce.Data) { trackAnims.PlayKickShakeCameraAnim(); } } diff --git a/Assets/Script/Settings/SettingsManager.Settings.cs b/Assets/Script/Settings/SettingsManager.Settings.cs index b433eed70..4bdfee8a8 100644 --- a/Assets/Script/Settings/SettingsManager.Settings.cs +++ b/Assets/Script/Settings/SettingsManager.Settings.cs @@ -37,6 +37,7 @@ public class SettingContainer { public ToggleSetting UseCymbalModelsInFiveLane { get; private set; } = new(true); public ToggleSetting NoKicks { get; private set; } = new(false); + public ToggleSetting KickBounce { get; private set; } = new(true); public ToggleSetting AntiGhosting { get; private set; } = new(true); public VolumeSetting MasterMusicVolume { get; private set; } = new(0.75f,v => VolumeCallback(SongStem.Master, v)); diff --git a/Assets/Script/Settings/SettingsManager.cs b/Assets/Script/Settings/SettingsManager.cs index a9acf0280..d21539c93 100644 --- a/Assets/Script/Settings/SettingsManager.cs +++ b/Assets/Script/Settings/SettingsManager.cs @@ -38,6 +38,7 @@ public class Tab { new HeaderMetadata("Other"), "ShowHitWindow", "UseCymbalModelsInFiveLane", + "KickBounce", "AmIAwesome" } }, diff --git a/Assets/Settings/Localization/Settings Shared Data.asset b/Assets/Settings/Localization/Settings Shared Data.asset index b900ae90f..c8d82e1d6 100644 --- a/Assets/Settings/Localization/Settings Shared Data.asset +++ b/Assets/Settings/Localization/Settings Shared Data.asset @@ -295,6 +295,10 @@ MonoBehaviour: m_Key: TrackFadeSize m_Metadata: m_Items: [] + - m_Id: 26591864540614656 + m_Key: KickBounce + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Settings_en-US.asset b/Assets/Settings/Localization/Settings_en-US.asset index 5c02f640d..84d9bd672 100644 --- a/Assets/Settings/Localization/Settings_en-US.asset +++ b/Assets/Settings/Localization/Settings_en-US.asset @@ -298,6 +298,10 @@ MonoBehaviour: m_Localized: Fade Size m_Metadata: m_Items: [] + - m_Id: 26591864540614656 + m_Localized: Drum Kick Bounce + m_Metadata: + m_Items: [] references: version: 2 RefIds: []