75471 Commits

This Branch

This Branch

All Branches

• Fix carousel sometimes crashing when attempting to select next random set

  I'm not exactly sure on the reproduction scenario here, but I have had
  switching ruleset with converts disabled crash on me a few times
  today. It appears to happen sometimes when after the switch the expanded
  group no longer exists in the set mapping, because a filter just ran and
  removed that group from set of possible groups because there'd be no
  beatmaps under it.
  
  I tried to manufacture a quick test but it's not a quick one to test
  because filtering intereference is required to reproduce, I think.
  I will try again on request but I mostly just want to get this fix out
  ASAP before I finish up for the day.

  Bartłomiej Dach · 2025-10-08 15:13:00 +02:00
  7b1e3cd537
• Merge pull request #35233 from diquoks/quick-fix/sfx-mute-on-restart

  Mute SFX when holding restart beatmap bind

  Dean Herbert · 2025-10-08 21:39:07 +09:00
  4622d39f41
• Merge pull request #35234 from diquoks/quick-fix/spinner-rpm-layering

  Fix `spinner-rpm` being layered above `spinner-spin` / `spinner-clear`

  Dean Herbert · 2025-10-08 21:21:21 +09:00
  0d5c041cac
• Merge pull request #35239 from bdach/song-select-weirdness

  Fix current beatmap set being incorrectly expanded after collapsing group with current selection

  Dean Herbert · 2025-10-08 21:19:08 +09:00
  ffe8b9f4c3
• Fix current beatmap set being incorrectly expanded after collapsing group with current selection

  Noticed in passing. See preceding commit for failure scenario.
  
  Regressed in https://github.com/ppy/osu/pull/35163.

  Bartłomiej Dach · 2025-10-08 13:42:43 +02:00
  9ba9966078
• Add failing test
  Bartłomiej Dach · 2025-10-08 13:42:31 +02:00
  f1ec04114f
• Add test assets covering correct layering of spinner SPM metre
  Bartłomiej Dach · 2025-10-08 12:39:48 +02:00
  4337046680
