Merge branch 'master' into fix-error-exit-during-results-transition

This commit is contained in:
Dean Herbert
2021-02-19 17:13:55 +09:00
223 changed files with 3518 additions and 1473 deletions

View File

@ -93,7 +93,7 @@ namespace osu.Game.Screens.Play
[Resolved]
private MusicController musicController { get; set; }
private SampleChannel sampleRestart;
private Sample sampleRestart;
public BreakOverlay BreakOverlay;