osu-lazer

Various tournament-minded improvements for multiplayer (#37000 )

https://github.com/user-attachments/assets/042311f1-b8c3-479b-a173-13b93fe2c5cc

- `/roll` command is now supported in multiplayer chat for all players
(don't need to be a referee).
- Referees are shown in the room with a special status.
- Tournament mode rooms can be locked, which prevents users from
changing team (and slot, whenever those get brought back). When the room
is locked, the user team indicator shows a padlock icon on top to
indicate the lock state.

---

- Related: https://github.com/ppy/osu-server-spectator/issues/406

Grab-bag because I really don't think splitting this into 3 PRs is very
helpful.

I was going to add an animation for rolling but I had a go on Friday and
my attempt got more or less the same reception as a wet fart so I'm not
trying again. Someone else can if so inclined. I have completely lost
trust in my design senses.

Contrary to stable the roll results are completely ephemeral and go away
when the room is re-entered. This could be both considered good and bad.
Not for me to say.

Bartłomiej Dach · 2026-03-20 18:56:45 +09:00

43c53b5a8d

Don't show progress in quit notification if no progress has been made (#37035 )

Fixes this

<img width="1423" height="830" alt="image"
src="https://github.com/user-attachments/assets/db4a776a-837f-4771-aecc-d9e7b78fb840"
/>

Dean Herbert · 2026-03-19 11:14:27 +01:00

b98cf42bd3

Debounce user offline notifications (#37028 )

Dan Balasescu · 2026-03-19 03:41:58 +09:00

ed6ec8b417

Update framework

Dean Herbert · 2026-03-19 00:25:09 +09:00

bd30f70045

Tooling updates (#37031 )

Most of this is as everywhere else, but there's also interesting code
inspection fixes from the InspectCode bump, so I'll talk about that a
little.

## [Fix suspicious equality in
`Hotkey`](https://github.com/ppy/osu/commit/948136e49e88a721827d54e51c5759fe9aca811d)

Inspection:
https://www.jetbrains.com/help/resharper/TypeWithSuspiciousEqualityIsUsedInRecord.Global.html

Pretty annoying to fix, nullable array types are a pain. Does look legit
though.

## [Fix `StarDifficulty` using inefficient struct
equality](https://github.com/ppy/osu/commit/2db775ebb0bb9f18de67677ef84b993465d26545)

Inspection:
https://www.jetbrains.com/help/resharper/DefaultStructEqualityIsUsed.Global.html

This is a dodgy one because there's no real sane way to define equality
on `StarDifficulty` now that it has difficulty and performance
attributes jammed into it. So I just basically shut the inspection up
with a `record` modifier and move on.

Unclear where the equality is used precisely. It's from a global
inspection. F12 is very unhelpful when trying to track down usages of
`Equals()`. We definitely have `Bindable<StarDifficulty>` instances and
those do use equality. Maybe more than that.

## [Use `nameof` expressions to reference enum member
names](https://github.com/ppy/osu/commit/aa08175c803bc725f3b15a92174dfe6d1b812d91)

Inspection:
https://www.jetbrains.com/help/resharper/CanSimplifyDictionaryRemovingWithSingleCall.html

Pretty quaint.

## [Prefer using concrete values over `default` or
`new()`](https://github.com/ppy/osu/commit/b21ee08d7748be10d42268d5c2eb77369026545d)

Inspection:
https://www.jetbrains.com/help/resharper/PreferConcreteValueOverDefault.html

I could see this one going both ways, but I'm kinda sold on this
inspection. Explicit is always better. Saves some allocations in the
`CancellationToken` cases as well.

## [Explicitly call `.AsEnumerable()` in some realm
usages](https://github.com/ppy/osu/commit/c8ce1ecd42b9d8abb8b9e2ab93d471f463e80401)

Inspection:
https://www.jetbrains.com/help/resharper/PossibleUnintendedQueryableAsEnumerable.html

Not fully sold on this one but it's quick and simple so might as well.

## [Simplify dictionary removal with single `.Remove()`
call](https://github.com/ppy/osu/commit/5964ceccea900302df726b7a8ecbf6b74eb2e427)

Inspection:
https://www.jetbrains.com/help/resharper/CanSimplifyDictionaryRemovingWithSingleCall.html

Not much to say.

Bartłomiej Dach · 2026-03-19 00:05:52 +09:00

18d4ba5874

Fix dashboard overlay eagerly requesting global user presence (#37029 )

I noticed that going into the dashboard overlay currently requests
global user presence, which is not required for the friends display.
This could create additional load (client and server) where unnecessary.

Dan Balasescu · 2026-03-18 11:31:06 +01:00

a85c128cdf

Improve song select audio transitions (#37022 )

Based on feedback I've heard more than once ([most
recently](https://github.com/ppy/osu/discussions/36933)), there's too
much overlap compared to stable. And it can sound a bit "jumbled" as a
result, especially when transitioning between two songs with loud and
"complex" audio.

This also fixes noticeable audio glitching that some users may have been
experiencing when switching tracks.

---

Unless there's any very loud objections, I'd ask that review is on the
code not the audible change. This is the kind of change that I tweak to
my personal spec and then push out to hear the general reaction.

### b8d0dfe2ed Better default preview time
based on global fade

This is an oversight. The preview point wasn't being offset to account
for the fade in. This is something we do when generating web-side
previews, which allows for the actual preview point to be audible,
rather than mid-fade.

### 8de323b68c Adjust fade in and fade out
during track transitions to reduce overlap

Yes, I'm aware that the delay is not accounted for in the constant. This
is intentional because it sounds better. I want this to be an internal
adjustment which is not to be considered by any external usages of those
constants. Just sounds better.

### aab01b0fe5 Remove weird/dated schedule
usage

This causes audible artifacts in playback. The track is not set to zero
volume early enough. Original change was made in [this ancient
PR](https://github.com/ppy/osu/pull/9792) (see
[commit](https://github.com/ppy/osu/commit/688e4479506645bdacee7cdc7ae9ee9deaa5f1b4)).
The original failure does not occur. Tests still pass. I'd argue that if
we encounter this again, it's an issue at the call site, not this code.

This is a drive-by fix, as I noticed this glitching while working on the
main issue here. Arguably should be it's own PR 🤷 .

Dean Herbert · 2026-03-18 10:58:05 +01:00

978e380087

Remove duplicated CollectionDropdown class (#37020 )

Arguably we should just nuke the now playing overlay playlist window
completely as the functionality was gimped when search was removed. Now
it doesn't seek to the currently playing track, nor play sequentially,
nor do anything useful.

---------

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

Dean Herbert · 2026-03-18 10:42:01 +01:00

f84caf1182

Adjust maximum aspect ratio setting for tablets to match stupid wide monitors (#37024 )

Closes https://github.com/ppy/osu/issues/26925.

Dean Herbert · 2026-03-18 09:45:54 +01:00

ab2daf6e1d

Fix cancelling a restart for update still quitting the game after one minutes (#36950 )

Closes #36816.

- [x] Self review / testing.

Dean Herbert · 2026-03-18 16:48:07 +09:00

e0ccdfae94

Slight transtion adjust to now playing overlay appear/disappear

Dean Herbert · 2026-03-18 12:58:54 +09:00

f97d77c0b7

Only run deploy actions for tags without suffixes

Suffixed tags are build releases, which are triggered manually for now
(via private project).

Tags without suffix are the ones that we want to build the nuget
packages and such.

Dean Herbert · 2026-03-18 00:08:10 +09:00

f1f753f7c2

Notify of or set the beatmap at explicit times (#36993 )

Alternative to / closes https://github.com/smoogipoo/osu/pull/189
See also https://github.com/ppy/osu-server-spectator/pull/439

- Automatic beatmap download and notification of beatmap availability
moved to `RankedPlayBeatmapAvailabilityTracker` - now a self-contained
object to handle this miscellaneous logic.
- Beatmap set now happens when the `GameplayWarmup` screen is entered.

Dan Balasescu · 2026-03-17 17:26:34 +09:00

2026.318.0-tachyon 780ce26660

Fix Discord playtime counter resetting on every activity change (#36973 )

Discord resets the playtime counter on the rich presence whenever the
status changes since there's no timestamp set as the start time for the
activity. This PR adds the timestamp as `Timestamps.Now` as per the
[library
docs](https://lachee.github.io/discord-rpc-csharp/articles/features/timestamps.html)

<table>
<tr>
 <td> Before
 <td> After
<tr>
 <td>


https://github.com/user-attachments/assets/a745967a-3dfa-4f70-938c-a9abd45866c6


 <td>


https://github.com/user-attachments/assets/09c24fde-f150-4a3b-bb6a-afb325561508


</table>

SupDos · 2026-03-17 12:31:28 +09:00

f23734858f

Update lots of packages (#36996 )

It's been a while.

Notes:

- `SharpCompress` usages changed a bit. Manually adjusted these, mostly
just renames or adjusted parameters.
- nUnit 3 -> 4 migrated using
https://gist.github.com/peppy/07994386d793a117350cb5f24b156585. there's
a mode in this script to update to the newer `Assert.That` syntax but it
requires fixes and couldn't really be bothered.
- DeepEqual nuked as the only usage was on a disabled test. The reason
it's disabled has been merged upstream, but it's failing for other
(realm) reasons which I don't think is worthwhile to investigate for
now.
- This bumps Moq. I think the author is back in a sensible headspace and
the new version has the stupid shit removed, so probably okay? Nice to
be on a level playing field with packages for once in a long time.
- Automapper is silly, but we've discussed this elsewhere.
- `TestRealmKeyBindingStore` failures are a wildcard, but fixed by using
a more standardised testing method. Dunno why, don't care.

---------

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

Dean Herbert · 2026-03-17 03:58:02 +09:00

2026.317.0 a996261304

Attempt to fix mod output including build output

Dean Herbert · 2026-03-16 14:16:20 +09:00

73644d87bc

Fix weird variable naming

Dean Herbert · 2026-03-14 23:55:12 +09:00

2026.315.0 39912e044a

Add models for new tournament-related multiplayer operations (#36953 )

Continuation of https://github.com/ppy/osu-server-spectator/issues/406

Operations in question being:

- (un)locking rooms / `!mp (un)lock` (prevents players from changing
team, will also include slots when slots are implemented)
- rolling / `!roll` (frequently used in coin toss type situations, will
receive nice animation to go with it)

Bartłomiej Dach · 2026-03-14 23:05:59 +09:00

ed905b761d

Localise some strings on SecondFactorAuthForm (#36961 )

Denis Titovets · 2026-03-14 22:47:58 +09:00

fd66d7c4e4

Reuse existing triangles in Triangles background (#36951 )

As [per
comment](https://github.com/ppy/osu/pull/36943#issuecomment-4045361755).
Unfortunately I'm not able to reproduce such a big impact of triangles
using linked pr (or at all really). In my case usage was low in the
first place and went from 0.9% to 0.6% with this pr, so outside
benchmarking would be great

Improvement list:
* No more sorted list. Basic list is being used which is sorted once
after all the triangles added.
* Out-of-bounds triangles are reused rather than removed and re-added.
* On `Reset` if `AimCount` stays the same, all triangles are reused
instead of being cleared and re-added.

Andrei Zavatski · 2026-03-13 14:54:19 +09:00

2380fcd36d

Fix Simplified Rhythm mod breaking diffcalc when applied to some maps (#36947 )

- closes https://github.com/ppy/osu/issues/36942
- fixes https://osu.ppy.sh/community/forums/topics/2187041?n=1

## [Ensure Simplified Rhythm mod does not produce beatmaps with objects
out of
order](https://github.com/ppy/osu/commit/f4807b3a42dbf46ea0e669b0ba658feaef9baca5)

This is a last ditch safety.

This mod has more apparent issues (see below) but this is a first step
of restoring sanity.

Aside than the other fix described below I have not attempted to figure
out further why this is happening because the conversion logic is in
over my head. I just want hard breakage to not be possible. Why this
extra sort is necessary can be investigated by @Hiviexd if he's so
inclined.

## [Fix `GetClosestBeatDivisor()` not working correctly with negative
time
instants](https://github.com/ppy/osu/commit/88dc0d8a73c712a040635af262d7519fe6d772a0)

This was causing the 1/3 -> 1/2 conversion in Simplified Rhythm to
engage on some maps that weren't even mapped in waltz time. Those maps
had the common trait of having a timing point with a negative start
time.

Notably this could feasibly affect other places as well, like mania beat
snap colouring, or the Synesthesia osu! mod.

<details>

<summary>testing</summary>

Tested with Simplified Rhythm engaged, with 1/6 -> 1/4 and 1/3 -> 1/2
conversion enabled

[BULANOVA - NE PLACH'
[oni]](https://osu.ppy.sh/beatmapsets/1740291#taiko/3664995) (1/8 snap):
- No mods: 5.18*
- Simplified Rhythm @ master: 0.00*
- Simplified Rhythm @ f4807b3a: 3.48*
- Simplified Rhythm @ 933de7ab: 5.18*

[BULANOVA - NE PLACH' [inner
oni]](https://osu.ppy.sh/beatmapsets/1740291#taiko/3648625) (1/8 snap):
- No mods: 5.84*
- Simplified Rhythm @ master: 0.00*
- Simplified Rhythm @ f4807b3a: 4.13*
- Simplified Rhythm @ 933de7ab: 5.84*

[BULANOVA - NE PLACH' [don't
cry]](https://osu.ppy.sh/beatmapsets/1740291#taiko/3557681) (1/8 snap):
- No mods: 6.91*
- Simplified Rhythm @ master: 0.00*
- Simplified Rhythm @ f4807b3a: 4.84*
- Simplified Rhythm @ 933de7ab: 6.91*

[Mili - Peach Pit and Cyanide [nik's
Normal]](https://osu.ppy.sh/beatmapsets/2468654#osu/5405909) (1/6 snap):
- No mods: 1.63*
- Simplified Rhythm @ master: 0.00*
- Simplified Rhythm @ f4807b3a: 1.10*
- Simplified Rhythm @ 933de7ab: 1.10*

[Mili - Peach Pit and Cyanide [Ix's
Hard]](https://osu.ppy.sh/beatmapsets/2468654#osu/5405906) (1/3 snap):
- No mods: 2.50*
- Simplified Rhythm @ master: 0.00*
- Simplified Rhythm @ f4807b3a: 1.71*
- Simplified Rhythm @ 933de7ab: 1.71*

[Mili - Peach Pit and Cyanide [nomi's Hidden
Insane]](https://osu.ppy.sh/beatmapsets/2468654#osu/5405910) (1/3 snap):
- No mods: 3.93*
- Simplified Rhythm @ master: 0.00*
- Simplified Rhythm @ f4807b3a: 2.59*
- Simplified Rhythm @ 933de7ab: 2.59*

[Within Temptation - The Unforgiving [Stairway To The
Skies]](https://osu.ppy.sh/beatmapsets/29157#osu/172617) (1/3 snap in
editor):
- No mods: 1.53*
- Simplified Rhythm @ master: 0.00*
- Simplified Rhythm @ f4807b3a: 1.48*
- Simplified Rhythm @ 933de7ab: 1.48*

[Within Temptation - The Unforgiving
[Iron]](https://osu.ppy.sh/beatmapsets/29157#osu/172612) (1/6 snap in
editor):
- No mods: 2.76*
- Simplified Rhythm @ master: 0.00*
- Simplified Rhythm @ f4807b3a: 1.75*
- Simplified Rhythm @ 933de7ab: 1.75*

[Within Temptation - The Unforgiving
[Marathon]](https://osu.ppy.sh/beatmapsets/29157#osu/156352) (1/4 snap
in editor, but has 1/3 / 1/6 sections for sure):
- No mods: 2.96*
- Simplified Rhythm @ master: 0.00*
- Simplified Rhythm @ f4807b3a: 2.75*
- Simplified Rhythm @ 933de7ab: 2.75*
	
[Halozy - Genryuu Kaiko [Higan
Torrent]](https://osu.ppy.sh/beatmapsets/180138#osu/433005) (1/4 snap):
- No mods: 5.37*
- Simplified Rhythm @ master: 0.00*
- Simplified Rhythm @ f4807b3a: 3.95*
- Simplified Rhythm @ 933de7ab: 5.37*

</details>

Bartłomiej Dach · 2026-03-12 22:05:39 +09:00

28fbb83cc6

Ensure folder migration screen uses a blank background to avoid readability issues (#36948 )

https://github.com/ppy/osu/issues/36941

Dean Herbert · 2026-03-12 13:48:22 +01:00

365b88b4a9

Update editor hitsound icons with new designs from Adarin (#36940 )

| Before | After |
| :---: | :---: |
| <img width="584" height="672" alt="2026-03-12 00 56 58@2x"
src="https://github.com/user-attachments/assets/f1714f4d-ba78-4e41-a8f8-1a22dac01d9f"
/> | <img width="584" height="672" alt="2026-03-12 01 06 04@2x"
src="https://github.com/user-attachments/assets/4fc2d7ed-c9e0-45c7-8ff7-394d7ee2eff8"
/> |

Dean Herbert · 2026-03-12 08:03:01 +01:00

94c9f16b27

Fix avatar sometimes showing as guest in beatmap detail comment container (#36935 )

- close https://github.com/ppy/osu/issues/34969

The solution here is shown in the issue.

I don't think this needs a test... if need I will write one

cdwcgt · 2026-03-11 13:06:01 +01:00

390fc521e9

Add replay / spectator mode scrolling text back (#36911 )

As mentioned in https://github.com/ppy/osu/discussions/36883.

This has caught me off-guard a few times.

Was a quick one to make this work like it does on stable. It doesn't fit
as well as stable because we have a lot of elements at the top of the
screen, but I think it's better than nothing, as it lets you know you're
in a replay quick obviously.

I don't think we can easily localise strings with formatting in them
yet. Maybe using a `MarkdownContainer` or something?

Dean Herbert · 2026-03-11 11:08:26 +01:00

d0d5d97cfe

Ranked Play: Add countdown timer to all screens (#36930 )

There's been [some
feedback](https://discord.com/channels/90072389919997952/1476979671886205060/1477868178775216148)
that there's no timer during some screens. Personally I feel like some
screens shouldn't require it, but I get it.

The results screen is going to be the most controversial one, where I've
decided to shift the content down a bit - it would otherwise overlap
with the progress bar. Another option is to make the progress bar
shorter, but I feel like that makes things inconsistent.

<img width="1922" height="1035" alt="image"
src="https://github.com/user-attachments/assets/ec4ba01e-bb13-45ff-8a1b-b39d7765c1f4"
/>

Regarding implementation, I'm not entirely sure on it being added to
every subscreen via `RankedPlaySubScreen` instead of just a single
component at a top level. I did it this way because the colour scheme
seems annoying to change without recreating the entire component (or
otherwise all of its children) anyway.

Dan Balasescu · 2026-03-11 17:04:51 +09:00

4c0657f4ca

Ranked Play: Fix casing inconsistency in results screen (#36931 )

This is kind of annoying...

Some hit results are given custom names (e.g. "slider tick"):


https://github.com/ppy/osu/blob/87b37fd3860d75c0a90f7a67adb94e3267d1779b/osu.Game.Rulesets.Osu/OsuRuleset.cs#L301-L320

While others go through that `base` call which uses the enum
descriptions (e.g. "Great"):


https://github.com/ppy/osu/blob/87b37fd3860d75c0a90f7a67adb94e3267d1779b/osu.Game/Rulesets/Scoring/HitResult.cs#L53-L56

Dan Balasescu · 2026-03-11 15:48:04 +09:00

ce571e328d

Fix volume slider title text horizontal scaling on some languages (#36915 )

closes #36892.

|master|This PR|
|---|---|

|![osu_2026-03-10_18-37-55](https://github.com/user-attachments/assets/15defef7-e1b8-485b-928b-886bb79215e2)|![osu_2026-03-10_18-43-40](https://github.com/user-attachments/assets/df4926f8-d960-45e2-ab98-1b455dc789b5)|

MayoCollector · 2026-03-11 02:27:03 +09:00

2026.311.0-tachyon 87b37fd386

Fix "Deselect all" mods button becoming enabled when system mods are applied (#36913 )

Closes https://github.com/ppy/osu/issues/36906.

---------

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

Dean Herbert · 2026-03-10 12:40:54 +01:00

14743a14eb

Fix editor not updating titlebar with new difficulty name after rename (#36908 )

Dean Herbert · 2026-03-10 09:57:25 +01:00

9105fc15b2

Localise some more PopupDialogs (#36890 )

changes can be reviewed commit by commit

---------

Co-authored-by: Dean Herbert <pe@ppy.sh>

Denis Titovets · 2026-03-10 16:28:27 +09:00

1b488949e1

Extract user overlay actions button component (#36236 )

This PR extracts the classes used for the actions dropdown on the user
profile overlay to separate components, in preparation to be used on the
team overlay (#32584).

Kinda RFC since I'm not sure if this is the best way to do this.

Co-authored-by: Dean Herbert <pe@ppy.sh>

Krzysztof Gutkowski · 2026-03-10 16:28:06 +09:00

054ae2983d

Improve support for import & export flows on Android via using system file picker & share sheet (#36901 )

https://github.com/user-attachments/assets/57d0bc9d-f081-4d04-8cb6-422a83f1a1d3


https://github.com/user-attachments/assets/208f0676-a735-4055-a422-e6a2c3847220

---

- [x] Depends on https://github.com/ppy/osu-framework/pull/6717 to work
- Closes https://github.com/ppy/osu/issues/21076
- Closes https://github.com/ppy/osu/issues/22676
- Closes https://github.com/ppy/osu/issues/28666

---------

Co-authored-by: Dean Herbert <pe@ppy.sh>

Bartłomiej Dach · 2026-03-10 16:02:13 +09:00

321e698906

Do not forcibly log out user if user retrieval fails with a server error code (#36897 )

* Do not forcibly log out user if user retrieval fails with a server error code

This behaviour caused users to get forcibly logged out of the game
during yesterday's redis outage.

From one case where logs were provided
(https://discord.com/channels/188630481301012481/1097318920991559880/1480201862610423933):

- User had repeated timeouts on API requests; consequently, API went
  into failing state
- On one of the login retries `/api/v2/me` returned a 500 with no error
  details (`{"error":"null}` JSON response) which resulted in
  an instant logout as per

  https://github.com/ppy/osu/blob/7263551aa868911a7d9148cf2cb16f9e0325f531/osu.Game/Online/API/APIAccess.cs#L323-L324

This PR intends to only forcibly log the user out if the returned error
code indicates a client error. If it is a server error, the login is
preserved and a normal retry loop proceeds.

This can be tested with a local web instance via following steps:

1. Start `osu-web` and a client instance connected to it.
2. Log in on the client instance.
3. Kill (`^C`) `osu-web`.
4. Trigger a few requests in the client and wait for enough of them to
   fail for the API to change to `Failing` state.
5. Apply

```diff
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index db34639abf2..392a844882a 100644
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -581,6 +581,8 @@ class UsersController extends Controller
      */
     public function me($mode = null)
     {
+        abort(500);
+
         $user = \Auth::user();
         $currentMode = $mode ?? $user->playmode;

```

6. Start `osu-web` again.
7. On master this will log the user out forcibly. On this PR, the user
   will remain in `Failing` state.
8. Undo patch from step (5) (restarting web is not required).
9. On this PR, the client will be logged back in.

* Update framework

---------

Co-authored-by: Dean Herbert <pe@ppy.sh>

Bartłomiej Dach · 2026-03-10 15:12:43 +09:00

caffc7238b

Fix song select navigation with home/end keys (#36879 )

It's a continuation of https://github.com/ppy/osu/pull/36293, but for
the home and end keys.

Now when using home or end keys, it selects respectively the first or
last item in the carousel, instead of just scrolling.

## Before: 


https://github.com/user-attachments/assets/6ab08d2f-1da4-4740-9d9e-574d7a8a10c9

## After:


https://github.com/user-attachments/assets/30bab836-0006-4830-b4e9-2d85017a15e6

Rudi Herouard · 2026-03-10 14:20:59 +09:00

14bde85263

Adjust all selected hold notes if they have the same StartTime and Duration (#36656 )

Addresses #36267

The drag now checks all the selected objects in the blueprint container
to see if they have the same `StartTime` and `Duration` as the dragged
note, and if so, adjust them accordingly.

---------

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

Arthur Araujo · 2026-03-10 12:36:32 +09:00

277d53a4f1

Merge pull request #36898 from bdach/oops

Dean Herbert · 2026-03-09 23:54:27 +09:00

3378e6017a

Fix timeline selection box showing rotation handles

closes https://github.com/ppy/osu/issues/36888.

oooooooops.

Bartłomiej Dach · 2026-03-09 11:58:58 +01:00

a7860dd4c1

Mute warning samples during stage fast forwards (#36894 )

In particular, the discard stage fast forwards using a 3s timer:
https://github.com/ppy/osu-server-spectator/blob/9cb1dd35c677f216a7cf93b04fd490c68a76f632/osu.Server.Spectator/Hubs/Multiplayer/Matchmaking/RankedPlay/Stages/CardDiscardStage.cs#L46-L48

Play stage changes are only to conform to this new implementation.

Dan Balasescu · 2026-03-09 16:14:31 +09:00

3b86d15572

Fix possible exception (#36895 )

Randomly encountered this one. Not sure how it behaves in
practice/whether this is the correct fix, but it should be quite rare?

```
System.ArgumentOutOfRangeException: duration ('-199.99999999999955') must be a non-negative value. (Parameter 'duration')
Actual value was -199.99999999999955.
   at System.ArgumentOutOfRangeException.ThrowNegative[T](T value, String paramName)
   at System.ArgumentOutOfRangeException.ThrowIfNegative[T](T value, String paramName)
   at osu.Framework.Graphics.TransformableExtensions.PopulateTransform[TValue,TEasing,TThis](TThis t, Transform`3 transform, TValue newValue, Double duration, TEasing& easing)
   at osu.Framework.Graphics.TransformableExtensions.MakeTransform[TThis,TEasing,TValue](TThis t, String propertyOrFieldName, TValue newValue, Double duration, TEasing& easing, String grouping)
   at osu.Framework.Graphics.TransformableExtensions.TransformTo[TThis,TValue,TEasing](TThis t, String propertyOrFieldName, TValue newValue, Double duration, TEasing& easing, String grouping)
   at osu.Framework.Graphics.TransformableExtensions.ScaleTo[T,TEasing](T drawable, Vector2 newScale, Double duration, TEasing& easing)
   at osu.Framework.Graphics.TransformableExtensions.ScaleTo[T,TEasing](T drawable, Single newScale, Double duration, TEasing& easing)
   at osu.Framework.Graphics.TransformSequenceExtensions.<>c__DisplayClass42_0`2.<ScaleTo>b__0(T o)
   at osu.Framework.Graphics.Transforms.TransformSequence`1.Append(Generator childGenerator)
   at osu.Framework.Graphics.TransformSequenceExtensions.ScaleTo[T,TEasing](TransformSequence`1 t, Single newScale, Double duration, TEasing easing)
   at osu.Game.Screens.OnlinePlay.Matchmaking.RankedPlay.Card.RankedPlayCard.SongPreviewContainer.PulseContainer.OnNewBeat(Int32 beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
```

Dan Balasescu · 2026-03-09 15:49:07 +09:00

a34440888e

Fix score delete dialog not using user-facing rank terminology (#36861 )

- Resolves https://github.com/ppy/osu/issues/36859

| Before | After |
| --- | --- |
| <img width="187" height="41" alt="image"
src="https://github.com/user-attachments/assets/4fd10043-38ba-46c3-a7be-3ee957652ef4"
/> | <img width="241" height="43" alt="image"
src="https://github.com/user-attachments/assets/94646620-536d-48ad-b09a-3fbf66dc1684"
/> |

While we're here, should there be more statistics shown? At least score,
and maybe max combo too. Not doing for now.

Proposed order: User (Score, Max Combo, Accuracy, Rank)

Order is derived from the leaderboard score left to right, but
prioritizes score first as I believe that is the most important in
differentiating what score is which.

Joseph Madamba · 2026-03-09 14:50:50 +09:00

e4f7bd5443

Fix missed using statement

Dean Herbert · 2026-03-09 08:22:16 +09:00

7227afebbb

Update a few sample playback usages to use new helper method

Dean Herbert · 2026-03-07 23:39:20 +09:00

e3a0464e90

Fix a few flaky tests

See failures on https://github.com/ppy/osu/runs/66073876886#r3s1.

Dean Herbert · 2026-03-07 23:19:13 +09:00

14ae2312ff

Fix potential crash due to handling scores in leaderboard post-disposal (#36860 )

Closes https://github.com/ppy/osu/issues/36858. Classic.

Dean Herbert · 2026-03-07 04:40:25 +09:00

2026.307.0-tachyon c4402e9ce5

Fix LoadingLayer centering

oops.

Dean Herbert · 2026-03-07 02:51:50 +09:00

de9cf751d2

Implement ranked play (#36819 )

I don't really have much to say here. Instead, I'll give a brief history
rundown that lists many pages of documentation you can read, if
interested.

- Started off as BTMC + Happy24 (Vivi)'s ["The
Vision"](https://docs.google.com/document/d/1p1IpPmd2RICp8G4OqkCSs7u8Ug8FbFv8qqP0mfSrHf0/edit?tab=t.0#heading=h.fol093d9f9xi)
- Initial
[designs](https://www.figma.com/design/f5qqC57t9jFlgpzhRqUNVX/The-Vision?node-id=0-1&p=f)
were led by Vivi.
- Designs
[morphed](https://www.figma.com/design/vtFmLrXKvWNyYiRjTezFTM/Untitled--Copy-?node-id=0-1&p=f)
during development into what's currently present, led by @minetoblend.
- There is some more ongoing work creating a [game design
document](https://docs.google.com/document/d/1iffJFCsIBfYF0D4ogItSBEj6YBmbp-rdCpItAeaJiTA/edit?tab=t.0).

**tl;dr:** Create something with the mechanics of a trading card game
within osu!. The name of this is "ranked play".

---

To be frank, a lot of stuff is missing here. Some of it I don't want to
mention, because the point of this exercise is to get the system into
the hands of players, gather feedback especially around mechanics, and
discuss any further direction with the team.

I am expecting a blanket approval on all of the new code, with
particular attention to changes in existing components that I'll point
out in a self review.

There is also some [ongoing
work](https://github.com/smoogipoo/osu/pulls) that may arrive in this
branch prior to being merged.

---------

Co-authored-by: maarvin <minetoblend@gmail.com>
Co-authored-by: Marvin <m.schuerz@hautzy.com>
Co-authored-by: Jamie Taylor <me@nekodex.net>
Co-authored-by: ArijanJ <arijanj@proton.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Tim Oliver <git@tim.dev>
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Co-authored-by: nil <25884226+voidstar0@users.noreply.github.com>
Co-authored-by: Ботников Максим <mr.botnikoff@ya.ru>
Co-authored-by: Denis Titovets <den232titovets@yandex.ru>
Co-authored-by: Michael Middlezong <119022671+mmiddlezong@users.noreply.github.com>
Co-authored-by: SupDos <6813986+SupDos@users.noreply.github.com>
Co-authored-by: failaip12 <86018517+failaip12@users.noreply.github.com>

Dan Balasescu · 2026-03-07 02:30:50 +09:00

0988552567

Consider comments in wiki's front matter YAML (#36758 )

This PR makes front matter items with comments able to be parsed
correctly by the client, for example:

```markdown
---
tags:
  - keyboard
  - tap
  - hybrid
  - play style
needs_cleanup: true  # https://github.com/ppy/osu-wiki/issues/9919
---

# Hybrid

...
```

The front matter YAML used by osu!wiki not complicated, so simply
splitting with `#` is possible.

---------

Co-authored-by: Dean Herbert <pe@ppy.sh>

复予 · 2026-03-07 01:41:59 +09:00

0fd0bd3580

Allow changing addition bank button state when objects are selected even if the selection has no addition sounds (#36808 )

Before:


https://github.com/user-attachments/assets/d87bd7e3-37f8-4634-9e6a-5859d5bade57

After:


https://github.com/user-attachments/assets/4de940af-1e30-4266-9aac-5ccd12f38742

---

The title is convoluted but basically I'm angling to close
https://github.com/ppy/osu/issues/36705 with this.

The point is that on current `master`, the keyboard-hotkey-based toggles
on the left of the screen get disabled if you select a range of objects
which contains no addition samples. The report linked above finds this
annoying because it means you basically always need to add an addition
sound *first* and *then* pick a bank.

This is not necessary, and this commit changes the behaviour such that
the bank selection toggles are no longer blocked when you select a range
of objects without additions. Choosing an addition bank when there are
no additions still does nothing to the selected object, *but* adding a
sound *after* that bank preselection will use the preselected bank
rather than auto.

Bartłomiej Dach · 2026-03-07 00:47:35 +09:00

16bc1de9fd

Fix rotation of certain objects breaking change states (#36852 )

Closes https://github.com/ppy/osu/issues/36830.

This is a regression from https://github.com/ppy/osu/pull/36681.

Due to the aforementioned pull request's changes, rotating an object
that could not scale on the X or Y axis (due to having that dimension
zero) would trigger `CanScale{X,Y}` to change as said rotated object's
width or height became not zero. This in turn would cause `SelectionBox`
to *fully recreate* all of its handles and buttons, *including* the
rotation handle that initiated the rotation operation, therefore
dropping the ongoing rotation operation completely and leaving the
editor in a half-broken state.

The suggested solution here is to recreate handles more granularly to
prevent this from happening. (I've probably not improved it as much as I
could have, but this is as far as I'm willing to go for now unless
review finds it unpalatable.)

Bartłomiej Dach · 2026-03-07 00:20:10 +09:00

0d74983551

76675 Commits