sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into osu-fontusage

Browse Source 
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
This commit is contained in:
smoogipoo
2019-02-20 15:04:08 +09:00
parent a2aa3ec5cb 5ac1288f9e
commit 0693ab8e7d
134 changed files with 2930 additions and 1557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,8 @@ namespace osu.Game.Screens.Play
private bool hideOverlays;
public override bool HideOverlaysOnEnter => hideOverlays;
public override bool DisallowExternalBeatmapRulesetChanges => true;
private Task loadTask;
public PlayerLoader(Func<Player> createPlayer)