• Disallow zero-length sliders from specifying a non-zero number of repeats (#35220)
  Bartłomiej Dach · 2025-10-08 16:01:04 +09:00
  1a522a19f1
• Fix spinner-rpm layering
  Denis Titovets · 2025-10-07 19:01:50 +03:00
  568ddc2d2d
• Mute SFX when holding restart beatmap bind
  Denis Titovets · 2025-10-07 18:42:42 +03:00
  0ebc90462d
• Merge pull request #35029 from ppy/pp-dev

  Q3 SR & PP release

  Dean Herbert · 2025-10-07 19:07:58 +09:00
  2025.1007.0 a08f7327b1
• Merge pull request #35216 from diquoks/quick-fix/mods-deselection-diff

  Fix mods deselection difference

  Dean Herbert · 2025-10-07 18:38:40 +09:00
  533c61e719
• Invert conditional to read a bit better
  Dean Herbert · 2025-10-07 18:07:58 +09:00
  64fba9470d
• Re-remove duplicate error functions
  Dean Herbert · 2025-10-07 16:30:40 +09:00
  743a94bd22
• Merge branch 'master' into pp-dev
  Dean Herbert · 2025-10-07 16:11:54 +09:00
  bda5737135
• Merge pull request #35221 from bdach/adjust-tag-threshold

  Adjust display tag threshold to match web

  Dean Herbert · 2025-10-06 20:57:26 +09:00
  19718c706a
• Merge pull request #35222 from peppy/fix-left-hover-not-always

  Fix hovering left area in song select not always activating reset action

  Bartłomiej Dach · 2025-10-06 12:17:56 +02:00
  4b3d2b0c57
• Fix hovering left area in song select not always activating reset action
  Dean Herbert · 2025-10-06 18:23:33 +09:00
  df58dc0ca2
• Add failing test scene covering song select left hover action not always activating
  Dean Herbert · 2025-10-06 18:21:10 +09:00
  d08b5a72b7
• Adjust display tag threshold to match web

  Follow-up to https://github.com/ppy/osu-web/pull/12381 - tags will glow
  green starting from 5 votes rather than 10 to match the new threshold
  web-side.

  Bartłomiej Dach · 2025-10-06 11:09:54 +02:00
  b286f05c78
• Merge pull request #35185 from nekodex/matchmaking-more-sfx

  Yet more matchmaking SFX work

  Dean Herbert · 2025-10-06 18:04:22 +09:00
  b3ed7717a8
• Delay round increment sound to match animation better
  Dean Herbert · 2025-10-06 18:03:53 +09:00
  bc7e02c30b
• Merge pull request #35184 from bdach/song-select-reselect-group-for-selection-when-moving-left

  Expand group that current selection resides in when moving mouse to left side of song select

  Dean Herbert · 2025-10-06 17:47:20 +09:00
  557df19bf4
• Merge branch 'master' into song-select-reselect-group-for-selection-when-moving-left
  Dean Herbert · 2025-10-06 16:57:57 +09:00
  8a450563fd
• Merge pull request #35189 from bdach/catcher-fail-state-on-tiny-droplet-miss

  Fix missing tiny droplets not changing catcher animation state to fail

  Dean Herbert · 2025-10-06 16:42:10 +09:00
  f9a226d68e
• Merge pull request #35176 from bdach/local-modified-beatmap-regressions

  Fix a few issues regarding incorrect treatment of locally-modified beatmaps

  Dean Herbert · 2025-10-06 16:22:09 +09:00
  dd846dcc52
• Merge pull request #35178 from bdach/song-select-loses-selection-if-convert

  Fix selection being changed on re-entering song select when a converted beatmap is selected

  Dean Herbert · 2025-10-06 15:53:42 +09:00
  71ae1d34cd
• Merge pull request #35199 from peppy/editor-timing-panel-current-row-visibility

  Adjust colouring to make current row in timing visualisation more obvious

  Bartłomiej Dach · 2025-10-06 08:39:05 +02:00
  dd8dfc04b3
• Update resources
  Dean Herbert · 2025-10-06 14:49:42 +09:00
  2f6bd6605f
• Merge pull request #35188 from bdach/song-select-do-not-flash-wrong-leaderboard

  Fix wrong leaderboard flashing briefly when quickly changing beatmaps

  Dean Herbert · 2025-10-06 14:43:33 +09:00
  e76d1ae619
• Merge pull request #35179 from bdach/song-select-scroll-closest-expanded-thing-into-view

  Attempt to scroll carousel to nearest expanded panel when the current selection is filtered out

  Dean Herbert · 2025-10-06 14:42:54 +09:00
  c0a7c97185
• Fix mods deselection difference
  Denis Titovets · 2025-10-06 01:58:49 +03:00
  dbd48bc3a1
• Adjust colouring to make current row in timing visualisation more obvious
  Dean Herbert · 2025-10-04 16:13:48 +09:00
  a2770a8674
• Fix missing tiny droplets not changing catcher animation state to fail

  Addresses https://github.com/ppy/osu/discussions/35182.
  
  The source as it is would have you believe that this is correct and
  intentional but I'm not so sure about that. For one thing, I
  cross-checked stable, and sure, missing tiny droplets does change the
  state to fail over there. For another, the guard in master at
  
  	https://github.com/ppy/osu/blob/5e642cbce72862b29b117829e7ec90d6d6b0ce1e/osu.Game.Rulesets.Catch/UI/Catcher.cs#L250
  
  is very suspicious, given that it is dead in cause of tiny droplets
  because of a preceding guard:
  
  	https://github.com/ppy/osu/blob/5e642cbce72862b29b117829e7ec90d6d6b0ce1e/osu.Game.Rulesets.Catch/UI/Catcher.cs#L227-L228
  
  Looking into blame, the tiny droplet guard originates at
  e7f1f0f38b, wherein it looks to have been
  aimed at handling *hyperdash* state specifically. Later, the logic has
  been moved around and around like five times; at
  7069cef9ce, the catcher animation logic
  was added *below* the hyperdash-aimed guard without the comment being
  updated in any way; 5a5c956ced moved the
  logic from `CatcherArea` to `Catcher`, while simultaneously changing
  the inline comment to no longer mention hyperdashing; and finally,
  1d669cf65e added specific testing of tiny
  droplets not changing catcher animation state, which I wager to be
  back-engineered from the implementation as-it-was rather than
  supported by any actual ground truth.
  
  For additional reference:
  
  - catcher animation logic in stable is at https://github.com/peppy/osu-stable-reference/blob/67795dba3c308e7d0493b296149dcb073ca47ecb/osu!/GameModes/Play/Rulesets/Fruits/RulesetFruits.cs#L411-L463
  - hyperdash application logic in stable is at https://github.com/peppy/osu-stable-reference/blob/67795dba3c308e7d0493b296149dcb073ca47ecb/osu!/GameModes/Play/Rulesets/Fruits/RulesetFruits.cs#L165-L171

  Bartłomiej Dach · 2025-10-03 14:52:33 +02:00
  67041254db
• Adjust test to exercise actual desired behaviour
  Bartłomiej Dach · 2025-10-03 14:39:48 +02:00
  68d5f53cc7
• Fix wrong leaderboard flashing briefly when quickly changing beatmaps

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

  Bartłomiej Dach · 2025-10-03 12:35:58 +02:00
  a30c7f51d0
• Code style fixes
  Jamie Taylor · 2025-10-03 18:04:55 +09:00
  4e90a2aee2
• Change 'quick play' button to use the 'daily' sample for now
  Jamie Taylor · 2025-10-03 17:17:23 +09:00
  e24df0b9d0
• Add SFX for round transitions
  Jamie Taylor · 2025-10-03 17:16:45 +09:00
  27ff2a7d49
• Rework StageDisplay SFX
  Jamie Taylor · 2025-10-03 17:16:21 +09:00
  3cb85f743a
• Add SFX for enqueueing and also a looping 'waiting' SFX when in certain matchmaking states
  Jamie Taylor · 2025-10-03 17:10:52 +09:00
  43878f6d33
• Add ducking effect on match found
  Jamie Taylor · 2025-10-03 17:05:00 +09:00
  60dc2c8876
• Expand group that current selection resides in when moving mouse to left side of song select

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

  Bartłomiej Dach · 2025-10-03 09:27:05 +02:00
  87128453d6
• Add failing test scene
  Bartłomiej Dach · 2025-10-03 09:24:37 +02:00
  ae4e015352
• Attempt to scroll carousel to nearest expanded panel when the current selection is filtered out

  Addresses https://github.com/ppy/osu/issues/33443, maybe.
  
  I considered adding tests but they'd likely be janky and take a long
  time to write, so decided against until there's a demand for it.

  Bartłomiej Dach · 2025-10-02 14:28:39 +02:00
  007de10e2b
• Fix selection being changed on re-entering song select when a converted beatmap is selected

  Closes https://github.com/ppy/osu/issues/34062.
  
  The root cause of the issue is that `OnEntering()` calls
  `onArrivingAtScreen()`, which calls `ensureGlobalBeatmapValid()`, which
  would call `checkBeatmapValidForSelection()` with a `FilterCriteria`
  instance retrieved from the `FilterControl`.
  
  The problem with that is at the time that this call chain is happening,
  `FilterControl` is not yet loaded, which means in particular that it has
  not bound itself to the config bindable, as that happens on
  `LoadComplete()`:
  
  	https://github.com/ppy/osu/blob/bff07010d1f9874125baf2918f02c5cf61a5ea60/osu.Game/Screens/SelectV2/FilterControl.cs#L198
  
  To resolve this, retrieve the bindable in `SongSelect` itself, which
  ensures it is valid for reading at the time the above call chain
  happens.

  Bartłomiej Dach · 2025-10-02 13:27:43 +02:00
  3d5dc60cfe
• Add failing test case
  Bartłomiej Dach · 2025-10-02 13:24:24 +02:00
  e7076b9582
• Do not attempt to retrieve score submission tokens for locally-modified beatmaps

  Because it is 99% sure that doing so will fail and spam the user with
  "this beatmap doesn't match the online version" notifications, and
  because the map status is "locally modified", they should be pretty
  aware of that already. This fixes the primary mode of the failure that
  https://github.com/ppy/osu/pull/35173 was attempting to hack around.
  
  This will have regressed somewhere around the time that BSS went live,
  because at that point the editor stopped resetting online IDs for
  beatmaps that got locally modified, making the `beatmapId <= 0` guards
  no longer prevent attempts of submission.

  Bartłomiej Dach · 2025-10-02 09:16:17 +02:00
  2a85f7b7c8
• Add failing test coverage for no score submission attempt on known locally modified beatmap
  Bartłomiej Dach · 2025-10-02 09:16:17 +02:00
  44a1a5ffc7
• Do not overwrite "locally modified" beatmap set status when performing online lookups in song select

  A relatively recent regression. It's maybe not a huge one, in that it
  probably doesn't matter all that much, but it is somewhat important to
  keep the "locally modified" status of the set for as long as possible.
  
  One reason for that is that keeping the "locally modified" status will
  pull up a dialog when the user attempts to update the beatmap, warning
  them that they will lose their local changes - this dialog will not show
  if the online lookup flow is allowed to overwrite the map status with
  something else.

  Bartłomiej Dach · 2025-10-02 09:16:15 +02:00
  365cdfd40e