Merge branch 'master' into add-flash-effects

# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
This commit is contained in:
Dean Herbert
2017-01-30 21:44:54 +09:00
19 changed files with 376 additions and 140 deletions

View File

@ -25,7 +25,7 @@ namespace osu.Game.Graphics.UserInterface
private const double transform_time = 600;
private const int pulse_length = 250;
private const float shear = 0.1f;
private const float shear = 0.15f;
public static readonly Vector2 SIZE_EXTENDED = new Vector2(140, 50);
public static readonly Vector2 SIZE_RETRACTED = new Vector2(100, 50);