Merge pull request #371 from peppy/general-fixes · ppy/osu@5721e7f

Commit

Merge pull request #371 from peppy/general-fixes

Update framework.

Tom94 authored Feb 18, 2017

2 parents a536953 + 837992d commit 5721e7f

+7 −26		osu.Framework/Audio/AdjustableAudioComponent.cs
+26 −9		osu.Framework/Audio/AudioCollectionManager.cs
+17 −5		osu.Framework/Audio/AudioComponent.cs
+2 −0		osu.Framework/Audio/AudioManager.cs
+0 −13		osu.Framework/Audio/IHasCompletedState.cs
+0 −1		osu.Framework/Audio/Sample/Sample.cs
+8 −6		osu.Framework/Audio/Sample/SampleBass.cs
+21 −11		osu.Framework/Audio/Sample/SampleChannel.cs
+30 −28		osu.Framework/Audio/Sample/SampleChannelBass.cs
+19 −15		osu.Framework/Audio/Sample/SampleManager.cs
+13 −5		osu.Framework/Audio/Track/Track.cs
+54 −38		osu.Framework/Audio/Track/TrackBass.cs
+4 −1		osu.Framework/Audio/Track/TrackManager.cs
+16 −5		osu.Framework/BaseGame.cs
+5 −0		osu.Framework/Graphics/Performance/FrameStatisticsDisplay.cs
+10 −2		osu.Framework/Graphics/Performance/PerformanceOverlay.cs
+0 −5		osu.Framework/Platform/BasicGameHost.cs
+27 −13		osu.Framework/Statistics/FrameStatistics.cs
+0 −1		osu.Framework/osu.Framework.csproj