1344 Commits

• 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
• Stop beat divisor "slider" from accepting focus
  Dean Herbert · 2025-02-17 15:06:35 +09:00
  d5566831d2
• Fix incorrect snapping behaviour when previous object is not snapped to beat
  Bartłomiej Dach · 2025-02-04 11:45:15 +01:00
  731f100aaf
• 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
• 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
• Move ApplySelectionOrder override from EditorBlueprintContainer to ComposeBlueprintContainer
  Marvin Helstein · 2025-01-30 10:27:36 +02:00
  ec99fc1141
• Remove dependence of placement blueprints on IPositionSnapProvider
  Bartłomiej Dach · 2025-01-24 11:59:07 +01:00
  a6987f5c95
• Remove dependence of blueprint containers on IPositionSnapProvider
  Bartłomiej Dach · 2025-01-24 11:59:05 +01:00
  15b6e28ebe
• Fix ComposeBlueprintContainer handling nudge keys when it can't nudge
  Dean Herbert · 2025-01-21 16:40:16 +09:00
  9a12f48dcc
• Fix beat snap grid being lines not being corectly centered to time

  This was pointed out as an issue in the osu!taiko editor, but actually
  affects all rulesets. Has now been fixed everywhere.
  
  ---
  
  Closes https://github.com/ppy/osu/issues/31548.
  
  osu!mania could arguable be consdiered "more correct" with the old
  display, but I don't think it's a huge deal either way (subjective at
  best).

  Dean Herbert · 2025-01-21 14:20:56 +09:00
  46ff9d1aad
• Merge pull request #31473 from bdach/colorhax

  Add combo colour override control to editor

  Dean Herbert · 2025-01-14 20:52:15 +09:00
  0e20c0e307
• Update game ScrollContainer usage in line with framework changes

  See https://github.com/ppy/osu-framework/pull/6467.

  Dean Herbert · 2025-01-11 01:42:59 +09:00
  94ea003d90
• Add combo colour override control to editor

  Closes https://github.com/ppy/osu/issues/25608.
  
  Logic mostly matching stable. All operations are done on `ComboOffset`
  which still makes overridden combo colours weirdly relatively dependent
  on each other rather than them be an "absolute" choice, but alas...
  
  As per stable, two consecutive new combos can use the same colour only
  if they are separated by a break:
  
      https://github.com/peppy/osu-stable-reference/blob/52f3f75ed7efd7b9eb56e1e45c95bb91504337be/osu!/GameModes/Edit/Modes/EditorModeCompose.cs#L4564-L4571
  
  This control is only available once the user has changed the combo
  colours from defaults; additionally, only a single new combo object
  must be selected for the colour selector to show up.

  Bartłomiej Dach · 2025-01-10 13:40:56 +01:00
  48196949e0
• Simplify editor "ternary button" structure

  As I look into re-implementing the ability to choose combo colour for an
  object (also known as "colourhax") from the editor UI, I stumble upon
  these wretched ternary items again and sigh a deep sigh of annoyance.
  
  The structure is overly rigid. `TernaryItem` does nothing that
  `DrawableTernaryItem` couldn't, except make it more annoying to add
  specific sub-variants of `DrawableTernaryItem` that could do more
  things.
  
  Yes you could sprinkle more levels of virtuals to
  `CreateDrawableButton()` or something, but after all, as Saint Exupéry
  says, "perfection is finally attained not when there is no longer
  anything to add, but when there is no longer anything to take away."
  So I'm leaning for taking one step towards perfection.

  Bartłomiej Dach · 2025-01-09 13:41:22 +01:00
  5c8ae6f851
• Do not expose track directly in EditorClock

  Intends to stop people from mutating it directly, and going through
  `EditorClock` members like `AudioAdjustments` instead.

  Bartłomiej Dach · 2025-01-07 11:40:18 +01:00
  98bb723438
• Fix allocations in updateSamplePointContractedState
  Andrei Zavatski · 2025-01-07 00:48:58 +03:00
  791ca915e4
• Reduce HitSampleInfo constants allocations
  Andrei Zavatski · 2025-01-07 00:36:58 +03:00
  e8dc09f5bc
• Take custom bank name length into account when collapsing sample point indicators

  Would close https://github.com/ppy/osu/issues/31312.
  
  Not super happy with the performance overhead of this, but this is
  already a heuristic-based implementation to avoid every-frame
  `.ChildrenOfType<>()` calls or similar, so not super sure how to do
  better. The `Array.Contains()` check stands out in profiling, but
  without it the indicators can collapse *too* eagerly sometimes.

  Bartłomiej Dach · 2024-12-30 12:04:41 +01:00
  693db097ee
• Do not deselect objects when control-clicking without hitting anything

  As per feedback in
  https://discord.com/channels/90072389919997952/1259818301517725707/1310270647187935284.

  Bartłomiej Dach · 2024-12-02 13:51:43 +01:00
  b505ecc7ba
• Merge pull request #28473 from bdach/beatmap-info-purge

  Move unnecessary properties from `BeatmapInfo` / realm to `IBeatmap`

  Dean Herbert · 2024-12-02 16:19:12 +09:00
  5b2558cec2
• Don't reset state when changing from one selection to another in the editor

  This was causing state pollution in the new selection. I can't see why
  this needs to happen when a selection changes to another.
  
  This fixes https://github.com/ppy/osu/issues/30839 and also the same
  issue happening for the new combo toggle.
  
  Tests all seem to pass, and I can't immediately find anything broken,
  but YMMV.

  Dean Herbert · 2024-11-26 17:33:41 +09:00
  3ecb3b674d
• Merge branch 'master' into beatmap-info-purge
  Dean Herbert · 2024-11-22 18:47:32 +09:00
  086a34f5c0
• Deactivate new combo toggle on deselecting objects

  Closes https://github.com/ppy/osu/issues/30713.
  
  Was a point of discussion doing review:
  
  	https://github.com/ppy/osu/pull/30214#discussion_r1798833139
  
  Given it got pointed out immediately for something so minor, I'm
  inclined to believe it's a rather undesirable change.

  Bartłomiej Dach · 2024-11-18 15:13:32 +01:00
  259e9ecf65
• Do not permit new combo toggle to remain in indeterminate state on deselect
  Bartłomiej Dach · 2024-11-14 10:07:09 +01:00
  88aea70429
• Merge branch 'master' into feat/optimize-polygon-tool
  Bartłomiej Dach · 2024-11-14 09:54:04 +01:00
  1b279e45cc