osu-lazer

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

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

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

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

Merge pull request #30411 from frenzibyte/editor-slider-touch-support-2

Fix placing objects via touch in editor not working sometimes

Dean Herbert · 2024-11-13 15:09:57 +09:00

78084e33af

Remove redundant condition in else branch

Yep.

Salman Alshamrani · 2024-10-25 23:15:17 -04:00

0e65655fef

Add visual disabled state to ternary buttons

Dean Herbert · 2024-10-24 18:36:34 +09:00

77bd0e8d70

Merge branch 'master' into editor-slider-touch-support-2

Salman Alshamrani · 2024-10-23 17:02:38 -04:00

6e9ff49e59

Fix placement blueprints sometimes not behaving correctly with touch input

More specifically, this fixes placement blueprints not beginning placement when using touch input while the cursor was previously outside compose area, due to the placement blueprint not existing (removed from the scene by `ComposeBlueprintContainer`).

Salman Alshamrani · 2024-10-23 16:51:21 -04:00

3a4d5af83e

Show tooltip on auto normal bank when not usable

OliBomby · 2024-10-23 21:25:37 +02:00

ddbeb56f0f

Merge branch 'master' into auto-addition2

Dean Herbert · 2024-10-23 15:53:07 +09:00

5939c78760

Merge pull request #28863 from OliBomby/additions

Add toggles and hotkeys for configuring sample addition bank

Dean Herbert · 2024-10-23 15:52:55 +09:00

2103b3e186

Fix coding mistake

Salman Alshamrani · 2024-10-14 15:11:44 -04:00

e151c0fab1

Move conditional

Salman Alshamrani · 2024-10-14 09:55:24 -04:00

40b98d4863

Fix placement blueprints not receiving latest mouse position with touch input

Salman Alshamrani · 2024-10-13 11:01:18 -04:00

f8c8184c5c

Add tooltip to explain why addition banks dont work when no additions exist

OliBomby · 2024-10-01 13:07:25 +02:00

1960a0d44d

Merge branch 'master' into additions

Dean Herbert · 2024-10-01 16:38:56 +09:00

1b4215576d

Refactor PlacementBlueprint to not be hitobject specific

OliBomby · 2024-09-24 20:31:00 +02:00

e3b4483872

Don't snap to global grid while placing grid

OliBomby · 2024-09-23 17:24:09 +02:00

0f0f490598

Refactor PlacementBlueprint to not be hitobject specific

OliBomby · 2024-09-23 16:33:36 +02:00

1a81e12192

Redesign sample bank toggles

OliBomby · 2024-08-13 22:05:01 +02:00

2abcdd0064

Merge branch 'master' into additions

Dean Herbert · 2024-08-08 03:31:11 +09:00

b5a19707d0

Fix compose blueprint container not unsubscribing from event

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

This is related to reloading the composer on timing point changes in
scrolling rulesets. The lack of unsubscription from this would cause
blueprints to be created for disposed composers via the
`hitObjectAdded()` flow.

The following line looks as if a sync load should be forced on a newly
created placement blueprint:

    https://github.com/ppy/osu/blob/da4d37c4aded5e10d0a65ff44a08a886e3897e19/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs#L364

however, it is not the case if the parent
(`placementBlueprintContainer`) is disposed, which it would be in this
case. Therefore, the blueprint stays `NotLoaded` rather than `Ready`,
therefore it never receives its DI dependencies, therefore it dies on
an `EditorBeatmap` nullref.

Bartłomiej Dach · 2024-07-19 08:32:36 +02:00

4dd225fdc8

fix placement samples

OliBomby · 2024-07-14 22:33:23 +02:00

df7a42a00e

addition bank toggles in compose

OliBomby · 2024-07-14 20:43:16 +02:00

952540024e

Merge branch 'master' into timeline-drag-selection-crash

Dean Herbert · 2024-06-20 15:16:10 +09:00

14104e57d4

Commit active placement when starting drag selection via timeline

This was reported in https://github.com/ppy/osu/pull/28474, albeit the
code changes proposed there did not fix the issue at all.

See 8b6385f7d0 for demonstration of the
crash scenario. Basically what is happening there is:

- The starting premise is that there is a spinner placement active.
- At this time, a drag selection is started via the timeline.
- Once the drag selection finds at least one suitable object to select,
  it mutates `SelectedItems`.
- When selection changes for any reason, the `HitObjectComposer`
  decides to switch to the "select" tool, regardless of why
  the selection changed.
- Changing the active tool causes the current placement - if any -
  to be committed, which mutates the beatmap.
- Back at the drag box selection code, this causes a "collection
  modified when enumerating" exception.

The proposed fix here is to eagerly commit active placement - if any -
when drag selection is initiated via the timeline, which avoids this
issue. This also appears to vaguely match stable behaviour and is sort
of consistent with the logic of committing any outstanding changes upon
switching to the selection tool.

Bartłomiej Dach · 2024-06-14 09:32:40 +02:00

bdeea37a44

Merge remote-tracking branch 'upstream/master' into edit-nodesample

OliBomby · 2024-01-25 11:33:29 +01:00

c2d57dc77c

Use new icons in editor

Some that exist on figma are purposefully not used due to an editorial
request from @peppy.

Bartłomiej Dach · 2023-12-27 17:42:18 +01:00

288ac930e4

Fix failing tests

Dean Herbert · 2023-10-30 18:06:11 +09:00

63e6eaf538

Fix right clicks on timeline objects potentially getting eaten by playfield area

`SelectionHandler` is receiving input from anywhere out of necessity:

https://github.com/ppy/osu/blob/19f892687a0607afbe4e0d010366dc2a66236073/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs#L119-L125

Also important is that `BlueprintContainer` will selectively not block
right clicks to make sure they fall through to the
`ContextMenuContainer`:

https://github.com/ppy/osu/blob/19f892687a0607afbe4e0d010366dc2a66236073/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs#L122-L126

But because the whole editor is sharing a `ContextMenuContainer` and
it's at a higher level than both components, we observe here the
playfield's `SelectionHandler` intercepting the right click before it
can reach the `ContextMenuContainer`.

The fix here is similar to what we're already doing in
`TimelineBlueprintContaienr`.

Dean Herbert · 2023-10-30 18:06:11 +09:00

57d88a0ac4

Merge branch 'master' into edit-nodesample

Dean Herbert · 2023-05-30 14:03:43 +09:00

4a81d068af

Fix ComposeBlueprintContainer briefly assigning auto bank

Seems to have had no consequence due to the way
`AutomaticBankAssignment` works (that flag is checked in
`PlacementBlueprint.UpdateTimeAndPosition()`, which runs essentially
every frame), but let's avoid putting it there at all ever.

Bartłomiej Dach · 2023-05-25 21:49:29 +02:00

7d8f08c0ea

Add "auto" bank selection during placement

Dean Herbert · 2023-05-24 17:11:12 +09:00

3a05dffa50

Don't use switch for single case statement

Dean Herbert · 2023-05-24 16:14:05 +09:00

fc22c75464

Update to support non-control-point sample changes

Dean Herbert · 2023-05-24 14:20:38 +09:00

a9ba16a2be

Merge branch 'master' into sample-set-controls