diff --git a/osu.Android.props b/osu.Android.props
index 6dab6edc5e..0b43fd73f5 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
-
+
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index c5bf790377..ca5ca7ac59 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
}
private void trackingChanged(ValueChangedEvent tracking) =>
- box.FadeTo(tracking.NewValue ? 0.6f : 0.05f, 200, Easing.OutQuint);
+ box.FadeTo(tracking.NewValue ? 0.3f : 0.05f, 200, Easing.OutQuint);
}
}
}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 120cf264c3..370760f03e 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
@@ -37,7 +38,7 @@ namespace osu.Game.Rulesets.Taiko.UI
private SkinnableDrawable mascot;
private ProxyContainer topLevelHitContainer;
- private ProxyContainer barlineContainer;
+ private ScrollingHitObjectContainer barlineContainer;
private Container rightArea;
private Container leftArea;
@@ -83,10 +84,7 @@ namespace osu.Game.Rulesets.Taiko.UI
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
- barlineContainer = new ProxyContainer
- {
- RelativeSizeAxes = Axes.Both,
- },
+ barlineContainer = new ScrollingHitObjectContainer(),
new Container
{
Name = "Hit objects",
@@ -159,18 +157,37 @@ namespace osu.Game.Rulesets.Taiko.UI
public override void Add(DrawableHitObject h)
{
- h.OnNewResult += OnNewResult;
- base.Add(h);
-
switch (h)
{
case DrawableBarLine barline:
- barlineContainer.Add(barline.CreateProxy());
+ barlineContainer.Add(barline);
break;
case DrawableTaikoHitObject taikoObject:
+ h.OnNewResult += OnNewResult;
topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
+ base.Add(h);
break;
+
+ default:
+ throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type");
+ }
+ }
+
+ public override bool Remove(DrawableHitObject h)
+ {
+ switch (h)
+ {
+ case DrawableBarLine barline:
+ return barlineContainer.Remove(barline);
+
+ case DrawableTaikoHitObject _:
+ h.OnNewResult -= OnNewResult;
+ // todo: consider tidying of proxied content if required.
+ return base.Remove(h);
+
+ default:
+ throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type");
}
}
diff --git a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
index b7a41ffd1c..481cb3230e 100644
--- a/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
+++ b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
@@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
-using osu.Framework.Utils;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Screens.Edit;
@@ -44,6 +43,36 @@ namespace osu.Game.Tests.Editing
Assert.That(stateChangedFired, Is.EqualTo(2));
}
+ [Test]
+ public void TestApplyThenUndoThenApplySameChange()
+ {
+ var (handler, beatmap) = createChangeHandler();
+
+ Assert.That(handler.CanUndo.Value, Is.False);
+ Assert.That(handler.CanRedo.Value, Is.False);
+
+ string originalHash = handler.CurrentStateHash;
+
+ addArbitraryChange(beatmap);
+ handler.SaveState();
+
+ Assert.That(handler.CanUndo.Value, Is.True);
+ Assert.That(handler.CanRedo.Value, Is.False);
+ Assert.That(stateChangedFired, Is.EqualTo(1));
+
+ string hash = handler.CurrentStateHash;
+
+ // undo a change without saving
+ handler.RestoreState(-1);
+
+ Assert.That(originalHash, Is.EqualTo(handler.CurrentStateHash));
+ Assert.That(stateChangedFired, Is.EqualTo(2));
+
+ addArbitraryChange(beatmap);
+ handler.SaveState();
+ Assert.That(hash, Is.EqualTo(handler.CurrentStateHash));
+ }
+
[Test]
public void TestSaveSameStateDoesNotSave()
{
@@ -139,7 +168,7 @@ namespace osu.Game.Tests.Editing
private void addArbitraryChange(EditorBeatmap beatmap)
{
- beatmap.Add(new HitCircle { StartTime = RNG.Next(0, 100000) });
+ beatmap.Add(new HitCircle { StartTime = 2760 });
}
}
}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
index 709e71d195..717485bcc1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
@@ -3,7 +3,6 @@
using NUnit.Framework;
using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
using osu.Framework.Utils;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
@@ -14,44 +13,41 @@ namespace osu.Game.Tests.Visual.Gameplay
[TestFixture]
public class TestSceneStarCounter : OsuTestScene
{
+ private readonly StarCounter starCounter;
+ private readonly OsuSpriteText starsLabel;
+
public TestSceneStarCounter()
{
- StarCounter stars = new StarCounter
+ starCounter = new StarCounter
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
- Current = 5,
};
- Add(stars);
+ Add(starCounter);
- SpriteText starsLabel = new OsuSpriteText
+ starsLabel = new OsuSpriteText
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Scale = new Vector2(2),
Y = 50,
- Text = stars.Current.ToString("0.00"),
};
Add(starsLabel);
- AddRepeatStep(@"random value", delegate
- {
- stars.Current = RNG.NextSingle() * (stars.StarCount + 1);
- starsLabel.Text = stars.Current.ToString("0.00");
- }, 10);
+ setStars(5);
- AddStep(@"Stop animation", delegate
- {
- stars.StopAnimation();
- });
+ AddRepeatStep("random value", () => setStars(RNG.NextSingle() * (starCounter.StarCount + 1)), 10);
+ AddSliderStep("exact value", 0f, 10f, 5f, setStars);
+ AddStep("stop animation", () => starCounter.StopAnimation());
+ AddStep("reset", () => setStars(0));
+ }
- AddStep(@"Reset", delegate
- {
- stars.Current = 0;
- starsLabel.Text = stars.Current.ToString("0.00");
- });
+ private void setStars(float stars)
+ {
+ starCounter.Current = stars;
+ starsLabel.Text = starCounter.Current.ToString("0.00");
}
}
}
diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index b13d6485ac..894a21fcf3 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Graphics.UserInterface
public override void DisplayAt(float scale)
{
- scale = Math.Clamp(scale, min_star_scale, 1);
+ scale = (float)Interpolation.Lerp(min_star_scale, 1, Math.Clamp(scale, 0, 1));
this.FadeTo(scale, fading_duration);
Icon.ScaleTo(scale, scaling_duration, scaling_easing);
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 9c799bcf32..95bc72edf6 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -263,18 +263,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
OnApply();
HitObjectApplied?.Invoke(this);
- // If not loaded, the state update happens in LoadComplete(). Otherwise, the update is scheduled to allow for lifetime updates.
+ // If not loaded, the state update happens in LoadComplete().
if (IsLoaded)
{
- Scheduler.Add(() =>
- {
- if (Result.IsHit)
- updateState(ArmedState.Hit, true);
- else if (Result.HasResult)
- updateState(ArmedState.Miss, true);
- else
- updateState(ArmedState.Idle, true);
- });
+ if (Result.IsHit)
+ updateState(ArmedState.Hit, true);
+ else if (Result.HasResult)
+ updateState(ArmedState.Miss, true);
+ else
+ updateState(ArmedState.Idle, true);
}
hasHitObjectApplied = true;
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index def5f396f1..57f9a7f221 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -496,10 +496,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
double offset = result.Time.Value - movementBlueprints.First().HitObject.StartTime;
foreach (HitObject obj in Beatmap.SelectedHitObjects)
- {
obj.StartTime += offset;
- Beatmap.Update(obj);
- }
}
return true;
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index 62187aed24..2dcb416a03 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Screens.Edit
var newState = stream.ToArray();
// if the previous state is binary equal we don't need to push a new one, unless this is the initial state.
- if (savedStates.Count > 0 && newState.SequenceEqual(savedStates.Last())) return;
+ if (savedStates.Count > 0 && newState.SequenceEqual(savedStates[currentState])) return;
if (currentState < savedStates.Count - 1)
savedStates.RemoveRange(currentState + 1, savedStates.Count - currentState - 1);
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 54f3fcede6..e201383d51 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index 692dac909a..e5f7581404 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
-
+
@@ -88,7 +88,7 @@
-
+