h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 10:42:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'ppy:master' into fl-skill

Browse Source
This commit is contained in:
MBmasher 2021-09-14 11:51:21 +10:00 committed by GitHub
commit 9ad2f54042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Graphics/UserInterface/Nub.cs
View File

@ -46,7 +46,11 @@ namespace osu.Game.Graphics.UserInterface
}, },
}; };
Current.ValueChanged += filled => fill.FadeTo(filled.NewValue ? 1 : 0, 200, Easing.OutQuint); Current.ValueChanged += filled =>
{
fill.FadeTo(filled.NewValue ? 1 : 0, 200, Easing.OutQuint);
this.TransformTo(nameof(BorderThickness), filled.NewValue ? 8.5f : border_width, 200, Easing.OutQuint);
};
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]

2
osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
View File

@ -67,7 +67,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{ {
Text = InputSettingsStrings.ResetSectionButton; Text = InputSettingsStrings.ResetSectionButton;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Width = 0.5f; Width = 0.8f;
Anchor = Anchor.TopCentre; Anchor = Anchor.TopCentre;
Origin = Anchor.TopCentre; Origin = Anchor.TopCentre;
Margin = new MarginPadding { Top = 15 }; Margin = new MarginPadding { Top = 15 };

19
osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
View File

@ -33,6 +33,8 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
private const float chevron_size = 8; private const float chevron_size = 8;
private SpriteIcon arrow; private SpriteIcon arrow;
private SpriteIcon iconEarly;
private SpriteIcon iconLate;
private Container colourBarsEarly; private Container colourBarsEarly;
private Container colourBarsLate; private Container colourBarsLate;
@ -97,25 +99,21 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Height = 0.5f, Height = 0.5f,
}, },
new SpriteIcon iconEarly = new SpriteIcon
{ {
Y = -10, Y = -10,
Size = new Vector2(10), Size = new Vector2(10),
Icon = FontAwesome.Solid.ShippingFast, Icon = FontAwesome.Solid.ShippingFast,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
// undo any layout rotation to display the icon the correct orientation
Rotation = -Rotation,
}, },
new SpriteIcon iconLate = new SpriteIcon
{ {
Y = 10, Y = 10,
Size = new Vector2(10), Size = new Vector2(10),
Icon = FontAwesome.Solid.Bicycle, Icon = FontAwesome.Solid.Bicycle,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
// undo any layout rotation to display the icon the correct orientation
Rotation = -Rotation,
} }
} }
}, },
@ -143,6 +141,15 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
arrow.Delay(200).FadeInFromZero(600); arrow.Delay(200).FadeInFromZero(600);
} }
protected override void Update()
{
base.Update();
// undo any layout rotation to display icons in the correct orientation
iconEarly.Rotation = -Rotation;
iconLate.Rotation = -Rotation;
}
private void createColourBars(OsuColour colours) private void createColourBars(OsuColour colours)
{ {
var windows = HitWindows.GetAllAvailableWindows().ToArray(); var windows = HitWindows.GetAllAvailableWindows().ToArray();