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 branch 'master' of git://github.com/ppy/osu into caps-warning

Browse Source 
# Conflicts:
#	osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
This commit is contained in:
Jorolf
2017-08-22 13:29:42 +02:00
parent f6e0e0bc38 bf13618c77
commit 2ccd6c6128
548 changed files with 16933 additions and 7511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
View File

@ -7,8 +7,8 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Sprites;
using System;
using osu.Framework.Graphics.Shapes;
namespace osu.Game.Graphics.UserInterface
{
@ -58,8 +58,8 @@ namespace osu.Game.Graphics.UserInterface
protected override void LoadComplete()
{
base.LoadComplete();
circle.FadeIn(500, EasingTypes.OutQuint);
circle.ResizeTo(new Vector2(0.8f), 500, EasingTypes.OutQuint);
circle.FadeIn(500, Easing.OutQuint);
circle.ResizeTo(new Vector2(0.8f), 500, Easing.OutQuint);
}
}