Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
This commit is contained in:
smoogipoo
2018-06-06 18:26:51 +09:00
49 changed files with 490 additions and 274 deletions

View File

@ -209,6 +209,7 @@ namespace osu.Game.Screens
logo.Anchor = Anchor.TopLeft;
logo.Origin = Anchor.Centre;
logo.RelativePositionAxes = Axes.None;
logo.BeatMatching = true;
logo.Triangles = true;
logo.Ripple = true;
}