1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 23:23:04 +08:00
Commit Graph

47 Commits

Author SHA1 Message Date
Bartłomiej Dach
dde03b7d46
Merge branch 'master' into playfield-skin-layer 2023-08-03 20:42:15 +02:00
Dean Herbert
72005bef7c Fix skin editor crashing if the same component is provided twice 2023-07-31 15:10:58 +09:00
Dean Herbert
5bd06832d0 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.
2023-07-28 15:50:44 +09:00
Bartłomiej Dach
5213bfa5c9
Merge branch 'master' into make_skin_reset_dangerous 2023-03-07 21:06:44 +01:00
Dean Herbert
97bee4db89 Fix localisations 2023-03-07 18:07:53 +09:00
Dean Herbert
26ef7c2637 Rename confirmation dialog class to mention revert not reset 2023-03-07 18:07:46 +09:00
mk56-spn
908651cc11 make ResetConfirmDialog properly utilise its parent's logic
Adjust name of `DeleteAction` to `DangerousAction`
2023-03-05 20:57:26 +01:00
Bartłomiej Dach
60cdd3c070
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.
2023-03-04 14:10:05 +01:00
Bartłomiej Dach
d233f3a3ab
Show non-skinnable screen placeholder at higher level 2023-03-04 13:49:10 +01:00
Bartłomiej Dach
15409b9c15
Fix skin selection not clearing on exit to non-skinnable screen 2023-03-04 13:18:34 +01:00
mk56-spn
2b7111867c Adjust reversion header text naming. 2023-03-03 15:12:20 +01:00
mk56-spn
90227a6496 Rename DeleteConfirmationDialog.cs into DangerousActionDialog.cs 2023-02-27 21:57:59 +01:00
mk56-spn
00a00ead22 Make ResetConfirmDialog inherit from DeleteConfirmationDialog 2023-02-27 21:50:27 +01:00
mk56-spn
1239de6f41 Upper case web using alias 2023-02-27 21:34:07 +01:00
mk56-spn
bf1897a98f Adjust warning text slightly. 2023-02-27 16:08:14 +01:00
mk56-spn
ff0d1aa9f7 Make reverting changes to a given skin into a "dangerous action" 2023-02-26 20:38:50 +01:00
Dean Herbert
c48aceb055 Fix undo history not being batched correctly for depth change operations 2023-02-23 20:03:36 +09:00
Dean Herbert
16c8a392a1 Add ability to send selected skin components to front or back 2023-02-22 18:17:20 +09:00
Bartłomiej Dach
051eb18b33
Merge branch 'master' into skin-editor-layer-select 2023-02-21 21:38:51 +01:00
Dean Herbert
af062e7a68 Change placeComponent to only add to selection, not clear an existing selection 2023-02-21 14:11:18 +09:00
Dean Herbert
0d229d959b Remove unnecessary TriggerChange call 2023-02-21 13:50:19 +09:00
Dean Herbert
43d33d45ca Only add valid placed components to selected collection on paste 2023-02-20 20:02:43 +09:00
Dean Herbert
b68562b033 Make placeComponent resilient to missing dependencies 2023-02-20 20:00:12 +09:00
Dean Herbert
a9c7edd087 Remove copy pasted comment 2023-02-20 19:57:16 +09:00
Dean Herbert
0a018514e1 Make skin editor focus only one layer at a time 2023-02-17 19:27:16 +09:00
Dean Herbert
00fcee0c5a Add per-ruleset component toolbox and placement support 2023-02-17 19:27:16 +09:00
Dean Herbert
ba5a87ca04 Add basic target layer selection in skin editor 2023-02-17 19:27:16 +09:00
Dean Herbert
925deb7ca5 Make skin editor clipboard shared between screens and skins to allow moving elements over 2023-02-15 19:35:37 +09:00
Dean Herbert
bc83b0c264 Fix clipboard changes not batching as undo steps 2023-02-15 19:35:22 +09:00
Dean Herbert
bcf2555545 Fix components having incorrect default positions 2023-02-15 19:34:42 +09:00
Dean Herbert
d653335b6f Add basic skin editor clipboard implementation 2023-02-15 19:28:42 +09:00
Dean Herbert
a92e42bb84 Rename SkinnableTargetContainer to SkinComponentsContainer
Also use full `SkinComponentsContainerLookup` instead of the sub-type.
This will potentially be useful once we bring in per-ruleset targets.
2023-02-15 18:37:41 +09:00
Dean Herbert
e61d2d571c Move the lookup type out of ISserialisableDrawableContainer 2023-02-15 18:37:41 +09:00
Dean Herbert
a7b47f6503 Rename ISkinnableTarget to ISerialisableDrawableContainer 2023-02-15 18:37:41 +09:00
Dean Herbert
d159d6b970 Rename ISkinnableDrawable to ISerialisableDrawable 2023-02-15 18:37:41 +09:00
Dean Herbert
0320ba770f Handle component changes via ISkinnableTarget.Components rather than inside SkinEditor directly
Seems saner? Maybe?
2023-02-07 16:23:25 +09:00
Dean Herbert
dad348111d Fix holding a selection while changing screens causing a crash 2023-02-07 16:07:33 +09:00
Dean Herbert
71eef238c4 Make OnStateChange non-implemented rather than wrong 2023-02-07 16:04:31 +09:00
Dean Herbert
10ab4d572a Merge branch 'master' into skin-editor-undo-support 2023-02-06 13:46:50 +09:00
Bartłomiej Dach
59656a7286
Merge branch 'master' into skin-editor-dont-show-save-on-no-change 2023-02-03 19:08:33 +01:00
Dean Herbert
2cda277c09 Add a basic change handler to the skin editor 2023-02-03 18:57:50 +09:00
Dean Herbert
32207dc9dd Merge branch 'master' into locale/skin-editor-components 2023-02-03 15:24:00 +09:00
Bartłomiej Dach
4d46a8f32d
Merge branch 'master' into skin-editor-dont-show-save-on-no-change 2023-02-02 19:36:23 +01:00
Bartłomiej Dach
f7fa9e3927
Remove outdated comment 2023-02-02 18:41:35 +01:00
Dean Herbert
015f4f2b38 Avoid showing skin save message when changing scenes after making no changes 2023-02-02 18:42:37 +09:00
Dean Herbert
9b6d95b3d6 Adjust skin editor pop in/out to be more snappy 2023-02-02 18:33:45 +09:00
Dean Herbert
8dc2e6872e Move skin editor to overlays namespace 2023-02-02 14:00:31 +09:00