Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration

This commit is contained in:
Dean Herbert
2019-10-21 17:09:43 +09:00
15 changed files with 324 additions and 88 deletions

View File

@ -64,7 +64,8 @@ namespace osu.Game.Rulesets.Edit
{
drawableRulesetWrapper = new DrawableEditRulesetWrapper<TObject>(CreateDrawableRuleset(Ruleset, workingBeatmap, Array.Empty<Mod>()))
{
Clock = framedClock
Clock = framedClock,
ProcessCustomClock = false
};
}
catch (Exception e)