Merge branch 'master' into polygon-tool

.config/dotnet-tools.json

@@ -21,7 +21,7 @@
  ]
  },
  "ppy.localisationanalyser.tools": {
- "version": "2024.517.0",
+ "version": "2024.802.0",
  "commands": [
  "localisation"
  ]

.github/workflows/ci.yml

@@ -64,10 +64,11 @@ jobs:
  matrix:
  os:
  - { prettyname: Windows, fullname: windows-latest }
- - { prettyname: macOS, fullname: macos-latest }
+ # macOS runner performance has gotten unbearably slow so let's turn them off temporarily.
+ # - { prettyname: macOS, fullname: macos-latest }
  - { prettyname: Linux, fullname: ubuntu-latest }
  threadingMode: ['SingleThread', 'MultiThreaded']
- timeout-minutes: 60
+ timeout-minutes: 120
  steps:
  - name: Checkout
  uses: actions/checkout@v4
@@ -120,9 +121,7 @@ jobs:
 
  build-only-ios:
  name: Build only (iOS)
- # `macos-13` is required, because the newest Microsoft.iOS.Sdk versions require Xcode 14.3.
- # TODO: can be changed to `macos-latest` once `macos-13` becomes latest (currently in beta: https://github.com/actions/runner-images/tree/main#available-images)
- runs-on: macos-13
+ runs-on: macos-latest
  timeout-minutes: 60
  steps:
  - name: Checkout
@@ -136,8 +135,5 @@ jobs:
  - name: Install .NET Workloads
  run: dotnet workload install maui-ios
 
- - name: Select Xcode 15.2
- run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
-
  - name: Build
  run: dotnet build -c Debug osu.iOS

.github/workflows/diffcalc.yml

@@ -111,7 +111,7 @@ jobs:
  steps:
  - name: Check permissions
  run: |
- ALLOWED_USERS=(smoogipoo peppy bdach)
+ ALLOWED_USERS=(smoogipoo peppy bdach frenzibyte)
  for i in "${ALLOWED_USERS[@]}"; do
  if [[ "${{ github.actor }}" == "$i" ]]; then
  exit 0

.gitignore

@@ -265,6 +265,8 @@ __pycache__/
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
+.idea/*/.idea/projectSettingsUpdater.xml
+.idea/*/.idea/encodings.xml
 
 # Generated files
 .idea/**/contentModel.xml

CONTRIBUTING.md

@@ -55,7 +55,7 @@ When in doubt, it's probably best to start with a discussion first. We will esca
 
 While pull requests from unaffiliated contributors are welcome, please note that due to significant community interest and limited review throughput, the core team's primary focus is on the issues which are currently [on the roadmap](https://github.com/orgs/ppy/projects/7/views/6). Reviewing PRs that fall outside of the scope of the roadmap is done on a best-effort basis, so please be aware that it may take a while before a core maintainer gets around to review your change.
 
-The [issue tracker](https://github.com/ppy/osu/issues) should provide plenty of issues to start with. We also have a [`good-first-issue`](https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+label%3Agood-first-issue) label, although from experience it is not used very often, as it is relatively rare that we can spot an issue that will definitively be a good first issue for a new contributor regardless of their programming experience.
+The [issue tracker](https://github.com/ppy/osu/issues) should provide plenty of issues to start with. We also have a [`good first issue`](https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) label, although from experience it is not used very often, as it is relatively rare that we can spot an issue that will definitively be a good first issue for a new contributor regardless of their programming experience.
 
 In the case of simple issues, a direct PR is okay. However, if you decide to work on an existing issue which doesn't seem trivial, **please ask us first**. This way we can try to estimate if it is a good fit for you and provide the correct direction on how to address it. In addition, note that while we do not rule out external contributors from working on roadmapped issues, we will generally prefer to handle them ourselves unless they're not very time sensitive.
 

CodeAnalysis/BannedSymbols.txt

@@ -7,7 +7,6 @@ T:SixLabors.ImageSharp.IDeepCloneable`1;Use osu.Game.Utils.IDeepCloneable<T> ins
 M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
 M:osu.Framework.Bindables.IBindableList`1.GetBoundCopy();Fails on iOS. Use manual ctor + BindTo instead. (see https://github.com/mono/mono/issues/19900)
 T:NuGet.Packaging.CollectionExtensions;Don't use internal extension methods.
-M:System.Enum.HasFlag(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
 M:Realms.IRealmCollection`1.SubscribeForNotifications`1(Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IRealmCollection<T>,NotificationCallbackDelegate<T>) instead.
 M:System.Guid.#ctor;Probably meaning to use Guid.NewGuid() instead. If actually wanting empty, use Guid.Empty.
 M:Realms.CollectionExtensions.SubscribeForNotifications`1(System.Linq.IQueryable{``0},Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IQueryable<T>,NotificationCallbackDelegate<T>) instead.

osu.Android.props

@@ -10,7 +10,7 @@
  <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="ppy.osu.Framework.Android" Version="2024.618.0" />
+ <PackageReference Include="ppy.osu.Framework.Android" Version="2024.809.2" />
  </ItemGroup>
  <PropertyGroup>
  <!-- Fody does not handle Android build well, and warns when unchanged.

osu.Desktop/Security/ElevatedPrivilegesChecker.cs

@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Security.Principal;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -21,48 +20,14 @@ public partial class ElevatedPrivilegesChecker : Component
  [Resolved]
  private INotificationOverlay notifications { get; set; } = null!;
 
- private bool elevated;
-
- [BackgroundDependencyLoader]
- private void load()
- {
- elevated = checkElevated();
- }
-
  protected override void LoadComplete()
  {
  base.LoadComplete();
 
- if (elevated)
+ if (Environment.IsPrivilegedProcess)
  notifications.Post(new ElevatedPrivilegesNotification());
  }
 
- private bool checkElevated()
- {
- try
- {
- switch (RuntimeInfo.OS)
- {
- case RuntimeInfo.Platform.Windows:
- if (!OperatingSystem.IsWindows()) return false;
-
- var windowsIdentity = WindowsIdentity.GetCurrent();
- var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
-
- return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
-
- case RuntimeInfo.Platform.macOS:
- case RuntimeInfo.Platform.Linux:
- return Mono.Unix.Native.Syscall.geteuid() == 0;
- }
- }
- catch
- {
- }
-
- return false;
- }
-
  private partial class ElevatedPrivilegesNotification : SimpleNotification
  {
  public override bool IsImportant => true;

osu.Desktop/osu.Desktop.csproj

@@ -24,7 +24,6 @@
  </ItemGroup>
  <ItemGroup Label="Package References">
  <PackageReference Include="Clowd.Squirrel" Version="2.11.1" />
- <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
  <PackageReference Include="System.IO.Packaging" Version="8.0.0" />
  <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
  </ItemGroup>

osu.Game.Rulesets.Catch.Tests/Editor/TestSceneCatchEditorSaving.cs

@@ -0,0 +1,66 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Catch.Tests.Editor
+{
+ public partial class TestSceneCatchEditorSaving : EditorSavingTestScene
+ {
+ protected override Ruleset CreateRuleset() => new CatchRuleset();
+
+ [Test]
+ public void TestCatchJuiceStreamTickCorrect()
+ {
+ AddStep("enter timing mode", () => InputManager.Key(Key.F3));
+ AddStep("add timing point", () => EditorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint()));
+ AddStep("enter compose mode", () => InputManager.Key(Key.F1));
+
+ Vector2 startPoint = Vector2.Zero;
+ float increment = 0;
+
+ AddUntilStep("wait for playfield", () => this.ChildrenOfType<CatchPlayfield>().FirstOrDefault()?.IsLoaded == true);
+ AddStep("move to centre", () =>
+ {
+ var playfield = this.ChildrenOfType<CatchPlayfield>().Single();
+ startPoint = playfield.ScreenSpaceDrawQuad.Centre + new Vector2(0, playfield.ScreenSpaceDrawQuad.Height / 3);
+ increment = playfield.ScreenSpaceDrawQuad.Height / 10;
+ InputManager.MoveMouseTo(startPoint);
+ });
+ AddStep("choose juice stream placing tool", () => InputManager.Key(Key.Number3));
+ AddStep("start placement", () => InputManager.Click(MouseButton.Left));
+
+ AddStep("move to next", () => InputManager.MoveMouseTo(startPoint + new Vector2(2 * increment, -increment)));
+ AddStep("add node", () => InputManager.Click(MouseButton.Left));
+
+ AddStep("move to next", () => InputManager.MoveMouseTo(startPoint + new Vector2(-2 * increment, -2 * increment)));
+ AddStep("add node", () => InputManager.Click(MouseButton.Left));
+
+ AddStep("move to next", () => InputManager.MoveMouseTo(startPoint + new Vector2(0, -3 * increment)));
+ AddStep("end placement", () => InputManager.Click(MouseButton.Right));
+
+ AddUntilStep("juice stream placed", () => EditorBeatmap.HitObjects, () => Has.Count.EqualTo(1));
+
+ int largeDropletCount = 0, tinyDropletCount = 0;
+ AddStep("store droplet count", () =>
+ {
+ largeDropletCount = EditorBeatmap.HitObjects[0].NestedHitObjects.Count(t => t.GetType() == typeof(Droplet));
+ tinyDropletCount = EditorBeatmap.HitObjects[0].NestedHitObjects.Count(t => t.GetType() == typeof(TinyDroplet));
+ });
+
+ SaveEditor();
+ ReloadEditorToSameBeatmap();
+
+ AddAssert("large droplet count is the same", () => EditorBeatmap.HitObjects[0].NestedHitObjects.Count(t => t.GetType() == typeof(Droplet)), () => Is.EqualTo(largeDropletCount));
+ AddAssert("tiny droplet count is the same", () => EditorBeatmap.HitObjects[0].NestedHitObjects.Count(t => t.GetType() == typeof(TinyDroplet)), () => Is.EqualTo(tinyDropletCount));
+ }
+ }
+}

osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs

@@ -82,6 +82,7 @@ public void TestVertexDrag()
 
  AddMouseMoveStep(-100, 100);
  addVertexCheckStep(3, 1, times[0], positions[0]);
+ addDragEndStep();
  }
 
  [Test]
@@ -100,6 +101,9 @@ public void TestMultipleDrag()
  AddMouseMoveStep(times[2] - 50, positions[2] - 50);
  addVertexCheckStep(4, 1, times[1] - 50, positions[1] - 50);
  addVertexCheckStep(4, 2, times[2] - 50, positions[2] - 50);
+
+ AddStep("release control", () => InputManager.ReleaseKey(Key.ControlLeft));
+ addDragEndStep();
  }
 
  [Test]
@@ -113,6 +117,7 @@ public void TestSliderVelocityChange()
  addDragStartStep(times[1], positions[1]);
  AddMouseMoveStep(times[1], 400);
  AddAssert("slider velocity changed", () => !hitObject.SliderVelocityMultiplierBindable.IsDefault);
+ addDragEndStep();
  }
 
  [Test]
@@ -129,6 +134,7 @@ public void TestScrollWhileDrag()
  AddStep("scroll playfield", () => manualClock.CurrentTime += 200);
  AddMouseMoveStep(times[1] + 200, positions[1] + 100);
  addVertexCheckStep(2, 1, times[1] + 200, positions[1] + 100);
+ addDragEndStep();
  }
 
  [Test]
@@ -161,18 +167,18 @@ public void TestAddVertex()
  addAddVertexSteps(500, 150);
  addVertexCheckStep(3, 1, 500, 150);
 
- addAddVertexSteps(90, 200);
- addVertexCheckStep(4, 1, times[0], positions[0]);
+ addAddVertexSteps(160, 200);
+ addVertexCheckStep(4, 1, 160, 200);
 
  addAddVertexSteps(750, 180);
- addVertexCheckStep(5, 4, 750, 180);
+ addVertexCheckStep(5, 4, 800, 160);
  AddAssert("duration is changed", () => Precision.AlmostEquals(hitObject.Duration, 800 - times[0], 1e-3));
  }
 
  [Test]
  public void TestDeleteVertex()
  {
- double[] times = { 100, 300, 500 };
+ double[] times = { 100, 300, 400 };
  float[] positions = { 100, 200, 150 };
  addBlueprintStep(times, positions);
 
@@ -265,7 +271,7 @@ private void addDeleteVertexSteps(double time, float x)
  AddStep("delete vertex", () =>
  {
  InputManager.PressKey(Key.ShiftLeft);
- InputManager.Click(MouseButton.Left);
+ InputManager.Click(MouseButton.Right);
  InputManager.ReleaseKey(Key.ShiftLeft);
  });
  }

osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Skinning;
@@ -19,7 +18,7 @@ public partial class TestSceneCatchPlayerLegacySkin : LegacySkinPlayerTestScene
  protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
 
  [Test]
- public void TestLegacyHUDComboCounterHidden([Values] bool withModifiedSkin)
+ public void TestLegacyHUDComboCounterNotExistent([Values] bool withModifiedSkin)
  {
  if (withModifiedSkin)
  {
@@ -29,10 +28,7 @@ public void TestLegacyHUDComboCounterHidden([Values] bool withModifiedSkin)
  CreateTest();
  }
 
- AddAssert("legacy HUD combo counter hidden", () =>
- {
- return Player.ChildrenOfType<LegacyComboCounter>().All(c => c.ChildrenOfType<Container>().Single().Alpha == 0f);
- });
+ AddAssert("legacy HUD combo counter not added", () => !Player.ChildrenOfType<LegacyDefaultComboCounter>().Any());
  }
  }
 }

osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplayHandling.cs

@@ -0,0 +1,36 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Catch.Beatmaps;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Scoring;
+using osu.Game.Tests.Visual;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+ public partial class TestSceneCatchReplayHandling : OsuManualInputManagerTestScene
+ {
+ [Test]
+ public void TestReplayDetach()
+ {
+ DrawableCatchRuleset drawableRuleset = null!;
+ float catcherPosition = 0;
+
+ AddStep("create drawable ruleset", () => Child = drawableRuleset = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), []));
+ AddStep("attach replay", () => drawableRuleset.SetReplayScore(new Score()));
+ AddStep("store catcher position", () => catcherPosition = drawableRuleset.ChildrenOfType<Catcher>().Single().X);
+ AddStep("hold down left", () => InputManager.PressKey(Key.Left));
+ AddAssert("catcher didn't move", () => drawableRuleset.ChildrenOfType<Catcher>().Single().X, () => Is.EqualTo(catcherPosition));
+ AddStep("release left", () => InputManager.ReleaseKey(Key.Left));
+
+ AddStep("detach replay", () => drawableRuleset.SetReplayScore(null));
+ AddStep("hold down left", () => InputManager.PressKey(Key.Left));
+ AddUntilStep("catcher moved", () => drawableRuleset.ChildrenOfType<Catcher>().Single().X, () => Is.Not.EqualTo(catcherPosition));
+ AddStep("release left", () => InputManager.ReleaseKey(Key.Left));
+ }
+ }
+}