diff --git a/README.md b/README.md
index 67027bb9f3..df4cabc24f 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,13 @@ Rhythm is just a *click* away. The future of [osu!](https://osu.ppy.sh) and the
## Status
-This project is still heavily under development, but is in a state where users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve over the coming months and hopefully bring some new unique features to the table.
+This project is under heavy development, but is in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
-We are accepting bug reports (please report with as much detail as possible). Feature requests are welcome as long as you read and understand the contribution guidelines listed below.
+We are accepting bug reports (please report with as much detail as possible). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features. A few resources are available as starting points to getting involved and understanding the project:
-Detailed changelogs are published on the [official osu! site](https://osu.ppy.sh/home/changelog).
+- Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer).
+- You can learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
+- Read peppy's [latest blog post](https://blog.ppy.sh/a-definitive-lazer-faq/) exploring where lazer is currently and the roadmap going forward.
## Requirements
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 5820da811d..2c6f34d8a6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -134,6 +134,22 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddAssert("playlist has 2 items", () => Room.Playlist.Count == 2);
}
+ [Test]
+ public void TestAddItemAfterRearrangement()
+ {
+ AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+ AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+ AddStep("rearrange", () =>
+ {
+ var item = Room.Playlist[0];
+ Room.Playlist.RemoveAt(0);
+ Room.Playlist.Add(item);
+ });
+
+ AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+ AddAssert("new item has id 2", () => Room.Playlist.Last().ID == 2);
+ }
+
private class TestMatchSongSelect : MatchSongSelect
{
public new MatchBeatmapDetailArea BeatmapDetails => (MatchBeatmapDetailArea)base.BeatmapDetails;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
index 468239cf08..5e2b125521 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
@@ -4,8 +4,10 @@
using System;
using System.Collections.Generic;
using NUnit.Framework;
+using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
+using osu.Game.Overlays;
using osu.Game.Overlays.Profile.Sections;
namespace osu.Game.Tests.Visual.Online
@@ -17,6 +19,9 @@ namespace osu.Game.Tests.Visual.Online
typeof(CounterPill)
};
+ [Cached]
+ private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
+
private readonly CounterPill pill;
private readonly BindableInt value = new BindableInt();
diff --git a/osu.Game/Overlays/Profile/Sections/CounterPill.cs b/osu.Game/Overlays/Profile/Sections/CounterPill.cs
index bd760c4139..52adefa4ad 100644
--- a/osu.Game/Overlays/Profile/Sections/CounterPill.cs
+++ b/osu.Game/Overlays/Profile/Sections/CounterPill.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Framework.Bindables;
using osu.Game.Graphics.Sprites;
+using osu.Framework.Allocation;
namespace osu.Game.Overlays.Profile.Sections
{
@@ -16,9 +17,10 @@ namespace osu.Game.Overlays.Profile.Sections
public readonly BindableInt Current = new BindableInt();
- private readonly OsuSpriteText counter;
+ private OsuSpriteText counter;
- public CounterPill()
+ [BackgroundDependencyLoader]
+ private void load(OverlayColourProvider colourProvider)
{
AutoSizeAxes = Axes.Both;
Alpha = 0;
@@ -28,14 +30,15 @@ namespace osu.Game.Overlays.Profile.Sections
new Box
{
RelativeSizeAxes = Axes.Both,
- Colour = OsuColour.Gray(0.05f)
+ Colour = colourProvider.Background6
},
counter = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Margin = new MarginPadding { Horizontal = 10, Vertical = 5 },
- Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold)
+ Font = OsuFont.GetFont(weight: FontWeight.Bold),
+ Colour = colourProvider.Foreground1
}
};
}
@@ -54,7 +57,7 @@ namespace osu.Game.Overlays.Profile.Sections
return;
}
- counter.Text = value.NewValue.ToString();
+ counter.Text = value.NewValue.ToString("N0");
this.FadeIn(duration, Easing.OutQuint);
}
}
diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
index 33811cc982..e609fa1487 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Rankings
private void getSpotlights()
{
spotlightsRequest = new GetSpotlightsRequest();
- spotlightsRequest.Success += response => selector.Spotlights = response.Spotlights;
+ spotlightsRequest.Success += response => Schedule(() => selector.Spotlights = response.Spotlights);
api.Queue(spotlightsRequest);
}
@@ -151,11 +151,11 @@ namespace osu.Game.Overlays.Rankings
protected override void Dispose(bool isDisposing)
{
- base.Dispose(isDisposing);
-
spotlightsRequest?.Cancel();
getRankingsRequest?.Cancel();
cancellationToken?.Cancel();
+
+ base.Dispose(isDisposing);
}
}
}
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index a115ab9841..2f3674642e 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Select
{
PlaylistItem item = new PlaylistItem
{
- ID = (Playlist.LastOrDefault()?.ID + 1) ?? 0,
+ ID = Playlist.Count == 0 ? 0 : Playlist.Max(p => p.ID) + 1
};
populateItemFromCurrent(item);
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6dcb529dc4..5e78c69f4d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index 946d039195..351126e3b9 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -87,6 +87,6 @@
-
+