mirror of
https://github.com/ppy/osu.git
synced 2025-01-14 03:25:11 +08:00
Merge branch 'master' into discord-dnd-fix
This commit is contained in:
commit
641f44a333
@ -220,12 +220,16 @@ namespace osu.Game.Graphics.Cursor
|
|||||||
{
|
{
|
||||||
activeCursor.FadeTo(1, 250, Easing.OutQuint);
|
activeCursor.FadeTo(1, 250, Easing.OutQuint);
|
||||||
activeCursor.ScaleTo(1, 400, Easing.OutQuint);
|
activeCursor.ScaleTo(1, 400, Easing.OutQuint);
|
||||||
|
activeCursor.RotateTo(0, 400, Easing.OutQuint);
|
||||||
|
dragRotationState = DragRotationState.NotDragging;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void PopOut()
|
protected override void PopOut()
|
||||||
{
|
{
|
||||||
activeCursor.FadeTo(0, 250, Easing.OutQuint);
|
activeCursor.FadeTo(0, 250, Easing.OutQuint);
|
||||||
activeCursor.ScaleTo(0.6f, 250, Easing.In);
|
activeCursor.ScaleTo(0.6f, 250, Easing.In);
|
||||||
|
activeCursor.RotateTo(0, 400, Easing.OutQuint);
|
||||||
|
dragRotationState = DragRotationState.NotDragging;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void playTapSample(double baseFrequency = 1f)
|
private void playTapSample(double baseFrequency = 1f)
|
||||||
|
Loading…
Reference in New Issue
Block a user