Merge branch 'master' into fix_logo_sound

This commit is contained in:
Dean Herbert
2017-06-25 15:13:57 +09:00
committed by GitHub
39 changed files with 36 additions and 66 deletions

View File

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Menu
set { colourAndTriangles.Alpha = value ? 1 : 0; }
}
protected override bool InternalContains(Vector2 screenSpacePos) => logoContainer.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => logoContainer.Contains(screenSpacePos);
public bool Ripple
{