diff --git a/Assets/Audio/Master.strings.bank b/Assets/Audio/Master.strings.bank index 60d036cb..7f71c9b1 100644 Binary files a/Assets/Audio/Master.strings.bank and b/Assets/Audio/Master.strings.bank differ diff --git a/Assets/Audio/Music.bank b/Assets/Audio/Music.bank index 3885d5df..5d5708e6 100644 Binary files a/Assets/Audio/Music.bank and b/Assets/Audio/Music.bank differ diff --git a/Assets/Scripts/SC_MainMenu.cs b/Assets/Scripts/SC_MainMenu.cs index c7529e74..0cc5d0dd 100644 --- a/Assets/Scripts/SC_MainMenu.cs +++ b/Assets/Scripts/SC_MainMenu.cs @@ -5,7 +5,7 @@ public class MainMenu : Script { protected override void awake() { - Audio.PlayBGMOnce2D("event:/Music/player_undetected"); + Audio.PlayBGMOnce2D("event:/Music/main_menu"); } protected override void update() { @@ -13,10 +13,12 @@ public class MainMenu : Script { Audio.PlaySFXOnce2D("event:/UI/mouse_down_element"); SceneManager.ChangeScene(86098106); + Audio.StopAllSounds(); } if (Input.GetKey(Input.KeyCode.Escape)) { + Audio.StopAllSounds(); Application.Quit(); } } diff --git a/SHADE_Engine/src/Physics/System/SHPhysicsSystemRoutines.cpp b/SHADE_Engine/src/Physics/System/SHPhysicsSystemRoutines.cpp index 1d070f00..a30c5279 100644 --- a/SHADE_Engine/src/Physics/System/SHPhysicsSystemRoutines.cpp +++ b/SHADE_Engine/src/Physics/System/SHPhysicsSystemRoutines.cpp @@ -140,6 +140,9 @@ namespace SHADE } const double FIXED_DT = physicsSystem->fixedDT; + //to be remove ======================================================= + dt = std::clamp(dt, 0.0, 1.0 / 30.0); + //to be remove ======================================================= accumulatedTime += dt; //testFunction();