Merge branch 'master' into osu-logo-no-update-transforms

This commit is contained in:
Dan Balasescu
2020-07-28 15:36:37 +09:00
committed by GitHub
25 changed files with 375 additions and 251 deletions

View File

@ -260,7 +260,7 @@ namespace osu.Game.Screens.Menu
private class LazerLogo : CompositeDrawable
{
private HueAnimation highlight, background;
private LogoAnimation highlight, background;
public float Progress
{
@ -282,13 +282,13 @@ namespace osu.Game.Screens.Menu
{
InternalChildren = new Drawable[]
{
highlight = new HueAnimation
highlight = new LogoAnimation
{
RelativeSizeAxes = Axes.Both,
Texture = textures.Get(@"Intro/Triangles/logo-highlight"),
Colour = Color4.White,
},
background = new HueAnimation
background = new LogoAnimation
{
RelativeSizeAxes = Axes.Both,
Texture = textures.Get(@"Intro/Triangles/logo-background"),