mirror of
https://github.com/ppy/osu
synced 2025-03-20 18:08:25 +00:00
Merge branch 'master' into bugfix-nofail-scoreprocessor
This commit is contained in:
commit
4eef9c0067
@ -185,8 +185,8 @@ namespace osu.Game
|
||||
},
|
||||
}, overlayContent.Add);
|
||||
|
||||
loadComponentSingleFile(volume = new VolumeControl(), AddInternal);
|
||||
loadComponentSingleFile(new OnScreenDisplay(), AddInternal);
|
||||
loadComponentSingleFile(volume = new VolumeControl(), Add);
|
||||
loadComponentSingleFile(new OnScreenDisplay(), Add);
|
||||
|
||||
//overlay elements
|
||||
loadComponentSingleFile(direct = new DirectOverlay { Depth = -1 }, mainContent.Add);
|
||||
|
Loading…
Reference in New Issue
Block a user