75359 Commits

This Branch

This Branch

All Branches

• 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
• Merge pull request #35154 from smoogipoo/matchmaking-events

  Add structure and support for jumping in quick play rooms

  Dean Herbert · 2025-10-02 13:57:00 +09:00
  2025.1002.0 37a11b5592
• Merge pull request #35169 from bdach/song-select-enter-on-filtered-out-carousel-should-start-map

  Fix pressing Enter not starting current global beatmap if carousel is fully filtered out

  Dean Herbert · 2025-10-01 23:44:01 +09:00
  565a2866ea
• Merge pull request #35167 from bdach/carousel-panels-consistent-update-button

  Use consistent ordering of update button on carousel beatmap panels

  Dean Herbert · 2025-10-01 21:59:03 +09:00
  c9a6a4887c
• Fix pressing Enter not starting current global beatmap if carousel is fully filtered out

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

  Bartłomiej Dach · 2025-10-01 14:31:48 +02:00
  9b78187d29
• Add failing test case
  Bartłomiej Dach · 2025-10-01 14:17:16 +02:00
  0230a27de6
• Use consistent ordering of update button on carousel beatmap panels

  Closes https://github.com/ppy/osu/issues/34810.
  
  The reason why I touched it in this direction and not the other is only
  because the standalone panel positioning of the button was touched last
  in 92ed964627, thus I changed the set
  panel to match that.

  Bartłomiej Dach · 2025-10-01 13:49:54 +02:00
  ccf3151172
• Merge pull request #35126 from Joehuu/song-select-silver-terminology

  Use silver S/SS terminology when grouping by rank/grade in song select

  Bartłomiej Dach · 2025-10-01 13:30:50 +02:00
  b980183e98
