From e356758a7d5ab629a5ed2a2b6e101c287c754fc5 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 6 Mar 2017 17:06:48 +0900 Subject: [PATCH 1/4] Don't expicitly set origin of TextAwesome. --- osu.Game/Beatmaps/Drawables/DifficultyIcon.cs | 2 ++ osu.Game/Graphics/TextAwesome.cs | 5 ----- osu.Game/Graphics/UserInterface/TwoLayerButton.cs | 1 + osu.Game/Overlays/Notifications/Notification.cs | 1 + osu.Game/Overlays/Notifications/SimpleNotification.cs | 1 + osu.Game/Screens/Menu/Button.cs | 1 + osu.Game/Screens/Select/BeatmapInfoWedge.cs | 2 ++ 7 files changed, 8 insertions(+), 5 deletions(-) diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs index e0e390fcb1..5680c49620 100644 --- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs +++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs @@ -34,6 +34,7 @@ namespace osu.Game.Beatmaps.Drawables new TextAwesome { Anchor = Anchor.Centre, + Origin = Anchor.Centre, TextSize = Size.X, Colour = getColour(beatmap), Icon = FontAwesome.fa_circle @@ -41,6 +42,7 @@ namespace osu.Game.Beatmaps.Drawables new TextAwesome { Anchor = Anchor.Centre, + Origin = Anchor.Centre, TextSize = Size.X, Colour = Color4.White, Icon = Ruleset.GetRuleset(beatmap.Mode).Icon diff --git a/osu.Game/Graphics/TextAwesome.cs b/osu.Game/Graphics/TextAwesome.cs index 13d3cbc8c3..45f9ddeec9 100644 --- a/osu.Game/Graphics/TextAwesome.cs +++ b/osu.Game/Graphics/TextAwesome.cs @@ -26,11 +26,6 @@ namespace osu.Game.Graphics Text = ((char)icon).ToString(); } } - - public TextAwesome() - { - Origin = Framework.Graphics.Anchor.Centre; - } } public enum FontAwesome diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs index 81cb94ce12..8221ef952f 100644 --- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs +++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs @@ -98,6 +98,7 @@ namespace osu.Game.Graphics.UserInterface icon = new TextAwesome { Anchor = Anchor.Centre, + Origin = Anchor.Centre, TextSize = 25, }, } diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs index 9a51c6d6ae..ab929ccc0e 100644 --- a/osu.Game/Overlays/Notifications/Notification.cs +++ b/osu.Game/Overlays/Notifications/Notification.cs @@ -176,6 +176,7 @@ namespace osu.Game.Overlays.Notifications new TextAwesome { Anchor = Anchor.Centre, + Origin = Anchor.Centre, Icon = FontAwesome.fa_times_circle, } }; diff --git a/osu.Game/Overlays/Notifications/SimpleNotification.cs b/osu.Game/Overlays/Notifications/SimpleNotification.cs index c9c56e8d4a..0a33e2f416 100644 --- a/osu.Game/Overlays/Notifications/SimpleNotification.cs +++ b/osu.Game/Overlays/Notifications/SimpleNotification.cs @@ -51,6 +51,7 @@ namespace osu.Game.Overlays.Notifications iconDrawable = new TextAwesome { Anchor = Anchor.Centre, + Origin = Anchor.Centre, Icon = icon, } }); diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs index 4954fd9366..d9992ea3bf 100644 --- a/osu.Game/Screens/Menu/Button.cs +++ b/osu.Game/Screens/Menu/Button.cs @@ -108,6 +108,7 @@ namespace osu.Game.Screens.Menu { Shadow = true, Anchor = Anchor.Centre, + Origin = Anchor.Centre, TextSize = 30, Position = new Vector2(0, 0), Icon = symbol diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs index 393019f7eb..4c488444b6 100644 --- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs +++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs @@ -209,12 +209,14 @@ namespace osu.Game.Screens.Select new TextAwesome { Icon = FontAwesome.fa_square, + Origin = Anchor.Centre, Colour = new Color4(68, 17, 136, 255), Rotation = 45 }, new TextAwesome { Icon = statistic.Icon, + Origin = Anchor.Centre, Colour = new Color4(255, 221, 85, 255), Scale = new Vector2(0.8f) }, From 5ec2db655879befd4cd9079c38a8f9cfa212fb49 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 6 Mar 2017 17:18:31 +0900 Subject: [PATCH 2/4] Fix crash on opening options before intro has played. --- osu.Game/OsuGame.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 9f7e3e04dc..47524f0f68 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -194,7 +194,7 @@ namespace osu.Game private bool globalHotkeyPressed(InputState state, KeyDownEventArgs args) { - if (args.Repeat) return false; + if (args.Repeat || intro == null) return false; switch (args.Key) { From 9908c1905d9b56d1697277028ad72c1fa71f5dfc Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 6 Mar 2017 17:21:58 +0900 Subject: [PATCH 3/4] Add keyboard shortcuts at song select for mod/random/options. --- osu.Game/Screens/Select/PlaySongSelect.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 316cc50dae..ce0ee5f74b 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -440,8 +440,19 @@ namespace osu.Game.Screens.Select protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) { + if (args.Repeat) return false; + switch (args.Key) { + case Key.F1: + modSelect.ToggleVisibility(); + return true; + case Key.F2: + carousel.SelectRandom(); + return true; + case Key.F3: + beatmapOptions.ToggleVisibility(); + return true; case Key.Enter: footer.StartButton.TriggerClick(); return true; From 463c887879666d7564612f52f5ff0f5d74d3f3ed Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 6 Mar 2017 17:28:53 +0900 Subject: [PATCH 4/4] Fix WaveOverlayContainer staying visible when hidden. --- osu.Game/Overlays/WaveOverlayContainer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs index 18971a532a..34cf10fe25 100644 --- a/osu.Game/Overlays/WaveOverlayContainer.cs +++ b/osu.Game/Overlays/WaveOverlayContainer.cs @@ -134,7 +134,7 @@ namespace osu.Game.Overlays foreach (var w in wavesContainer.Children) w.State = Visibility.Visible; - contentContainer.FadeIn(APPEAR_DURATION, EasingTypes.OutQuint); + FadeIn(100, EasingTypes.OutQuint); contentContainer.MoveToY(0, APPEAR_DURATION, EasingTypes.OutQuint); } @@ -142,7 +142,7 @@ namespace osu.Game.Overlays { base.PopOut(); - contentContainer.FadeOut(DISAPPEAR_DURATION, EasingTypes.In); + FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint); contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, EasingTypes.In); foreach (var w in wavesContainer.Children)