1368 Commits

• 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
• 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
• 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
• 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
• Adjust padding and text size in editor inspector (#36843)

  It was taking up way too much vertical space previously.
  
  I'm using the same font specs that are in the new dropdown header, which
  seem to work quite well. Negative padding because without it everything
  is way too vertically sparse.
  
  Why? I was looking at [this
  discussion](https://github.com/ppy/osu/discussions/36708) and like "we
  need to have SV visible here" but there's really not much room with all
  this text in the way.

  Dean Herbert · 2026-03-06 19:32:19 +09:00
  8fe63ade31
• 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
• Remove button sound from sample toggle buttons

  The new ones added in this change don't play the UI sounds, likely
  because they make it nigh impossible to actually hear what the gameplay
  samples will sound like.
  
  This removes the same sounds from the existing buttons to match.

  Dean Herbert · 2025-12-18 20:17:46 +09:00
  13aeed15f9
• Fix playing sample multiple times
  Bartłomiej Dach · 2025-10-31 08:55:55 +01:00
  8755a01622
• Add sample set selection controls to sample popovers

  - Below 20 custom sample sets, they are shown as ternary buttons.
  - Above 20 custom sample sets, they are shown in a dropdown (yes there
    are actual cases of this as I've been informed by the NAT; one example
    being https://osu.ppy.sh/beatmapsets/1018061#osu/2197383)
  
  As a bonus, to make determining what the heck is actually changing when
  adjusting these controls, the full set of applicable sounds now plays on
  adding/removing additions, changing their banks, as well as changing the
  custom set (if any).
  
  For now there are no user-facing controls to add the samples to the map
  yourself, you have to know how to name the `.wav`s and edit-externally
  them in yourself. *For now.*

  Bartłomiej Dach · 2025-10-24 12:09:27 +02:00
  e2681c4163
• Make bank selection controls dropdowns instead of text boxes

  Longstanding complaint. Text boxes make no sense if anything that isn't
  the three legacy values gets deleted on save anyway.

  Bartłomiej Dach · 2025-10-24 11:52:45 +02:00
  1f2f86b016
• Show sample suffix on timeline pieces
  Bartłomiej Dach · 2025-10-24 11:52:45 +02:00
  fa7bd482d2
• Fix editor memory leak
  Dan Balasescu · 2025-09-02 09:21:31 +09:00
  cac136d3c6
• Fix potential div-by-zero
  Andrei Zavatski · 2025-07-18 15:55:33 +03:00
  04cd91bd36
• Use boxes with inflation instead of a shader
  Andrei Zavatski · 2025-07-18 15:52:51 +03:00
  0f2a078447
• Combine CentreMarker with MarkerVisualisation
  Andrei Zavatski · 2025-07-18 13:19:41 +03:00
  5cb51e5e21
• Use OverlayColourProvider for BeatDivisorControl icon colour
  Marvin Schürz · 2025-07-01 10:38:22 +02:00
  709bc9c330
• Change icon colour of BeatDivisorControl to be light
  marvin · 2025-06-30 18:43:37 +02:00
  ccc1a7ae6f
• Fix rotating objects in the skin editor not rotating as expected

  Closes https://github.com/ppy/osu/issues/33845.
  
  Not sure if this ever worked but it was definitely wrong for a while
  now.

  Dean Herbert · 2025-06-24 10:39:56 +02:00
  4123d4a80d
• Fix timeline not updating ticks correctly after arbitrary timing control point changes (again)

  Closes https://github.com/ppy/osu/issues/33393.
  
  This is admittedly a half-assed diff. This was apparently "fixed" once
  before, eons ago, in https://github.com/ppy/osu/pull/11032, but I'm not
  sure whether it regressed, or where, because I don't want to bisect four
  years back. (At that time `ControlPointInfo.ControlPointsChanged`
  did not exist yet.)
  
  Also there's the part where changes to control points do not undo or
  redo (see https://github.com/ppy/osu/issues/31942), but I'm not touching
  that *either*, because if I start touching that, then I will get yelled
  at for not reviewing the 2.5k line PR that rewrites the entirety of
  change handling in editor instead
  (https://github.com/ppy/osu/pull/30314). I will attempt to get through
  that mental block sometime within the year. Please do not rush me.
  
  The cheap cop-out argument is that hooking this up to `ControlPointInfo`
  specifically is probably "more efficient" anyway.

  Bartłomiej Dach · 2025-06-10 14:44:23 +02:00
  f5aeedc7e1
• better comment, fix typo in test case
  Chris Ehmann · 2025-06-05 18:28:17 -07:00
  5e3eb70829
• Add comment to explain guard clause
  Chris Ehmann · 2025-06-05 17:50:01 -07:00
  36eea335a4
• Add check to see if MouseUp event was the left button
  Chris Ehmann · 2025-05-28 17:02:18 -07:00
  13ace770ae
• Merge branch 'master' into iss32064
  Nuno Pelágio · 2025-05-19 21:17:23 +01:00
  7893b885c5
• Fix ppy#32064: Fixed Formatting.
  Nuno Pelagio · 2025-05-19 20:00:24 +01:00
  dc86b77f80
• Fix #32064: Inconsistent angle display when rotation objects.

  The normalization formula didn't handle the 180° boundary consistently,
  and produced asymmetric results for top vs. bottom rotation points.
  Changes made: replaced the angle normalization with symmetric normalization,
  and forced 180º to be the displayed angle across all rotation points.

  Nuno Pelagio · 2025-05-02 11:58:43 +01:00
  7af17a5d94
• Fix deselecting single item from a multiple selection not updating ternary states correctly

  I'm not sure why this condition was written this obtusely, but
  importantly it was also wrong. It fires when the selection contains
  multiple items and only some are removed from it, like when
  ctrl-click-unselecting an item from a multiple selection.

  Bartłomiej Dach · 2025-04-24 09:25:36 +02:00
  5a3ff11710
• Reset sample ternary states on deselection

  Closes https://github.com/ppy/osu/issues/32928.
  
  Appears to match stable:
  
  	https://github.com/peppy/osu-stable-reference/blob/996648fba06baf4e7d2e0b248959399444017895/osu!/GameModes/Edit/Modes/EditorModeCompose.cs#L4137-L4143
  	https://github.com/peppy/osu-stable-reference/blob/996648fba06baf4e7d2e0b248959399444017895/osu!/GameModes/Edit/Modes/EditorModeCompose.cs#L1615-L1618
  	https://github.com/peppy/osu-stable-reference/blob/996648fba06baf4e7d2e0b248959399444017895/osu!/GameModes/Edit/Modes/EditorModeCompose.cs#L4323

  Bartłomiej Dach · 2025-04-24 09:25:27 +02:00
  5c04f427a5
• Block all mouse events at BeatDivisorControl and revert animated button change
  Dean Herbert · 2025-04-09 14:56:30 +09:00
  27edee477d
• Fix mouse down actions being leaked through buttons
  Dean Herbert · 2025-04-08 14:28:48 +09:00
  e42301058f
• Remove non-visible "beat snap" text in editor
  Dean Herbert · 2025-03-20 15:46:09 +09:00
  80ff974594
• Fix context menu not working when selection hasn't changed
  Dean Herbert · 2025-03-12 18:25:56 +09:00
  5b911ad8d0
• Fix quick delete still propagating right click mouse input upwards
  Dean Herbert · 2025-03-12 16:52:36 +09:00
  db7d1f32d7
• Merge branch 'master' into editor-right-click-as-people-expect
  Dean Herbert · 2025-03-12 14:51:28 +09:00
  083979e299
• Merge pull request #32319 from 64ArthurAraujo/editor-darker-placement-blueprint

  Adjust timeline placement display

  Bartłomiej Dach · 2025-03-11 15:28:16 +01:00
  3710d0ede5
• Show border instead of adjusting dim
  Dean Herbert · 2025-03-11 18:35:10 +09:00
  770291b462
• Disallow adjusting slider repeats with more lenient check condition
  Dean Herbert · 2025-03-11 16:12:32 +09:00
  d4f0fc0fde
• Change amount from 0.9f to 0.6f
  Arthur Araujo · 2025-03-10 16:09:18 -03:00
  a78868712c
• Merge pull request #32200 from andy840119/remove-handle-scale-base-method

  Remove unused virtual method after refactor the scale handling.

  Dan Balasescu · 2025-03-04 13:14:14 +09:00
  8c13a86ad1
• This method is not being used anymore.

  see:
  https://github.com/ppy/osu/pull/26643

  andy840119 · 2025-03-03 22:10:41 +08:00
  23a5d6dc40
• Always zoom timeline to centre rather than focus point

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

  Dean Herbert · 2025-03-03 18:53:41 +09:00
  52860def6c
• Add back right-click-for-new-combo and right-click-delete when in compose mode

  Requested too many times to count.
  
  I'm not sure what to do about the code quality of this. It's a bit weird
  that there's no way to check the current composition tool from a higher
  level.
  
  Also it was discussed IRL that there should be some kind of hinting that
  existing notes will be deleted when they are hovered, but I'm not sure
  how well this will work in normal mapping flows, since it will display
  even in cases that users aren't intending to delete an object. Still
  willing to explore this direction though (it's just non-trivial to
  implement so I haven't yet).

  Dean Herbert · 2025-02-26 17:52:33 +09:00
  2738c1a807
• Adjust rounding tolerance in distance snap grid ring colour logic
  Bartłomiej Dach · 2025-02-21 12:05:23 +01:00
  a690b0bae9
• Ensure EditorBeatmap.PerformOnSelection() marks objects in selection as updated

  Closes https://github.com/ppy/osu/issues/28791.
  
  The reason why nudging was not changing hyperdash state in catch was
  that `EditorBeatmap.Update()` was not being called on the objects that
  were being modified, therefore postprocessing was not performed,
  therefore hyperdash state was not being recomputed.
  
  Looking at the usage sites of `EditorBeatmap.PerformOnSelection()`,
  about two-thirds of callers called `Update()` themselves on the objects
  they mutated, and the rest didn't. I'd say that's the failure of the
  abstraction and it should be `PerformOnSelection()`'s responsibility to
  call `Update()` there. Yes in some of the cases here this will cause
  extraneous calls that weren't done before, but the method is already
  heavily disclaimed as 'expensive', so I'd say usability should come
  first.

  Bartłomiej Dach · 2025-02-18 12:06:42 +01:00
  e6174f195c
• Merge pull request #31917 from bdach/nudge-fix

  Fix nudge operations incurring FP error from coordinate space conversions

  Dan Balasescu · 2025-02-18 12:19:14 +09:00
  3b8b8ae87f
• Fix nudge operations incurring FP error from coordinate space conversions

  Closes https://github.com/ppy/osu/issues/31915.
  
  Reproduction of aforementioned issue requires 1280x720 resolution, which
  should also be a good way to confirm that this does anything.
  
  To me this is also equal-parts-bugfix, equal-parts-code-quality PR,
  because tell me: what on earth was this code ever doing at
  `ComposeBlueprintContainer` level? Nudging by one playfield-space-unit
  doesn't even *make sense* in something like taiko or mania.

  Bartłomiej Dach · 2025-02-17 15:21:07 +01:00
  f37a56c307
• Merge pull request #31912 from bdach/more-snap-grid

  Fix some more visual issues with osu! distance snap grid

  Dean Herbert · 2025-02-17 21:11:17 +09:00
  42fb544218
• Fix distance snap grid line opacity being incorrect on non-1.0x velocities

  Noticed in passing.

  Bartłomiej Dach · 2025-02-17 10:11:47 +01:00
  2b4b21beb6
• Fix distance snap grid colours being off-by-one in certain cases

  Closes https://github.com/ppy/osu/issues/31909.
  
  Previously: https://github.com/ppy/osu/pull/30062.
  
  Happening because of rounding errors - in this case the beat index
  pre-flooring was something like a 0.003 off of a full beat, which would
  get floored down rather than rounded up which created the discrepancy.
  But also we don't want to round *too* far, which is why this
  frankenstein solution has to exist I think. This is probably all
  exacerbated by stable not handling decimal control point start times.
  
  Would add tests if not for the fact that this is like extremely annoying
  to test.

  Bartłomiej Dach · 2025-02-17 10:11:23 +01:00
  8423d9de9b