Commit Graph

37710 Commits

Author SHA1 Message Date
aac32a2c9f Combine config and time checks into one
Functionally equivalent right now, but the combined variant is more
localised to what it actually needs to do, and less error-prone if
any new code gets appended to the method.
2023-02-19 13:14:51 +01:00
723a043c43 naming change from Hitobject to HitObject 2023-02-19 10:18:22 +01:00
f3522c4162 change bindable seekToHitObject to private 2023-02-19 10:18:02 +01:00
ddd37bb319 Add setting to disable automatic seeking after object placement 2023-02-18 19:43:45 +01:00
ea04c487f2 Merge branch 'master' into blueprint-labels-while-hovering 2023-02-18 15:57:30 +01:00
15d209d17e Merge branch 'master' into CompletionText-LocalisableString 2023-02-18 13:50:58 +01:00
fbea3e312f Merge branch 'master' into skin-editor-improve-toolbox-hover 2023-02-18 10:02:02 +01:00
704dddf14b Merge branch 'master' into skin-editor-clipboard 2023-02-17 22:59:18 +01:00
6b9472c367 Merge branch 'master' into skin-per-ruleset-layouts 2023-02-17 22:58:38 +01:00
2aa4481f68 Fix toolbox items spontaneously contracting after briefly losing hover
Reproduction scenario:

1. Hover a toolbox item
2. Unhover the item, but do not hover any other item (can be done by
   exiting the toolbox completely to the right)
3. Come back to the item hovered in step (1)
4. The item would spontaneously contract after a second
2023-02-17 22:54:11 +01:00
b390fdb8cc Remove unused field 2023-02-17 21:51:19 +01:00
8894a73b07 Merge branch 'master' into blueprint-improve-visuals 2023-02-17 21:40:16 +01:00
ffcca9fd89 Remove awkward width specification 2023-02-17 23:23:58 +03:00
6afa65bd3d Merge branch 'master' into skinnable-clean-up-documentation 2023-02-17 20:59:18 +01:00
449e5fa6f8 Rename one more left-over skinnable naming 2023-02-17 22:09:55 +03:00
dbb366e279 CompletionText can be a LocalisableString
I can't find a reason for not doing this, probably this was forgotten in https://github.com/ppy/osu/pull/15440
2023-02-17 22:32:03 +09:00
51940133df Adjust width and add comment 2023-02-17 15:18:45 +03:00
0838fa636f Make triangles slower 2023-02-17 15:16:00 +03:00
fa300b5ba0 Merge branch 'master' into mod-overlay-triangles 2023-02-17 15:13:51 +03:00
0a018514e1 Make skin editor focus only one layer at a time 2023-02-17 19:27:16 +09:00
00fcee0c5a Add per-ruleset component toolbox and placement support 2023-02-17 19:27:16 +09:00
ba5a87ca04 Add basic target layer selection in skin editor 2023-02-17 19:27:16 +09:00
c03b6cec23 Add IEquatable and ToString support to SkinComponentsContainerLookup 2023-02-17 19:27:16 +09:00
a01c3090e4 Fix tests which rely on HUDOverlay's DrawableRuleset being nullable 2023-02-17 19:27:09 +09:00
5ed038fbb3 Improve the feel of hovering toolbox component items 2023-02-17 19:26:03 +09:00
814080d982 Only show blueprint labels when hovering or selected 2023-02-17 19:23:52 +09:00
19d5293ad1 Change early return to also find the earliest nested object 2023-02-17 18:59:31 +09:00
209d41ee9d Use RulesetInfo instead of Ruleset in skin components lookup 2023-02-17 18:24:05 +09:00
675e5b81f3 Fix SkinnableLighting showing up as a user placeable component 2023-02-17 18:24:05 +09:00
2267aa1ac2 Add ability to retrieve serialisable drawables for specific rulesets 2023-02-17 18:24:05 +09:00
ffb99364b9 Ensure skin default component layouts only apply to global layout for now 2023-02-17 18:24:05 +09:00
6c61c5f4a8 Fix selection on the edge of blueprints (in the new inflation area) failing 2023-02-17 18:19:46 +09:00
16d94b4ea2 Improve visuals of skin blueprint 2023-02-17 18:19:46 +09:00
9793774377 Update SkinDeserialisationTest to work with new serialisation structure 2023-02-17 16:22:48 +09:00
6b3652f567 Change serialisation format of skin layouts to allow more flexibility
Also adds per-ruleset storage for each container type.
2023-02-17 14:19:19 +09:00
9685fb2114 Always return a non-null container for SkinComponentsContainerLookups 2023-02-17 14:19:19 +09:00
4cc6664dc7 Add optional ruleset identifier to SkinComponentsContainerLookup 2023-02-17 14:19:19 +09:00
1a63ca9ece Add xmldoc around SkinComponentsContainerLookup 2023-02-17 14:18:05 +09:00
a84f20bf32 Add triangles to ModSelectColumn 2023-02-17 03:09:32 +03:00
3ee046000e Merge branch 'master' into revert-result-in-playfield 2023-02-16 21:54:29 +01:00
66e9bb2581 Merge branch 'master' into hide-resume-overlay 2023-02-16 21:33:23 +01:00
b8084a15eb Revert ResumeOverlay setter accessibility change 2023-02-16 21:26:01 +01:00
0186062246 Merge branch 'master' into adjust-song-select-background-dim 2023-02-16 20:52:36 +01:00
ad5132ed41 Remove redundant conditional access qualifier
It is impossible for the callback passed to `ApplyToBackground()` to
receive a null reference. See `OsuScreen.ApplyToBackground()` - if the
background to call the callback on were `null`, then an
`InvalidOperationException` would be thrown instead.
2023-02-16 20:47:51 +01:00
cb7df7282b Apply NRT to SerialisedDrawableInfo 2023-02-16 20:01:59 +09:00
394d368f16 Fix song select potentially updating background parameters when not the current screen 2023-02-16 18:45:22 +09:00
affa9507a1 Fix GameplaySampleTriggerSource not considering nested objects when determining the best sample to play 2023-02-16 18:21:33 +09:00
ce9ef3bc3c Always create ResumeOverlay, with UseResumeOverlay flag only affecting whether it is displayed or not 2023-02-16 15:47:20 +09:00
7afdcb9383 Merge branch 'master' into hide-resume-overlay 2023-02-16 15:42:14 +09:00
81dcc105a9 Rename left-over skinnable naming in SerialisedDrawableExtensions 2023-02-16 15:34:41 +09:00