sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'huoyaoyuan/master' into health-processor

Browse Source 
# Conflicts:
#	osu.Game.Rulesets.Catch/CatchRuleset.cs
#	osu.Game.Rulesets.Mania/ManiaRuleset.cs
#	osu.Game.Rulesets.Taiko/TaikoRuleset.cs
This commit is contained in:
smoogipoo
2019-12-26 14:56:54 +09:00
parent 00546787c8 5a11fe9a84
commit 7414a6aadd
92 changed files with 824 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Play/Player.cs
View File

@ -580,7 +580,7 @@ namespace osu.Game.Screens.Play
// GameplayClockContainer performs seeks / start / stop operations on the beatmap's track.
// as we are no longer the current screen, we cannot guarantee the track is still usable.
GameplayClockContainer.StopUsingBeatmapClock();
GameplayClockContainer?.StopUsingBeatmapClock();
fadeOut();
return base.OnExiting(next);