osu-lazer

Merge branch 'master' into playfield-skin-layer

Bartłomiej Dach · 2023-08-03 20:42:15 +02:00

dde03b7d46

Merge pull request #24427 from peppy/fix-skin-editor-crash-multi-spectator

Fix game crashing when entering skin editor in multiplayer spectator

Bartłomiej Dach · 2023-08-01 18:25:11 +02:00

d65f08a048

Fix skin editor crashing if the same component is provided twice

Dean Herbert · 2023-07-31 15:10:58 +09:00

72005bef7c

Make SelectionRotationHandler a Component

Bartłomiej Dach · 2023-07-30 20:18:33 +02:00

262f25dce8

Fix skin component toolbox not working correctly for ruleset matching

Until now, the only usage of ruleset layers was where there is both a
ruleset specific and non-ruleset-specific layer present. The matching
code was making assumptions about this.

As I tried to add a new playfield layer which breaks this assumption,
non-ruleset-specifc components were not being displayed in the toolbox.
This turned out to be due to a `target` of `null` being provided due to
the weird `getTarget` matching (that happened to *just* do what we
wanted previously due to the equals implementation, but only because
there was a container without the ruleset present in the available
targets).

I've changed this to be a more appropriate lookup method, where the
target for dependency sourcing is provided separately from the ruleset
filter.

Dean Herbert · 2023-07-28 15:50:44 +09:00

5bd06832d0

Migrate skin element rotation handling to SelectionRotationHandler

Bartłomiej Dach · 2023-07-23 20:56:22 +02:00

f8047d6ab6

Move out helper methods to static class

Bartłomiej Dach · 2023-07-23 18:24:20 +02:00

4622255cc7

Fix double-click handling when cyclic selection is enabled

Removes the limitations of cyclic selection as a result.

Dean Herbert · 2023-07-19 17:21:20 +09:00

cf3949c9e2

Remove unused using directive

Bartłomiej Dach · 2023-06-22 20:24:44 +02:00

aea5eb37dc

Change skin editor flow to always save on toggle

This also moves the beatmap skin disable toggle to on toggle, in line
with review feedback.

I've decided to always apply the disable, not just on the `Player`
screen. It should be assumed that if a user is in the skin editor they
are never going to need access to this anyway.

Dean Herbert · 2023-06-21 16:14:47 +09:00

cb0f642ad7

Use bindable lease instead of reimplementing the same thing locally

Dean Herbert · 2023-06-21 16:09:54 +09:00

366dd96875

Disable beatmap skinning when entering the skin editor

Dean Herbert · 2023-06-20 19:18:17 +09:00

d7b486e2ac

Fix weird state when attempting to enter gameplay skin editor scene from multiplayer

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

Dean Herbert · 2023-05-23 17:58:44 +09:00

adf9a596b5

Trim comments

Leaving only the ones that add anything useful and do not restate the
code verbatim.

Bartłomiej Dach · 2023-05-03 19:22:52 +02:00

1d4d31e35c

Rename variables for legibility

Having `typedComponents` and `typeComponents` next to each other is
asking for trouble.

Bartłomiej Dach · 2023-05-03 19:21:16 +02:00

27fabd99fb

Revert SaveState() calling on initialization

Terochi · 2023-05-01 12:53:58 +02:00

4d52ce769b

Use Queue instead of Stack

Terochi · 2023-04-30 16:36:01 +02:00

fb4b681cc5

Addressed changes

Terochi · 2023-04-30 16:11:52 +02:00

8f02bd80f9

Improved logic

Terochi · 2023-04-30 12:05:55 +02:00

949dc1c0f9

Fixed ApplyStateChange to happen in correct order

Terochi · 2023-04-30 02:01:18 +02:00

8ec2154965

Save first state when editing

Terochi · 2023-04-29 20:54:19 +02:00

17e4b75dfd

Improved logic for ApplyStateChange for skin editor

Terochi · 2023-04-29 19:52:22 +02:00

3b0ba4b38b

Merge branch 'master' into skin-editor-cyclic-selection

Dean Herbert · 2023-03-14 20:43:56 +09:00

6546f5968a

Merge branch 'master' into make_skin_reset_dangerous

Bartłomiej Dach · 2023-03-07 21:06:44 +01:00

5213bfa5c9

Fix localisations

Dean Herbert · 2023-03-07 18:07:53 +09:00

97bee4db89

Rename confirmation dialog class to mention revert not reset

Dean Herbert · 2023-03-07 18:07:46 +09:00

26ef7c2637

Add optional support for cyclic selection to BlueprintContainer

Dean Herbert · 2023-03-07 14:22:12 +09:00

21bdbb20e6

make ResetConfirmDialog properly utilise its parent's logic

Adjust name of `DeleteAction` to `DangerousAction`

mk56-spn · 2023-03-05 20:57:26 +01:00

908651cc11

Clear components sidebar unconditionally on every target change

Fixes the working layer dropdown lingering after exiting from a
skinnable screen to a non-skinnable one.

Bartłomiej Dach · 2023-03-04 14:10:05 +01:00

60cdd3c070

Show non-skinnable screen placeholder at higher level

Bartłomiej Dach · 2023-03-04 13:49:10 +01:00

d233f3a3ab

Accept ISerialisableDrawableContainer directly in SkinBlueprintContainer

An end result of #22674 is that `SkinBlueprintContainer`s are only ever
created by supplying a `SkinComponentsContainer` to them. However,
`SkinBlueprintContainer` still contained remnants of code that suggested
it was designed to handle cases where more than the drawable supplied to
it contained more than one `ISerialisableDrawableContainer`, or even
zero.

The zero path is totally dead right now (because every
`SkinComponentsContainer` is *by necessity* an
`ISerialisableDrawableContainer`), and the more-than-one path is dead
*for now* (and potentially forever?). Therefore, just hard-couple
`SkinBlueprintContainer` to receive a single target container.

Bartłomiej Dach · 2023-03-04 13:33:21 +01:00

49e298e304

Move NonSkinnableScreenPlaceholder to outer scope

Bartłomiej Dach · 2023-03-04 13:22:43 +01:00

2f25fb4083

Fix skin selection not clearing on exit to non-skinnable screen

Bartłomiej Dach · 2023-03-04 13:18:34 +01:00

15409b9c15

Adjust reversion header text naming.

mk56-spn · 2023-03-03 15:12:20 +01:00

2b7111867c

Rename DeleteConfirmationDialog.cs into DangerousActionDialog.cs