Merge remote-tracking branch 'upstream/master' into desktop-unit-tests

This commit is contained in:
Dean Herbert
2017-02-10 17:22:38 +09:00
29 changed files with 1056 additions and 32 deletions

View File

@ -24,7 +24,7 @@ namespace osu.Game.Screens.Menu
/// <summary>
/// osu! logo and its attachments (pulsing, visualiser etc.)
/// </summary>
public partial class OsuLogo : Container
public class OsuLogo : Container
{
public Color4 OsuPink = OsuColour.FromHex(@"e967a1");
@ -32,7 +32,6 @@ namespace osu.Game.Screens.Menu
private CircularContainer logoContainer;
private Container logoBounceContainer;
private Container logoHoverContainer;
private MenuVisualisation vis;
private AudioSample sampleClick;
@ -154,7 +153,7 @@ namespace osu.Game.Screens.Menu
}
}
},
vis = new MenuVisualisation
new MenuVisualisation
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,