diff --git a/ShiftOS.WinForms/ShiftOSAudioProvider.cs b/ShiftOS.WinForms/ShiftOSAudioProvider.cs index 43a7e51..27c0e5f 100644 --- a/ShiftOS.WinForms/ShiftOSAudioProvider.cs +++ b/ShiftOS.WinForms/ShiftOSAudioProvider.cs @@ -50,9 +50,9 @@ namespace ShiftOS.WinForms get { if (SaveSystem.CurrentSave == null) - return 0.0f; + return 0.45f; if (TutorialManager.IsInTutorial || SaveSystem.CurrentSave.StoryPosition < 1) - return 0.0f; + return 0.45f; try { return SaveSystem.CurrentSave.Settings.audioVolume; diff --git a/ShiftOS_TheReturn/AudioManager.cs b/ShiftOS_TheReturn/AudioManager.cs index 5816aca..a548cf6 100644 --- a/ShiftOS_TheReturn/AudioManager.cs +++ b/ShiftOS_TheReturn/AudioManager.cs @@ -22,7 +22,7 @@ * SOFTWARE. */ -#define NOSOUND +//#define NOSOUND using System; using System.Collections.Generic; diff --git a/ShiftOS_TheReturn/ShiftOS.Engine.csproj b/ShiftOS_TheReturn/ShiftOS.Engine.csproj index 735d046..3702b18 100644 --- a/ShiftOS_TheReturn/ShiftOS.Engine.csproj +++ b/ShiftOS_TheReturn/ShiftOS.Engine.csproj @@ -92,30 +92,6 @@ ..\packages\DynamicLua.1.1.2.0\lib\net40-Client\DynamicLua.dll - - ..\packages\IronPython.2.7.5\lib\Net45\IronPython.dll - - - ..\packages\IronPython.2.7.5\lib\Net45\IronPython.Modules.dll - - - ..\packages\IronPython.2.7.5\lib\Net45\IronPython.SQLite.dll - - - ..\packages\IronPython.2.7.5\lib\Net45\IronPython.Wpf.dll - - - ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Dynamic.dll - - - ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.dll - - - ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.AspNet.dll - - - ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.Metadata.dll -