diff --git a/global.json b/global.json
deleted file mode 100644
index 2c93a533e4..0000000000
--- a/global.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "sdk": {
- "allowPrerelease": false,
- "rollForward": "minor",
- "version": "3.1.100"
- },
- "msbuild-sdks": {
- "Microsoft.Build.Traversal": "3.0.2"
- }
-}
\ No newline at end of file
diff --git a/osu.Android.props b/osu.Android.props
index 8a74f8ddce..db5c933c41 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
-
+
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 62d8c17058..d1515acafa 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -5,6 +5,7 @@ using System;
using System.IO;
using System.Linq;
using System.Reflection;
+using System.Runtime.Versioning;
using System.Threading.Tasks;
using Microsoft.Win32;
using osu.Desktop.Overlays;
@@ -56,16 +57,16 @@ namespace osu.Desktop
string stableInstallPath;
- try
+ if (OperatingSystem.IsWindows())
{
- using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
- stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString()?.Split('"')[1].Replace("osu!.exe", "");
+ try
+ {
+ stableInstallPath = getStableInstallPathFromRegistry();
- if (checkExists(stableInstallPath))
- return stableInstallPath;
- }
- catch
- {
+ if (!string.IsNullOrEmpty(stableInstallPath) && checkExists(stableInstallPath))
+ return stableInstallPath;
+ }
+ catch { }
}
stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
@@ -79,6 +80,13 @@ namespace osu.Desktop
return null;
}
+ [SupportedOSPlatform("windows")]
+ private string getStableInstallPathFromRegistry()
+ {
+ using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+ return key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString()?.Split('"')[1].Replace("osu!.exe", "");
+ }
+
protected override UpdateManager CreateUpdateManager()
{
switch (RuntimeInfo.OS)
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 8b8ad9f8af..4554f8b83a 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -1,6 +1,6 @@
- netcoreapp3.1
+ net5.0
WinExe
true
A free-to-win rhythm game. Rhythm is just a *click* away!
diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index ff26f4afaa..7805bfcefc 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.1
+ net5.0
Exe
false
diff --git a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
index 51d2032795..54fddc297e 100644
--- a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
+++ b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
@@ -9,7 +9,7 @@
WinExe
- netcoreapp3.1
+ net5.0
diff --git a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
index 3261f632f2..d55b4fe08a 100644
--- a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
+++ b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
@@ -9,7 +9,7 @@
WinExe
- netcoreapp3.1
+ net5.0
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 496b1b3559..f697a77d94 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -1,9 +1,11 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
using osu.Framework.Graphics;
+using osu.Game.Audio;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Rulesets.Mods;
@@ -34,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Tests
[TestCase(true)]
public void TestLongSpinner(bool autoplay)
{
- AddStep("Very short spinner", () => SetContents(() => testSingle(5, autoplay, 2000)));
+ AddStep("Very long spinner", () => SetContents(() => testSingle(5, autoplay, 4000)));
AddUntilStep("Wait for completion", () => drawableSpinner.Result.HasResult);
AddUntilStep("Check correct progress", () => drawableSpinner.Progress == (autoplay ? 1 : 0));
}
@@ -55,7 +57,11 @@ namespace osu.Game.Rulesets.Osu.Tests
var spinner = new Spinner
{
StartTime = Time.Current + delay,
- EndTime = Time.Current + delay + length
+ EndTime = Time.Current + delay + length,
+ Samples = new List
+ {
+ new HitSampleInfo("hitnormal")
+ }
};
spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = circleSize });
diff --git a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
index 32243e0bc3..345c3e6d35 100644
--- a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
+++ b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
@@ -9,7 +9,7 @@
WinExe
- netcoreapp3.1
+ net5.0
diff --git a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
index 210f81d111..2a5a2e2fdb 100644
--- a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
@@ -9,7 +9,7 @@
WinExe
- netcoreapp3.1
+ net5.0
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index a5fd5afcde..35b3bfc1f8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
+using System.Diagnostics;
using System.Linq;
using NUnit.Framework;
using osu.Framework.Allocation;
@@ -74,6 +75,8 @@ namespace osu.Game.Tests.Visual.Gameplay
switch (args.Action)
{
case NotifyCollectionChangedAction.Add:
+ Debug.Assert(args.NewItems != null);
+
foreach (int user in args.NewItems)
{
if (user == api.LocalUser.Value.Id)
@@ -83,6 +86,8 @@ namespace osu.Game.Tests.Visual.Gameplay
break;
case NotifyCollectionChangedAction.Remove:
+ Debug.Assert(args.OldItems != null);
+
foreach (int user in args.OldItems)
{
if (user == api.LocalUser.Value.Id)
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 80d1acd145..7a3845cbf3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -143,6 +143,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
RoomManager =
{
TimeBetweenListingPolls = { Value = 1 },
+ TimeBetweenSelectionPolls = { Value = 1 }
}
};
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 9049b67f90..c0c0578391 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -10,7 +10,7 @@
WinExe
- netcoreapp3.1
+ net5.0
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index dc4f22788d..185b35e40d 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -11,7 +11,7 @@
WinExe
- netcoreapp3.1
+ net5.0
diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 3b58062add..37d262abe5 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -260,17 +260,10 @@ namespace osu.Game.Beatmaps
}
catch (BeatmapInvalidForRulesetException e)
{
- // Conversion has failed for the given ruleset, so return the difficulty in the beatmap's default ruleset.
-
- // Ensure the beatmap's default ruleset isn't the one already being converted to.
- // This shouldn't happen as it means something went seriously wrong, but if it does an endless loop should be avoided.
if (rulesetInfo.Equals(beatmapInfo.Ruleset))
- {
Logger.Error(e, $"Failed to convert {beatmapInfo.OnlineBeatmapID} to the beatmap's default ruleset ({beatmapInfo.Ruleset}).");
- return new StarDifficulty();
- }
- return GetAsync(new DifficultyCacheLookup(key.Beatmap, key.Beatmap.Ruleset, key.OrderedMods)).Result;
+ return new StarDifficulty();
}
catch
{
diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index 8ca65525db..e0c0f56cb3 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -137,6 +137,8 @@ namespace osu.Game.Database
modelBuilder.Entity().HasIndex(b => new { b.RulesetID, b.Variant });
modelBuilder.Entity().HasIndex(b => b.IntAction);
+ modelBuilder.Entity().Ignore(b => b.KeyCombination);
+ modelBuilder.Entity().Ignore(b => b.Action);
modelBuilder.Entity().HasIndex(b => new { b.RulesetID, b.Variant });
diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
new file mode 100644
index 0000000000..b25b00eb84
--- /dev/null
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -0,0 +1,108 @@
+// 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.Collections.Generic;
+using System.Linq;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Platform;
+using osu.Game.Database;
+using osu.Game.Input.Bindings;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Input
+{
+ public class KeyBindingStore : DatabaseBackedStore
+ {
+ public event Action KeyBindingChanged;
+
+ public KeyBindingStore(DatabaseContextFactory contextFactory, RulesetStore rulesets, Storage storage = null)
+ : base(contextFactory, storage)
+ {
+ using (ContextFactory.GetForWrite())
+ {
+ foreach (var info in rulesets.AvailableRulesets)
+ {
+ var ruleset = info.CreateInstance();
+ foreach (var variant in ruleset.AvailableVariants)
+ insertDefaults(ruleset.GetDefaultKeyBindings(variant), info.ID, variant);
+ }
+ }
+ }
+
+ public void Register(KeyBindingContainer manager) => insertDefaults(manager.DefaultKeyBindings);
+
+ ///
+ /// Retrieve all user-defined key combinations (in a format that can be displayed) for a specific action.
+ ///
+ /// The action to lookup.
+ /// A set of display strings for all the user's key configuration for the action.
+ public IEnumerable GetReadableKeyCombinationsFor(GlobalAction globalAction)
+ {
+ foreach (var action in Query().Where(b => (GlobalAction)b.Action == globalAction))
+ {
+ string str = action.KeyCombination.ReadableString();
+
+ // even if found, the readable string may be empty for an unbound action.
+ if (str.Length > 0)
+ yield return str;
+ }
+ }
+
+ private void insertDefaults(IEnumerable defaults, int? rulesetId = null, int? variant = null)
+ {
+ using (var usage = ContextFactory.GetForWrite())
+ {
+ // compare counts in database vs defaults
+ foreach (var group in defaults.GroupBy(k => k.Action))
+ {
+ int count = Query(rulesetId, variant).Count(k => (int)k.Action == (int)group.Key);
+ int aimCount = group.Count();
+
+ if (aimCount <= count)
+ continue;
+
+ foreach (var insertable in group.Skip(count).Take(aimCount - count))
+ {
+ // insert any defaults which are missing.
+ usage.Context.DatabasedKeyBinding.Add(new DatabasedKeyBinding
+ {
+ KeyCombination = insertable.KeyCombination,
+ Action = insertable.Action,
+ RulesetID = rulesetId,
+ Variant = variant
+ });
+
+ // required to ensure stable insert order (https://github.com/dotnet/efcore/issues/11686)
+ usage.Context.SaveChanges();
+ }
+ }
+ }
+ }
+
+ ///
+ /// Retrieve s for a specified ruleset/variant content.
+ ///
+ /// The ruleset's internal ID.
+ /// An optional variant.
+ ///
+ public List Query(int? rulesetId = null, int? variant = null) =>
+ ContextFactory.Get().DatabasedKeyBinding.Where(b => b.RulesetID == rulesetId && b.Variant == variant).ToList();
+
+ public void Update(KeyBinding keyBinding)
+ {
+ using (ContextFactory.GetForWrite())
+ {
+ var dbKeyBinding = (DatabasedKeyBinding)keyBinding;
+ Refresh(ref dbKeyBinding);
+
+ if (dbKeyBinding.KeyCombination.Equals(keyBinding.KeyCombination))
+ return;
+
+ dbKeyBinding.KeyCombination = keyBinding.KeyCombination;
+ }
+
+ KeyBindingChanged?.Invoke();
+ }
+ }
+}
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index b97fcc9ae7..19dd473230 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Threading.Tasks;
+using osu.Game.Online.Rooms;
namespace osu.Game.Online.Multiplayer
{
@@ -47,6 +48,13 @@ namespace osu.Game.Online.Multiplayer
/// The new state of the user.
Task UserStateChanged(int userId, MultiplayerUserState state);
+ ///
+ /// Signals that a user in this room changed their beatmap availability state.
+ ///
+ /// The ID of the user whose beatmap availability state has changed.
+ /// The new beatmap availability state of the user.
+ Task UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability);
+
///
/// Signals that a match is to be started. This will *only* be sent to clients which are to begin loading at this point.
///
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 481e3fb1de..09816974a7 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Threading.Tasks;
+using osu.Game.Online.Rooms;
namespace osu.Game.Online.Multiplayer
{
@@ -40,6 +41,12 @@ namespace osu.Game.Online.Multiplayer
/// If the user is not in a room.
Task ChangeState(MultiplayerUserState newState);
+ ///
+ /// Change the local user's availability state of the current beatmap set in joined room.
+ ///
+ /// The proposed new beatmap availability state.
+ Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
+
///
/// As the host of a room, start the match.
///
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 7cd1ef78f7..50dc8f661c 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -14,6 +14,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Logging;
using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
namespace osu.Game.Online.Multiplayer
{
@@ -173,6 +174,14 @@ namespace osu.Game.Online.Multiplayer
return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
}
+ public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
+ {
+ if (!isConnected.Value)
+ return Task.CompletedTask;
+
+ return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeBeatmapAvailability), newBeatmapAvailability);
+ }
+
public override Task StartMatch()
{
if (!isConnected.Value)
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 99624dc3e7..2590acbc81 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -5,6 +5,7 @@
using System;
using Newtonsoft.Json;
+using osu.Game.Online.Rooms;
using osu.Game.Users;
namespace osu.Game.Online.Multiplayer
@@ -16,6 +17,11 @@ namespace osu.Game.Online.Multiplayer
public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
+ ///
+ /// The availability state of the current beatmap.
+ ///
+ public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
+
public User? User { get; set; }
[JsonConstructor]
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 34cba09e8c..fbdfb6a8c5 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Online.Multiplayer
///
/// Whether the is currently connected.
+ /// This is NOT thread safe and usage should be scheduled.
///
public abstract IBindable IsConnected { get; }
@@ -227,6 +228,8 @@ namespace osu.Game.Online.Multiplayer
public abstract Task ChangeState(MultiplayerUserState newState);
+ public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
+
public abstract Task StartMatch();
Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
@@ -354,6 +357,27 @@ namespace osu.Game.Online.Multiplayer
return Task.CompletedTask;
}
+ Task IMultiplayerClient.UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability)
+ {
+ if (Room == null)
+ return Task.CompletedTask;
+
+ Scheduler.Add(() =>
+ {
+ var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
+
+ // errors here are not critical - beatmap availability state is mostly for display.
+ if (user == null)
+ return;
+
+ user.BeatmapAvailability = beatmapAvailability;
+
+ RoomUpdated?.Invoke();
+ }, false);
+
+ return Task.CompletedTask;
+ }
+
Task IMultiplayerClient.LoadRequested()
{
if (Room == null)
diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
new file mode 100644
index 0000000000..e7dbc5f436
--- /dev/null
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -0,0 +1,40 @@
+// 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 Newtonsoft.Json;
+
+namespace osu.Game.Online.Rooms
+{
+ ///
+ /// The local availability information about a certain beatmap for the client.
+ ///
+ public class BeatmapAvailability : IEquatable
+ {
+ ///
+ /// The beatmap's availability state.
+ ///
+ public readonly DownloadState State;
+
+ ///
+ /// The beatmap's downloading progress, null when not in state.
+ ///
+ public readonly double? DownloadProgress;
+
+ [JsonConstructor]
+ private BeatmapAvailability(DownloadState state, double? downloadProgress = null)
+ {
+ State = state;
+ DownloadProgress = downloadProgress;
+ }
+
+ public static BeatmapAvailability NotDownloaded() => new BeatmapAvailability(DownloadState.NotDownloaded);
+ public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
+ public static BeatmapAvailability Importing() => new BeatmapAvailability(DownloadState.Importing);
+ public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);
+
+ public bool Equals(BeatmapAvailability other) => other != null && State == other.State && DownloadProgress == other.DownloadProgress;
+
+ public override string ToString() => $"{string.Join(", ", State, $"{DownloadProgress:0.00%}")}";
+ }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 20836c0e68..12f7625bf9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -138,6 +138,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
scrollToTrackTime();
}
+ protected override bool OnScroll(ScrollEvent e)
+ {
+ // if this is not a precision scroll event, let the editor handle the seek itself (for snapping support)
+ if (!e.AltPressed && !e.IsPrecise)
+ return false;
+
+ return base.OnScroll(e);
+ }
+
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
diff --git a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
index 0eec155060..dcf3c94b76 100644
--- a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
+using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@@ -47,9 +48,11 @@ namespace osu.Game.Screens.OnlinePlay.Components
pollReq.Success += result =>
{
- var rooms = new List(roomManager.Rooms);
+ // existing rooms need to be ordered by their position because the received of NotifyRoomsReceives expects to be able to sort them based on this order.
+ var rooms = new List(roomManager.Rooms.OrderBy(r => r.Position.Value));
int index = rooms.FindIndex(r => r.RoomID.Value == result.RoomID.Value);
+
if (index < 0)
return;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index 87b0e49b5b..a13d2cf540 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
base.LoadComplete();
- isConnected.BindValueChanged(_ => updateState());
- operationInProgress.BindValueChanged(_ => updateState(), true);
+ isConnected.BindValueChanged(_ => Scheduler.AddOnce(updateState));
+ operationInProgress.BindValueChanged(_ => Scheduler.AddOnce(updateState), true);
}
private void updateState() => Enabled.Value = isConnected.Value && !operationInProgress.Value;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 310617a0bc..76f5c74433 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
if (!this.IsCurrentScreen())
{
multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+ multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
}
else
{
@@ -40,16 +41,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
case LoungeSubScreen _:
multiplayerRoomManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+ multiplayerRoomManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
break;
// Don't poll inside the match or anywhere else.
default:
multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+ multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
break;
}
}
- Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value})");
+ Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
}
protected override Room CreateNewRoom()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 4bee502e2e..04d9e0a72a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -77,14 +77,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
});
isConnected = client.IsConnected.GetBoundCopy();
- isConnected.BindValueChanged(connected =>
+ isConnected.BindValueChanged(connected => Schedule(() =>
{
if (!connected.NewValue)
{
// messaging to the user about this disconnect will be provided by the MultiplayerMatchSubScreen.
failAndBail();
}
- }, true);
+ }), true);
Debug.Assert(client.Room != null);
}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 5c327266a3..61d8896732 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
private StatefulMultiplayerClient multiplayerClient { get; set; }
public readonly Bindable TimeBetweenListingPolls = new Bindable();
-
+ public readonly Bindable TimeBetweenSelectionPolls = new Bindable();
private readonly IBindable isConnected = new Bindable();
private readonly Bindable allowPolling = new Bindable();
@@ -34,10 +34,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
base.LoadComplete();
isConnected.BindTo(multiplayerClient.IsConnected);
- isConnected.BindValueChanged(_ => Schedule(updatePolling));
- JoinedRoom.BindValueChanged(_ => updatePolling());
-
- updatePolling();
+ isConnected.BindValueChanged(_ => Scheduler.AddOnce(updatePolling));
+ JoinedRoom.BindValueChanged(_ => Scheduler.AddOnce(updatePolling), true);
}
public override void CreateRoom(Room room, Action onSuccess = null, Action onError = null)
@@ -119,6 +117,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
AllowPolling = { BindTarget = allowPolling }
},
+ new MultiplayerSelectionPollingComponent
+ {
+ TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
+ AllowPolling = { BindTarget = allowPolling }
+ }
};
private class MultiplayerListingPollingComponent : ListingPollingComponent
@@ -141,5 +144,26 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
}
+
+ private class MultiplayerSelectionPollingComponent : SelectionPollingComponent
+ {
+ public readonly IBindable AllowPolling = new Bindable();
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ AllowPolling.BindValueChanged(allowPolling =>
+ {
+ if (!allowPolling.NewValue)
+ return;
+
+ if (IsLoaded)
+ PollImmediately();
+ });
+ }
+
+ protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
+ }
}
}
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 40db04ae71..6c0bd3a228 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -500,7 +500,7 @@ namespace osu.Game.Screens.Select
if (beatmap != null)
{
- if (beatmap.BeatmapSetInfoID == beatmapNoDebounce?.BeatmapSetInfoID)
+ if (beatmap.BeatmapSetInfoID == previous?.BeatmapInfo.BeatmapSetInfoID)
sampleChangeDifficulty.Play();
else
sampleChangeBeatmap.Play();
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e4e5bf2f75..090ffaebd7 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -378,8 +378,10 @@ namespace osu.Game.Skinning
// kind of wasteful that we throw this away, but should do for now.
if (createDrawable() != null)
{
- if (Configuration.LegacyVersion > 1)
- return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, getParticleTexture(resultComponent.Component));
+ var particle = getParticleTexture(resultComponent.Component);
+
+ if (particle != null)
+ return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, particle);
else
return new LegacyJudgementPieceOld(resultComponent.Component, createDrawable);
}
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 2ce5211757..7fbc770351 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.Online.API;
using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
using osu.Game.Users;
namespace osu.Game.Tests.Visual.Multiplayer
@@ -77,6 +78,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
});
}
+ public void ChangeUserBeatmapAvailability(int userId, BeatmapAvailability newBeatmapAvailability)
+ {
+ Debug.Assert(Room != null);
+
+ ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged(userId, newBeatmapAvailability);
+ }
+
protected override Task JoinRoom(long roomId)
{
var user = new MultiplayerRoomUser(api.LocalUser.Value.Id) { User = api.LocalUser.Value };
@@ -108,6 +116,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
return Task.CompletedTask;
}
+ public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
+ {
+ ChangeUserBeatmapAvailability(api.LocalUser.Value.Id, newBeatmapAvailability);
+ return Task.CompletedTask;
+ }
+
public override Task StartMatch()
{
Debug.Assert(Room != null);
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e43da1df7b..010fad4f7e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -27,7 +27,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index aecc8cd5eb..225cf981f2 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
diff --git a/osu.sln b/osu.sln
index 1d64f6ff10..c9453359b1 100644
--- a/osu.sln
+++ b/osu.sln
@@ -57,7 +57,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Directory.Build.props = Directory.Build.props
- global.json = global.json
osu.Android.props = osu.Android.props
osu.iOS.props = osu.iOS.props
CodeAnalysis\osu.ruleset = CodeAnalysis\osu.ruleset