76685 Commits

This Branch

This Branch

All Branches

• Show multiplayer/playlist header content inside title wedge (#37089)

  Closes https://github.com/ppy/osu/issues/37077.
  
  | Before | After |
  | :---: | :---: |
  | <img width="708" height="415" alt="osu! 2026-03-25 at 05 52 30"
  src="https://github.com/user-attachments/assets/1f73ac97-3f7e-4e38-89ec-b3a9bea96211"
  /> | <img width="708" height="415" alt="osu! 2026-03-25 at 05 51 31"
  src="https://github.com/user-attachments/assets/9d8c44a1-c3d8-4766-b9d9-1d9fda2c884f"
  /> |

  Dean Herbert · 2026-03-25 07:56:50 +01:00
  98debc8d44
• Prepare for l10n of tournament client (#36827)

  ## Changes
  
  - Extract / Move l10n initialisation methods
  - Add analyser support for tournament project
  
  For the tournament client, it's a bit different around l10n
  initialisation compared with the main client. `TournamentGame` needs to
  show warning boxes for bracket errors and window size warnings, and we
  may make l10n support ready in advance.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  复予 · 2026-03-25 01:31:10 +09:00
  021e4485c2
• Fix storyboard / beatmap backgrounds being rendered in background of multiplayer (#37073)

  Closes https://github.com/ppy/osu/issues/37006 visually.
  
  Note that this adds a brief fade in on entering `PlayerLoader` from
  `OnlinePlayScreen`s due to actually loading the background at this
  point. I think this is fine.

  Dean Herbert · 2026-03-24 07:55:21 +01:00
  18747e1bdb
• Fix editor background taking too long to load with certain storyboards (#37038)

  TL;DR the clock was being set too late, causing more transforms to be
  created than necessary.
  
  This solves the issue by way of a refactor (sorry). Overall this should
  simplify handling of things as more of the logic is shared with the
  known good-state `BeatmapBackgroundWithStoryboard`.
  
  I did try without a refactor (just delaying the creation until the clock
  arrives) but this version made more sense because background generally
  expect to do their main load in BDL to aid in smooth transitions. And we
  can't get the clock by there. (although arguably we could just use a
  similar method to `BeatmapBackgroundWithStoryboard` and forego using the
  editor clock).
  
  Of note, I removed the black background overdraw hack. There are edge
  cases where it will lead to weird transitions, but these are far and few
  between. Basically you need a storyboard which sets the flag to hide the
  beatmap background and has transparency in it. This is no longer as
  flagrantly bad as things used to be (which led to the inline fix) as far
  as I can tell, but feel free to prove me wrong. If this is a blocker
  I'll probably just add a permanent black box (which does fix this).
  
  Closes #36875.

  Dean Herbert · 2026-03-23 09:26:34 +01:00
  95648a3d27
• Fix compatibility export using platform-dependent line endings (#37051)

  The compatibility export was creating .osu files with CRLF line endings
  on Windows and LF line endings on Linux/macOS, because StreamWriter
  defaults to Environment.NewLine.
  
  This caused the server to detect spurious file changes when a mapper
  alternated between platforms, leading to unnecessary wipes of local
  scores and noise in the beatmap update history.
  
  Fix by explicitly setting NewLine = "\r\n" on the StreamWriter, ensuring
  CRLF is always used regardless of platform.
  
  Closes #36846
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  antfaia · 2026-03-23 17:04:41 +09:00
  f73807919a
• Fix mania hold notes dimming unexpectedly (#37008)

  Fixes https://github.com/ppy/osu/issues/29223
  
  This fixes several issues around hold note dimming.
  
  Notice in the following video:
  - The tail piece of the first note not getting dimmed.
  - The body of the second note not responding to dimming at all.
  
  
  https://github.com/user-attachments/assets/8e51053d-8d88-4e48-909b-79218d65917b
  
  Then, notice in the following video:
  - The body piece of the second note is dimmed from the very beginning.
  
  
  https://github.com/user-attachments/assets/a514c630-5c72-4ba5-96d5-472bae1058b3
  
  This requires a specific setup whereby the hold note and its components
  must be reused from the pool. In particular:
  1. The hold note must be long. So long that by the time the tail becomes
  on screen, the body will already have dimmed.
  2. The hold note must be re-used from the pool. We can induce this by
  setting the pool sizes to 1 in
  [`Column.cs`](https://github.com/ppy/osu/blob/780ce2666099c22d1e0673cafab544418b5d14b0/osu.Game.Rulesets.Mania/UI/Column.cs#L121-L123).
  3. The second hold note should be placed far enough in the timeline that
  the first hold note dies by the time it becomes visible.
    4. Scroll speed should be adjusted to fit the above constraints.
  
  I haven't done a full deep dive into exactly _why_ this is happening, so
  the fix here is hand-wavy. That said, just by looking at the old code in
  `LegacyBodyPiece` you'll get a feeling that something's bound to go
  wrong;
  - It never resets the `missingFadeTime` state.
  - It never resets the colours back to `Color4.White`.
  - It applies transforms onto external components.
  - It jumps through hoops to figure out how to set `missingFadeTime`.
  
  My hope is that these changes first bring some sanity in the process,
  and if it breaks again I'll consider doing a more proper root cause
  (I've had this issue in the back of my mind for about 1 year).
  
  With this PR, they now behave as expected:
  
  
  https://github.com/user-attachments/assets/140b37c5-cf84-44ba-b797-86ac6d8130c8
  
  
  https://github.com/user-attachments/assets/6f2342a4-6a9a-4941-a55a-24a357f27c25

  Dan Balasescu · 2026-03-23 08:33:23 +01:00
  d4a4acd3f4
• Fix song select search not matching results when punctuation marks surround the searched double-quoted phrase (#37034)

  Fixes #36645
  
  The IsolatedPhrase match mode in FilterCriteria used \s (whitespace) as
  word boundaries, meaning a search term had to be surrounded by spaces
  (or start/end of string) to match.
  
  This caused songs with titles like
  'Music Theme "Some Artist"' to not appear when searching for "Some
  Artist", since the phrase was bounded by quote characters rather than
  spaces.
  
  This change extends the boundary pattern to also accept Unicode
  punctuation (\p{P}) alongside whitespace, so terms surrounded by quotes,
  commas are correctly matched as isolated phrases.
  
  Tests have been added to cover searching for terms adjacent to
  punctuation boundaries
  (TestCriteriaMatchingTermsAdjacentToPunctuation).
  
  Tests cover the example mentioned above.
  Code inspector with no errors and tests passing.

  Simão Caixas · 2026-03-23 08:12:46 +01:00
  f3c9dd7f3b
• Fix timing points sometimes not showing up in the editor timeline when paired with a kiai start/end (#37061)

  Initially reported on
  [discord](https://discord.com/channels/188630481301012481/1097318920991559880/1481649645167054878).
  
  `return` instead of `continue` led to the loop exiting too early if
  there was an `EffectControlPoint` in the list before a
  `TimingControlPoint`.
  
  Behaviour can be reproduced with topdiff on this
  [mapset](https://osu.ppy.sh/beatmapsets/1884175#osu/4027941). When
  opened, all timing points on kiai start don't show up in the timeline.
  If you disable/enable the effects section on one of those timing points
  the order changes and it becomes visible again.

  maarvin · 2026-03-22 23:01:33 +09:00
  c5dd95851c
• Keep any stateful dropdown menu open on click (#37021)

  Right click is a very obfuscated UX which most users won't find. This
  makes more sense to the average user (probably).
  
  Caveat: clicking away actually sends clicks to underlying UI. This is
  not the case in macOS or windows (locally, same app; globally it still
  sends clicks to other windows).
  
  Coming from https://github.com/ppy/osu/discussions/36926.
  
  ---------
  
  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Dean Herbert · 2026-03-21 22:18:02 +09:00
  1016bca280
• Increase precision for the Accuracy Challenge mod (#37048)

  1% is not precise enough to push accuracy to high enough levels.
  Increasing the precision of the mod will make it more useful for a
  larger amount of players who want to push their accuracy to their
  absolute limits. This does come with the caveat that it's impossible to
  achieve over 99.9% accuracy on many short maps, but I don't think it
  really matters if high enough settings act like the Perfect mod on short
  enough maps.
  
  Co-authored-by: evill <jlkdsf;ajfklsjd@123.n>

  evill · 2026-03-20 23:28:09 +09:00
  22b8a8e57d
• 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