Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2

This commit is contained in:
Dean Herbert
2019-11-06 16:22:55 +09:00
83 changed files with 1606 additions and 526 deletions

View File

@ -3,6 +3,7 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Bindables;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Overlays.Settings;
@ -26,17 +27,12 @@ namespace osu.Game.Screens.Edit.Timing
});
}
protected override void LoadComplete()
protected override void OnControlPointChanged(ValueChangedEvent<DifficultyControlPoint> point)
{
base.LoadComplete();
ControlPoint.BindValueChanged(point =>
if (point.NewValue != null)
{
if (point.NewValue != null)
{
multiplier.Bindable = point.NewValue.SpeedMultiplierBindable;
}
}, true);
multiplier.Bindable = point.NewValue.SpeedMultiplierBindable;
}
}
protected override DifficultyControlPoint CreatePoint()