Merge remote-tracking branch 'origin/master' into timeshift-wip

This commit is contained in:
smoogipoo
2018-12-22 23:23:21 +09:00
24 changed files with 914 additions and 42 deletions

View File

@ -79,8 +79,6 @@ namespace osu.Game.Screens.Menu
private readonly Container impactContainer;
private const float default_size = 480;
private const double early_activation = 60;
public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
@ -89,8 +87,6 @@ namespace osu.Game.Screens.Menu
{
EarlyActivationMilliseconds = early_activation;
Size = new Vector2(default_size);
Origin = Anchor.Centre;
AutoSizeAxes = Axes.Both;