From d4670fc64e194ca8b03a3d13a93082cb484e8888 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 5 Dec 2016 18:34:40 +0900 Subject: [PATCH 1/2] Update framework. --- osu-framework | 2 +- osu.Game.Mode.Osu/Objects/Drawables/HitExplosion.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu-framework b/osu-framework index 7b2f4dfce7..8dbc789266 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 7b2f4dfce7894ca7dea7626dcc34bcc32df651b9 +Subproject commit 8dbc789266c1bc3e46e364be824d69bcfac74e83 diff --git a/osu.Game.Mode.Osu/Objects/Drawables/HitExplosion.cs b/osu.Game.Mode.Osu/Objects/Drawables/HitExplosion.cs index a0ab68fa99..43a8aa1f92 100644 --- a/osu.Game.Mode.Osu/Objects/Drawables/HitExplosion.cs +++ b/osu.Game.Mode.Osu/Objects/Drawables/HitExplosion.cs @@ -44,8 +44,8 @@ public HitExplosion(OsuJudgementInfo judgement) protected override void LoadComplete() { base.LoadComplete(); - line1.TransformSpacingTo(14, 1800, EasingTypes.OutQuint); - line2.TransformSpacingTo(14, 1800, EasingTypes.OutQuint); + line1.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint); + line2.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint); } } } \ No newline at end of file From 3cb9cb647d447a00929a7621f35b95f5be35e8cc Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 5 Dec 2016 21:36:42 +0900 Subject: [PATCH 2/2] Tidy up BackButton and adjust transitions a bit. --- osu.Game/Graphics/UserInterface/BackButton.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/BackButton.cs b/osu.Game/Graphics/UserInterface/BackButton.cs index 7ccc5c061b..8d173384c3 100644 --- a/osu.Game/Graphics/UserInterface/BackButton.cs +++ b/osu.Game/Graphics/UserInterface/BackButton.cs @@ -16,13 +16,10 @@ public class BackButton : ClickableContainer { private TextAwesome icon; - private Container leftContainer; - private Container rightContainer; - private Box leftBox; private Box rightBox; - private const double transform_time = 300.0; + private const double transform_time = 600; private const int pulse_length = 250; private const float shear = 0.1f; @@ -36,7 +33,7 @@ public BackButton() Children = new Drawable[] { - leftContainer = new Container + new Container { RelativeSizeAxes = Axes.Both, Width = 0.4f, @@ -56,7 +53,7 @@ public BackButton() }, } }, - rightContainer = new Container + new Container { Origin = Anchor.TopRight, Anchor = Anchor.TopRight, @@ -84,10 +81,7 @@ public BackButton() }; } - public override bool Contains(Vector2 screenSpacePos) - { - return leftBox.Contains(screenSpacePos) || rightBox.Contains(screenSpacePos); - } + public override bool Contains(Vector2 screenSpacePos) => leftBox.Contains(screenSpacePos) || rightBox.Contains(screenSpacePos); protected override bool OnHover(InputState state) {