shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-23 02:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

Browse source
This commit is contained in:
lempamo 2017-02-25 13:49:46 -05:00
commit 4d769d43e3
3 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ShiftOS.WinForms/ShiftOSAudioProvider.cs
View file

@ -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;

2
ShiftOS_TheReturn/AudioManager.cs
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
#define NOSOUND
//#define NOSOUND
using System;
using System.Collections.Generic;

24
ShiftOS_TheReturn/ShiftOS.Engine.csproj
View file

@ -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" />