sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

Browse Source 
# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs
This commit is contained in:
smoogipoo
2018-05-28 18:01:15 +09:00
parent 3a5228af43 ce8a6cfc53
commit a3470f9ec3
38 changed files with 841 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Tests/Visual/EditorClockTestCase.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual
protected EditorClockTestCase()
{
Clock = new EditorClock(new ControlPointInfo(), BeatDivisor) { IsCoupled = false };
Clock = new EditorClock(new ControlPointInfo(), 5000, BeatDivisor) { IsCoupled = false };
}
[BackgroundDependencyLoader]