• Refactor spritesheet-based icons to be single-file based (#34976)

  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Jinkku · 2025-10-01 13:30:06 +02:00
  b7d36cffd4
• Merge pull request #35163 from bdach/carousel-stop-re-expanding-group

  Do not forcibly re-expand carousel groups on refilters if the user manually collapsed them

  Dean Herbert · 2025-10-01 16:33:59 +09:00
  345ae29770
• Use slightly safer method of converting to string
  Bartłomiej Dach · 2025-10-01 08:50:39 +02:00
  6bf589af88
• Merge branch 'master' into song-select-silver-terminology
  Bartłomiej Dach · 2025-10-01 08:32:07 +02:00
  03455ba683
• Merge pull request #35158 from bdach/fix-carousel-teleports-on-delete

  Fix song select carousel sometimes teleporting on beatmap set deletion

  Dean Herbert · 2025-10-01 15:16:26 +09:00
  1f7aa2fe5e
• Merge pull request #35159 from bdach/carousel-target-vertical-center

  Add half-height-of-selected-panel adjustment to carousel scroll target

  Dean Herbert · 2025-10-01 15:00:14 +09:00
  e26e44cd45
• Merge pull request #35160 from bdach/carousel-not-switching-beatmap-on-ruleset-change

  Fix song select not changing global beatmap correctly when switching rulesets

  Dean Herbert · 2025-10-01 13:47:08 +09:00
  5ab40e4b73
• Remove now unused description attributes from ScoreRank
  Joseph Madamba · 2025-09-30 10:55:47 -07:00
  ee638492bf
• Fix jank GetRankLetter() method
  Joseph Madamba · 2025-09-30 10:52:55 -07:00
  7d81ff8115
• Rename GetRankName to GetRankLetter
  Joseph Madamba · 2025-09-30 10:50:34 -07:00
  114e7f5c61
• Merge pull request #35161 from bdach/song-select-refetch-online-on-reenter

  Forcibly refetch online beatmap content on re-entering song select

  Dean Herbert · 2025-09-30 23:20:38 +09:00
  e2b9288716
• Merge pull request #35111 from smoogipoo/quick-play-keybinds

  Add keybinds to matchmaking queue screen

  Dean Herbert · 2025-09-30 23:19:33 +09:00
  919c47b918
• Do not forcibly re-expand carousel groups on refilters if the user manually collapsed them

  RFC. Closes https://github.com/ppy/osu/issues/35091.

  Bartłomiej Dach · 2025-09-30 15:24:48 +02:00
  bc4d5d07d7
• Add tests covering desired UX
  Bartłomiej Dach · 2025-09-30 15:24:35 +02:00
  4b2f3efcbd
• Forcibly refetch online beatmap content on re-entering song select

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

  Bartłomiej Dach · 2025-09-30 13:58:10 +02:00
  33ddb84633
• Fix song select not changing global beatmap correctly when switching rulesets

  Closes https://github.com/ppy/osu/issues/35113.
  
  Regressed in dfed564bda - setting
  `Carousel.CurrentSelection` was not all that
  `requestRecommendedSelection()` was doing there...
  
  A potential point of discussion is whether this global beatmap switch
  should be debounced or instant. I'm not sure I have a particularly
  well-formed opinion on that. One argument in favour of not debouncing is
  that if you look closely at the left side of the screen while the
  debounce is in progress, you can still sort of see the broken behaviour
  happen - it just doesn't stay there forever.
  
  Thankfully `ensureGlobalBeatmapValid()` being called in every scenario
  on screen suspension prevented this bug from being any worse than it is
  right now.

  Bartłomiej Dach · 2025-09-30 13:34:26 +02:00
  f66c8d10e0
• Merge pull request #35157 from peppy/update-framework

  Update framework

  Bartłomiej Dach · 2025-09-30 13:25:39 +02:00
  38278eaaac
• Demonstrate failure in test
  Bartłomiej Dach · 2025-09-30 13:19:03 +02:00
  ac2df49c35
• Add half-height-of-selected-panel adjustment to carousel scroll target

  Intended to address https://github.com/ppy/osu/issues/35147, maybe?
  
  The old carousel would target the vertical center of the active panel
  when scrolling:
  
  	https://github.com/ppy/osu/blob/b9e1b6969e78dfa798bb4afed8afae55e9e4adb1/osu.Game/Screens/Select/BeatmapCarousel.cs#L948
  
  This was not in place in the new carousel, weirdly, which was targeting
  the top-left corner of the selected panel.

  Bartłomiej Dach · 2025-09-30 12:57:24 +02:00
  2edd49d2c0
• Merge pull request #35149 from smoogipoo/qp-fix-nullref

  Fix nullref when users leave quick-play rooms

  Dean Herbert · 2025-09-30 19:23:05 +09:00
  a078d4bdb4
• Refactor to simplify sample handling
  Dean Herbert · 2025-09-30 19:22:16 +09:00
  6e39e714e1
• Merge branch 'master' into quick-play-keybinds
  Dean Herbert · 2025-09-30 19:07:29 +09:00
  d512adb971
• Fix song select carousel sometimes teleporting on beatmap set deletion

  Closes https://github.com/ppy/osu/issues/35010.
  
  The issue here does not reproduce consistently, and is more or less
  random in presentation. That said, using a large enough realm database
  more or less ensures that the issue will present itself (in testing on a
  large realm db, the failure rate is around ~50%).
  
  This actually regressed in https://github.com/ppy/osu/pull/34842. The
  core failure in this case is here:
  
  	https://github.com/ppy/osu/blob/fd412618dba7399b1778b0902b73ffbae21a2399/osu.Game/Screens/SelectV2/BeatmapCarousel.cs#L161
  
  The `CheckModelEquality()` call above is comparing two `BeatmapInfo`s,
  but a84c364e44 changed the
  `BeatmapInfo`-comparing path of `CheckModelEquality()` to use
  `GroupedBeatmap` instead. Due to this, `CheckModelEquality()` falls back
  to reference equality comparison for `BeatmapInfo`s. When that reference
  comparison fails, the carousel stops detecting that the current
  selection was deleted from under it correctly, and therefore the
  proximity-based selection logic never runs.
  
  Due to the human-obvious mechanism of failure and relatively easy
  manual reproduction I've decided not to try and add tests for this,
  as they are likely to take a long time to write due to the mechanism
  of failure being incorrect use of reference equality specifically. That
  said, I can try on request.

  Bartłomiej Dach · 2025-09-30 11:41:47 +02:00
  a3e09a1c31
• Add ability to jump in quick play
  Dan Balasescu · 2025-09-30 18:38:30 +09:00
  e636a09e0f
• Add avatar action request/event models
  Dan Balasescu · 2025-09-30 18:32:04 +09:00
  3ebb72a20a
• Update framework
  Dean Herbert · 2025-09-30 18:10:34 +09:00
  256483165f
• Merge pull request #35056 from OliBomby/anchor-snap

  Allow snapping slider control points to nearby objects in the editor

  Dean Herbert · 2025-09-30 18:01:02 +09:00
  1a084f28ff
• Merge pull request #35057 from OliBomby/snap-to-anchor

  Allow snapping to nearby visible slider control points in the editor

  Dean Herbert · 2025-09-30 18:00:31 +09:00
  a0ff7728b9
• Merge branch 'master' into qp-fix-nullref
  Dean Herbert · 2025-09-30 17:46:53 +09:00
  9860bba2f3
• Merge pull request #35151 from bdach/maybe-fix-bss-clicking

  Ensure submission progress sample is stopped when transitioning into a final state

  Dean Herbert · 2025-09-30 17:29:21 +09:00
  bb9b4a2827
• Simplify logic further
  Bartłomiej Dach · 2025-09-30 08:32:53 +02:00
  057406c910
• Merge pull request #35049 from AeroKoder/fix-scaling-sliders

  Fix certain sliders incorrectly registering as a horizontal/vertical only slider.

  Bartłomiej Dach · 2025-09-30 15:17:05 +09:00
  062174d874
• Make quick play chat not hold focus
  Dan Balasescu · 2025-09-30 12:35:33 +09:00
  d31df5bbc7
• Updated moveSelectionInBounds in OsuSelectionScaleHandler to match the one in OsuSelectionHandler
  AeroKoder · 2025-09-29 09:27:01 -07:00
  41698d5848
• Merge pull request #35145 from tadatomix/song-select/coloured-group-ranks

  Colour Rank Achieved panels to the related rank

  Dean Herbert · 2025-09-29 23:40:28 +09:00
  838b8d3013
• Ensure submission progress sample is stopped when transitioning into a final state

  Probably closes https://github.com/ppy/osu/issues/35138. I'm not sure. I
  only got the issue to reproduce once, on dev, using a very large
  archive that was uploading really slowly, and then never again.
  
  The working theory is that basically handling of `progressSampleChannel`
  is quite dodgy and it could possibly, in circumstances unknown, be
  allowed to play forevermore after transitioning to failed / canceled
  state. Success state does not get this treatment because it has special
  logic to set progress to 1.

  Bartłomiej Dach · 2025-09-29 15:30:45 +02:00
  2c39e1e9db
• Remove all linq calls from getScreenSpaceControlPointNodes
  OliBomby · 2025-09-29 15:07:03 +02:00
  18549ea7dc
• dont snap inherited bspline type control points to nearby objects
  OliBomby · 2025-09-29 14:44:12 +02:00
  d76dce76ec
• Revert inline method for code abstraction
  OliBomby · 2025-09-29 14:23:19 +02:00
  40cbe58220
• Merge pull request #35128 from peppy/matchmaking-design-work

  Switch to using more standardised beatmap cards in quick play

  Bartłomiej Dach · 2025-09-29 20:15:10 +09:00
  68523a637a
• Always explicitly assign the action for beatmap cards
  Dean Herbert · 2025-09-29 17:31:45 +09:00
  3f5b71fdc3
• Fix nullref when users leave quick-play rooms
  Dan Balasescu · 2025-09-29 16:56:48 +09:00
  573d639238