687 Commits

• 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
• Move v2 files to final location

  This contains only renames and namespace updates.

  Dean Herbert · 2026-03-03 16:45:15 +09:00
  c28c64940a
• Migrate sheared overlay tests to ScreenTestScene (#36736)

  Part of the screen footer refactor.
  
  Once footer content is being managed by `OsuScreen`, the current tests
  which simply create the tested overlay and `ScreenFooter` in a container
  will no longer work.
  
  This PR refactors them to use `ScreenTestScene` with the setup being
  creating a dedicated testing `OsuScreen` which does the bare minimum to
  create the tested overlay and necessary components (eg.
  `FooterButtonFreeModsV2` for `TestSceneFreeModsOverlay`).
  
  Most of the changes here can be described as
  `%s/<...>Overlay/screen.Overlay/g`, with some minor touchups as
  necessary, given that we're now testing a more complete flow which
  checks more things that were previously not handled by the tests.
  
  ## [Move footer to front in
  ScreenTestScene](https://github.com/ppy/osu/commit/f8740e0403b3c0badd60d394c737f2aa912a9ed6)
  
  Self-explanatory. Without it the footer would show below the actual
  overlay, breaking tests depending on manual input. For the sake of tests
  not breaking in CI, both #36718 and this have this included - would
  prefer the former to be merged first since it was already reviewed
  there.
  
  ## `TestSceneModSelectOverlay`
  
  There were a few tests (`TestColumnHidingOnIsValidChange`,
  `TestColumnHidingOnTextFilterChange`, and
  `TestHidingOverlayClearsTextSearch`) that would create a custom overlay
  instance instead of the globally provided one. I've tested both and the
  tests run fine with the default overlay, so they're now using that
  instead.
  
  ## `TestSceneFreeModSelectOverlay`
  
  Updated to use footer v2.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Krzysztof Gutkowski · 2026-02-28 04:22:58 +09:00
  105342e5bf
• Improve usability of sample bank toggles (#36753)

  - [x] Depends on https://github.com/ppy/osu/pull/36741 for merge
  conflict avoidance
  
  RFC, cc @OliBomby
  
  ## [Adjust behaviour of automatic bank assignment during
  placement](https://github.com/ppy/osu/commit/547f55e9b3ded668fe6e1c8865a2d625e64a2f45)
  
  Diatribe time!
  
  This is fallout of the discussion about auto bank in
  https://github.com/ppy/osu/issues/36705.
  
  Auto bank in lazer as written before this commit is confused. On stable,
  auto bank is closer to "no bank", as in "go look up the current sample
  timing point, get the bank of that, and use that". lazer has no timing
  points anymore, but people still want auto bank. So what do?
  
  Auto bank for normal samples is somewhat sane still. It only works
  during placement, and will just copy the normal bank of the previous
  object - if one exists. That said, one *might not* exist, but the
  resulting object will still have its normal sample created with
  `editorAutoBank: true`. That is largely cosmetic and without
  consequences, but this commit fixes that.
  
  Auto bank for *addition* samples, however... Hoo boy.
  
  - For placed objects, auto bank means "take the normal sample, read its
  bank, and use that". Simple enough, right?
  - Hoooooowever. During placement, auto bank before this commit used to
  mean "look at the *previous object*, check if it has an addition sound
  and then use its bank, if not use *the previous object's* normal sample
  and then use its bank" which is a completely different thing with its
  own implications. Like, say, what happens if the previous object uses
  the auto addition bank too? What should be copied over? Should it be the
  notion of "auto bank" in that the addition bank should match the normal
  bank, or should it be the literal bank that the previous object is
  using?
  
  This change attempts to define this unambiguously. "Auto additions bank"
  means "the same bank as the normal bank of this object", full stop.
  
  ## [Do not touch sample toggle state if there are no selected
  objects](https://github.com/ppy/osu/commit/052cde5987e48800ec68ab2528c7e0ce3140e6e0)
  
  Fixes issue described in
  https://github.com/ppy/osu/issues/36705#issuecomment-3953917163 wherein
  opening a sample popover will disable addition bank toggles and toggle
  off all addition samples.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Bartłomiej Dach · 2026-02-26 15:18:29 +09:00
  7e2771c3f0
• Fix changing normal sample bank via keyboard hotkeys not updating addition bank if set to auto (#36741)

  Closes https://github.com/ppy/osu/issues/36703.
  
  It was only broken via keyboard hotkeys and not via the sample popover
  because the sample popover has a separate copy of the logic that didn't
  have the bug. Compare:
  
  
  https://github.com/ppy/osu/blob/13aeed15f95fa6585ff01eedaccc43b28ff656cb/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs#L473-L475
  
  I considered splitting a helper to have one copy of the logic but it's
  not very simple to do compared to a two-liner fix so I gave up.

  Bartłomiej Dach · 2026-02-26 02:47:45 +09:00
  5174d8b918
• Preserve bookmarks when creating a new difficulty from scratch (#36675)

  Closes #33395
  
  Copies the bookmarks from `referenceWorkingBeatmap` while creating a new
  difficulty from scratch. I adapted the tests in
  `TestSceneEditorBeatmapCreation` to include the bookmark checks.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Arthur Araujo · 2026-02-16 12:50:04 +09:00
  2f459dd94e
• Add test coverage of editor placement scenarios
  Dean Herbert · 2026-01-05 15:24:15 +09:00
  25dab7258c
• Attempt to fix flaky test
  Dean Herbert · 2026-01-01 19:41:14 +09:00
  e539660b14
• Implement form control for adding/removing custom samples in editor

  The test scene doesn't exercise the custom sample playback, but I hope I
  can be forgiven for this as setting up a custom editor beatmap just for
  this to work is rather cumbersome.

  Bartłomiej Dach · 2025-12-22 13:48:31 +01:00
  9d07ad2761
• Merge branch 'master' into custom-sample-set-selection
  Dean Herbert · 2025-12-17 19:30:24 +09:00
  61bf68f336
• Fix failing tests after disallowing object placements before first timing point
  Bartłomiej Dach · 2025-12-05 09:52:32 +01:00
  66ebce8c12
• Fix tests
  Bartłomiej Dach · 2025-10-24 12:09:38 +02:00
  78eaad13ae
• 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
• Update existing tests to work with Song Select v2
  Dean Herbert · 2025-07-01 17:25:38 +09:00
  397b9b3994
• Ensure editor is loaded in more places

  While I can't reproduce any test failures because of this, I can
  reproduce exceptions by simply running the tests with debugger attached.
  
  There's one other similar related test failure in `TestSingleAudioFile`
  but that appears to be an o!f issue.

  Dan Balasescu · 2025-06-16 16:29:10 +09:00
  18195120ae
• Adjust condition to be more thorough
  Dan Balasescu · 2025-06-16 16:21:27 +09:00
  54ef42a09e
• Attempt to fix flaky editor test
  Dan Balasescu · 2025-06-16 15:36:55 +09:00
  74a173cdfd
• Fix up test

  - Use constraints for better assert messages
  - Use `Editor.Undo()` rather than manual input manager synthesizing
    ctrl-z (ctrl-z is not a platform agnostic binding, see macOS)

  Bartłomiej Dach · 2025-06-09 09:16:19 +02:00
  35ff330e85
• better comment, fix typo in test case
  Chris Ehmann · 2025-06-05 18:28:17 -07:00
  5e3eb70829
• Add test for undoing after quick deleting an object while it is dragged.
  Chris Ehmann · 2025-06-05 17:46:31 -07:00
  3af348c6eb
• Add test mode which allow more realistic testing of samples
  Dean Herbert · 2025-04-25 16:25:27 +09:00
  032459ea4e
• Move playback logic to Update()
  Jamie Taylor · 2025-04-24 10:48:32 +09:00
  f6f098a0dc
• Apply suggestions from code review

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

  Dean Herbert · 2025-04-23 13:37:45 +09:00
  a6921ad566
• Add audio feedback to BSS process
  Jamie Taylor · 2025-04-18 20:30:38 +09:00
  5208d8a0b2
• Merge pull request #32665 from peppy/fix-editor-metadata-save-without-commit

  Fix saving via ctrl+s while metadata textbox is focused not saving changes

  Bartłomiej Dach · 2025-04-08 08:21:03 +02:00
  5f168b9b9f
• Change editor to save metadata changes without explicit textbox commit

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

  Dean Herbert · 2025-04-03 15:31:24 +09:00
  ce288023fe
• Avoid large sample depool overhead on drawable hitobjects with many nested objects

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

  Dean Herbert · 2025-03-26 18:45:12 +09:00
  78de898f7f
• Move BeatmapVersion from BeatmapInfo to IBeatmap

  Closes https://github.com/ppy/osu/issues/32420.
  
  The failure cause here is that in editor the beatmap version for the
  beatmap affected (or... any beatmap, really), is 0 (ZERO). That is
  probably a regression from https://github.com/ppy/osu/pull/32315, but
  like... can we universally agree that calling that change "a regression"
  in any capacity is dumb? Like what was that code *doing* playing dumb
  reference games and copying stuff into an arbitrary instance that could
  get or not get used later on? And now you have a 50/50 chance of
  accessing the *correct* model's field, depending on whether you go via
  `BeatmapInfo` or `Beatmap.BeatmapInfo`?
  
  Moving the field to `IBeatmap`, i.e. what is by now - by consensus,
  since https://github.com/ppy/osu/pull/28473 - supposed to be the "decoded
  and materialised" beatmap, fixes this issue.
  
  I probably should have done this as part of
  https://github.com/ppy/osu/pull/28473 but it slipped my mind. Probably
  for the better too because this change has rather large chances of
  breaking stuff so maybe better to examine it in isolation (via diffcalc
  runs or whatever).
  
  For added humour points, you'd say that the field on `BeatmapInfo` was
  not `[Ignore]`d, so this is a realm schema change, right? No. As far as
  I can tell, it's not. I opened realm studio and `BeatmapVersion` *is not
  a listed column` on `Beatmap` models.
  
  I'm also not gonna get into the fact that I think `EditorBeatmap` doing
  dumb games with juggling two `BeatmapInfo` references since
  https://github.com/ppy/osu/pull/15075 is bad, because I don't think I
  have the mental capacity to hotfix this by going down that train of
  thought.

  Bartłomiej Dach · 2025-03-17 15:04:48 +01:00
  91f3be5fea
• Add the most basic (yet failing) test possible
  Bartłomiej Dach · 2025-03-17 14:52:09 +01:00
  613c46d375
• Merge pull request #31148 from peppy/editor-right-click-as-people-expect

  Add back right-click-for-new-combo and right-click-delete when in object placement mode

  Bartłomiej Dach · 2025-03-13 08:24:08 +01:00
  61ed52eb69
• Add failing test cases that came up in review
  Dean Herbert · 2025-03-12 16:52:35 +09:00
  a492e070fb
• Merge branch 'master' into editor-right-click-as-people-expect
  Dean Herbert · 2025-03-12 14:51:28 +09:00
  083979e299
• Fix default beatmap not being correctly set after aborting new beatmap creation

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

  Dean Herbert · 2025-03-12 14:01:11 +09:00
  65cdcb4696
• Remove duplicated assert
  Dan Balasescu · 2025-03-04 17:22:19 +09:00
  5b0e54a77d
• Attempt to fix common editor test failures

  See
  https://github.com/ppy/osu/actions/runs/13623586844/job/38143232417?pr=32180
  for one example.
  
  Arguably the bindable usage in
  [`ControlPointPart`](https://github.com/ppy/osu/blob/2365b065a4994f38fe67bab7d193e5a09bee538c/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs#L24-L26)
  is dangerous, but it's only dangerous in tests (because control points
  aren't mutated outside the editor) so I'm willing to turn a blind eye
  for now to favour async loading support.

  Dean Herbert · 2025-03-04 15:51:08 +09:00
  a0888a7f2c
• Update failing assertions

  Change in behaviour is expected in this case.

  Bartłomiej Dach · 2025-03-03 13:53:42 +01:00
  d7d5eec58c
• Update test coverage
  Dean Herbert · 2025-02-26 17:57:10 +09:00
  896caf4a8d
• Fix missing cached settings in BetamapSubmissionOverlay test
  Dean Herbert · 2025-02-07 17:50:32 +09:00
  bf57fef412
• Remove stray [Solo]s
  Dean Herbert · 2025-02-07 15:30:31 +09:00
  aa329f397e
• Implement visual component for displaying submission progress
  Bartłomiej Dach · 2025-02-05 13:31:35 +01:00
  092b953dca
• Merge pull request #31789 from bdach/distance-snap-fix

  Fix distance snap grid not properly working due to multiple issues

  Dean Herbert · 2025-02-05 18:41:46 +09:00
  c37fa261c3
• Fix code quality
  Bartłomiej Dach · 2025-02-04 12:30:36 +01:00
  d28ea7bfbf
• Implement visual appearance of beatmap submission wizard
  Bartłomiej Dach · 2025-02-04 09:06:33 +01:00
  4dd4e52e6d
• Fix code quality
  Bartłomiej Dach · 2025-02-03 15:18:03 +01:00
  2d6f64e891
• Remove unused method

  Only used in test code.

  Bartłomiej Dach · 2025-02-03 14:01:51 +01:00
  df37768ff4
• Refactor IDistanceSnapProvider to accept slider velocity objects as a reference

  Method signatures are also changed to be a lot more explicit as to what
  inputs they expect.

  Bartłomiej Dach · 2025-02-03 14:00:57 +01:00
  a1185df2eb
• Merge branch 'master' into fix-limit-distance-snap-to-current
  Bartłomiej Dach · 2025-02-03 08:57:27 +01:00
  ee7d281e73
• Do not reset online info on beatmap save
  Bartłomiej Dach · 2025-01-31 12:21:42 +01:00
  c3981f1097
• Avoid moving already placed objects temporally when "limit distance snap to current time" is active
  Bartłomiej Dach · 2025-01-31 09:51:13 +01:00
  8718483c70
• Apply NRT to new class
  Dean Herbert · 2025-01-22 18:36:13 +09:00
  c94b8bf051