diff options
| author | lempamo <[email protected]> | 2017-02-25 13:49:46 -0500 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-02-25 13:49:46 -0500 |
| commit | 4d769d43e3282e3576faf0a53cb0736d546b1883 (patch) | |
| tree | cd43f2b8e9292e8ae486bbe51d1be3bee51ed6b3 | |
| parent | 9aa549e2b99ce4176ccf6dfee705ea25737d360a (diff) | |
| parent | ed5b6549369d470f8aaafbae7716081448377369 (diff) | |
| download | shiftos_thereturn-4d769d43e3282e3576faf0a53cb0736d546b1883.tar.gz shiftos_thereturn-4d769d43e3282e3576faf0a53cb0736d546b1883.tar.bz2 shiftos_thereturn-4d769d43e3282e3576faf0a53cb0736d546b1883.zip | |
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
| -rw-r--r-- | ShiftOS.WinForms/ShiftOSAudioProvider.cs | 4 | ||||
| -rw-r--r-- | ShiftOS_TheReturn/AudioManager.cs | 2 | ||||
| -rw-r--r-- | ShiftOS_TheReturn/ShiftOS.Engine.csproj | 24 |
3 files changed, 3 insertions, 27 deletions
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 @@ <Reference Include="DynamicLua, Version=1.1.2.0, Culture=neutral, PublicKeyToken=null"> <HintPath>..\packages\DynamicLua.1.1.2.0\lib\net40-Client\DynamicLua.dll</HintPath> </Reference> - <Reference Include="IronPython, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1"> - <HintPath>..\packages\IronPython.2.7.5\lib\Net45\IronPython.dll</HintPath> - </Reference> - <Reference Include="IronPython.Modules, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1"> - <HintPath>..\packages\IronPython.2.7.5\lib\Net45\IronPython.Modules.dll</HintPath> - </Reference> - <Reference Include="IronPython.SQLite, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1"> - <HintPath>..\packages\IronPython.2.7.5\lib\Net45\IronPython.SQLite.dll</HintPath> - </Reference> - <Reference Include="IronPython.Wpf, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1"> - <HintPath>..\packages\IronPython.2.7.5\lib\Net45\IronPython.Wpf.dll</HintPath> - </Reference> - <Reference Include="Microsoft.Dynamic, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1"> - <HintPath>..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Dynamic.dll</HintPath> - </Reference> - <Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1"> - <HintPath>..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.dll</HintPath> - </Reference> - <Reference Include="Microsoft.Scripting.AspNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1"> - <HintPath>..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.AspNet.dll</HintPath> - </Reference> - <Reference Include="Microsoft.Scripting.Metadata, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1"> - <HintPath>..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.Metadata.dll</HintPath> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="AppearanceManager.cs" /> |