OliBomby
70a925aab1
added extra early-returns
2023-03-04 16:49:33 +01:00
OliBomby
b90c389ff0
using List instead of Span in GetSearchableTerms
2023-03-04 15:42:35 +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
49e298e304
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.
2023-03-04 13:33:21 +01:00
Bartłomiej Dach
2f25fb4083
Move NonSkinnableScreenPlaceholder to outer scope
2023-03-04 13:22:43 +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
tsrk
d5ba5eed88
fix(SkinnableAvatar): init avatar.CornerRadius
2023-03-03 23:47:22 +00:00
tsrk
d39b8c7c23
fix(SkinnableAvatar): update outdated interface
2023-03-03 19:35:45 +00:00
EXtremeExploit
edd37a9a7c
cleanup
2023-03-03 16:16:45 -03:00
EXtremeExploit
e23db62386
Do list group'badges in a nicer way
2023-03-03 16:14:19 -03:00
Ruki
e75aa9138b
Merge branch 'ppy:master' into hud/avatar-thing
2023-03-03 20:03:56 +01:00
OliBomby
91d206e8d2
Optimised GetSearchableTerms
...
Reduced memory allocations to 1
2023-03-03 19:21:50 +01:00
Cootz
322f3e86ba
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name
2023-03-03 20:02:09 +03:00
mk56-spn
3bff415909
Change ResetDialogue text
2023-03-03 15:16:48 +01:00
mk56-spn
2b7111867c
Adjust reversion header text naming.
2023-03-03 15:12:20 +01:00
Dean Herbert
82293c0c86
Don't filter away results with missing data when using "Date Submitted" or "Date Ranked" sort modes
...
From a user's perspective, changing a sort / order mode shouldn't filter
away results, but we were doing this.
In terms of UX expectations, in stable this kind of scenario would
results in a group being added to the end of son select with "Not
ranked" or "Unknown". I think we should aim to match this eventually.
2023-03-03 16:36:18 +09:00
Dean Herbert
dc669835e2
Show count of visible beatmaps at song select
2023-03-03 15:28:51 +09:00
Dean Herbert
6ff1fb6b1a
Adjust sizing to allow for timing point information now being longer than before
2023-03-02 18:57:54 +09:00
Joseph Madamba
af540de69b
Fix "talking with" text overflowing when usernames are too long
2023-03-01 22:10:15 -08:00
Joseph Madamba
bb5791a714
Fix overlay sidebars not scrolling to end due to parent scroll view
2023-03-01 21:41:01 -08:00
Dean Herbert
bd11d5d29a
Merge pull request #22743 from Joehuu/scroll-back-to-previous
...
Add ability to scroll back to previous position after scrolling to top via button on overlays
2023-03-01 22:55:47 +09:00
Andrei Zavatski
31f58a33ac
Use ColourInfo.Interpolate where possible
2023-02-28 18:47:27 +03:00
Dean Herbert
044b0604b2
Move OmitFirstBarLine to TimingControlPoint
2023-02-28 19:29:31 +09:00
Dean Herbert
89e20a7962
Update resources
2023-02-28 14:47:51 +09:00
Dean Herbert
bd1460a8d5
Update framework
2023-02-28 14:32:58 +09: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
Bartłomiej Dach
92edb0f868
Merge branch 'master' into skin-editor-depth-changing
2023-02-27 19:24:53 +01:00
mk56-spn
bf1897a98f
Adjust warning text slightly.
2023-02-27 16:08:14 +01:00
EXtremeExploit
d722e09b2c
oops
2023-02-26 21:05:41 -03:00
EXtremeExploit
2b9d13cfee
Add group badges to list view
2023-02-26 20:58:20 -03:00
Joseph Madamba
fa710ae1b0
Rename ScrollToTopButton to ScrollBackButton
2023-02-26 14:39:34 -08:00
Joseph Madamba
dc00905f8d
Add ability to scroll back to previous position after scrolling to top via button on overlays
2023-02-26 14:38:51 -08:00
mk56-spn
ff0d1aa9f7
Make reverting changes to a given skin into a "dangerous action"
2023-02-26 20:38:50 +01:00
cdwcgt
a705698ab6
beatmapset that already deletePending should not be fetched
2023-02-26 21:13:05 +09:00
Dan Balasescu
a44c9d10d7
Fix buffer not being bound
2023-02-25 02:18:42 +09:00
Dan Balasescu
069b77dd23
Update language version
2023-02-25 02:15:56 +09:00
Dan Balasescu
dd9748a25c
Adjust DrawNodes to use UBOs
2023-02-25 01:42:55 +09:00
Dean Herbert
dc3c1150b8
Set better defaults for SkinBlueprint transforms
2023-02-23 21:10:15 +09:00
Dean Herbert
c48aceb055
Fix undo history not being batched correctly for depth change operations
2023-02-23 20:03:36 +09:00
Bartłomiej Dach
d679703fa2
Merge pull request #22659 from peppy/fix-taiko-drum-nested-sample-detection
...
Fix `GameplaySampleTriggerSource` not considering nested objects when determining the best sample to play
2023-02-22 18:56:59 +01:00
Dean Herbert
a8c692a215
Merge pull request #22635 from peppy/use-overlays-container-more
...
Use `Overlays` container rather than `KeyBindingInputManager` for flashlight
2023-02-22 18:30:21 +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
Bartłomiej Dach
ab97b02235
Remove contradictory remark from xmldoc
2023-02-21 21:05:46 +01:00
Bartłomiej Dach
3d2fcb0cca
Merge branch 'master' into fix-taiko-drum-nested-sample-detection
2023-02-21 20:53:06 +01:00
Bartłomiej Dach
ec1bf7b0b2
Merge branch 'master' into skin-editor-clipboard
2023-02-21 19:35:58 +01:00
Cootz
1fa6864500
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name
2023-02-21 18:47:59 +03:00
Cootz
90aa4288d0
Reduce the allowed length by 5 to account for (99) suffix. Move truncating logic to GetFilename. Update tests.
2023-02-21 18:35:53 +03:00
Dean Herbert
9384687d6d
Switch ModMuted to add its metronome to components rather than overlays
2023-02-21 19:04:06 +09:00
Dean Herbert
1acc536248
Move DrawableRuleset.Audio to a less generic level
2023-02-21 19:03:52 +09: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
5ba6059911
Merge branch 'master' into fix-taiko-drum-nested-sample-detection
2023-02-21 13:58:15 +09:00
Dean Herbert
0d229d959b
Remove unnecessary TriggerChange call
2023-02-21 13:50:19 +09:00
Bartłomiej Dach
6799492596
Merge branch 'master' into skin-editor-layer-select
2023-02-20 21:33:48 +01:00
Bartłomiej Dach
86a7f4dfd0
Do not serialise SkinLayoutInfo.AllDrawables
...
- It is entirely derived from `SkinLayoutInfo.DrawableInfo`, which is
the actual primary thing we want to serialise.
- It will never get read out from any serialised files anyway (corollary
of the previous point - it is a get-only property derived from another).
- It is only used in tests.
All of the three reasons above make serialising the property out to skin
files nothing more than a waste of space.
2023-02-20 20:37:48 +01:00
Bartłomiej Dach
c9999bdeb1
Merge branch 'master' into skin-per-ruleset-layouts
2023-02-20 20:14:38 +01:00
Bartłomiej Dach
43724472c4
Clarify comment to avoid playing pronoun game
2023-02-20 20:09:24 +01:00
Dean Herbert
6382314af1
Merge pull request #22697 from ggliv/tablet-area-drag
...
Allow tablet area to be dragged
2023-02-20 23:37:25 +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
7a585e1fa1
Merge pull request #22669 from EVAST9919/mod-overlay-triangles
...
Add triangles animation to mod select overlay headers
2023-02-20 19:54:21 +09:00
Dean Herbert
ec12186d63
Remove unnecesasry null check on content
2023-02-20 19:53:04 +09:00
Dean Herbert
18700b4daa
Add note about skin migrations being on read and remove an older deprecation notice
2023-02-20 19:51:54 +09:00
Dean Herbert
1629c86b5d
Mark constant identifier as non-localisable
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-02-20 19:48:39 +09:00
Dean Herbert
0ddda018fd
Add xmldoc for SkinComponentsContainerLookup.Ruleset
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-02-20 19:48:18 +09:00
Dean Herbert
5f7a6d13c3
Remove unused GetSerialisableIdentifier for now
2023-02-20 19:47:17 +09:00
Gabe Livengood
c86c1a9029
allow tablet area to be dragged
2023-02-20 00:06:20 -05:00
Bartłomiej Dach
3183f5cee2
Merge branch 'master' into revert-result-in-playfield
2023-02-19 16:33:10 +01:00
Bartłomiej Dach
1ba1298850
Merge branch 'master' into blueprint-improve-visuals
2023-02-19 15:55:30 +01:00
Dean Herbert
d7381b762c
Also tween origin position
2023-02-19 23:52:21 +09:00
Bartłomiej Dach
d9ca7102f0
Use more generic wording for future-proofing
2023-02-19 15:06:40 +01:00
Bartłomiej Dach
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
Maximilian Kruse
723a043c43
naming change from Hitobject to HitObject
2023-02-19 10:18:22 +01:00
Maximilian Kruse
f3522c4162
change bindable seekToHitObject to private
2023-02-19 10:18:02 +01:00
Maximilian Kruse
ddd37bb319
Add setting to disable automatic seeking after object placement
2023-02-18 19:43:45 +01:00
Bartłomiej Dach
ea04c487f2
Merge branch 'master' into blueprint-labels-while-hovering
2023-02-18 15:57:30 +01:00
Cootz
5fa75805cc
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name
2023-02-18 15:52:17 +03:00
Bartłomiej Dach
15d209d17e
Merge branch 'master' into CompletionText-LocalisableString
2023-02-18 13:50:58 +01:00
Bartłomiej Dach
fbea3e312f
Merge branch 'master' into skin-editor-improve-toolbox-hover
2023-02-18 10:02:02 +01:00
Bartłomiej Dach
704dddf14b
Merge branch 'master' into skin-editor-clipboard
2023-02-17 22:59:18 +01:00
Bartłomiej Dach
6b9472c367
Merge branch 'master' into skin-per-ruleset-layouts
2023-02-17 22:58:38 +01:00
Bartłomiej Dach
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
Bartłomiej Dach
b390fdb8cc
Remove unused field
2023-02-17 21:51:19 +01:00
Bartłomiej Dach
8894a73b07
Merge branch 'master' into blueprint-improve-visuals
2023-02-17 21:40:16 +01:00
Andrei Zavatski
ffcca9fd89
Remove awkward width specification
2023-02-17 23:23:58 +03:00
Bartłomiej Dach
6afa65bd3d
Merge branch 'master' into skinnable-clean-up-documentation
2023-02-17 20:59:18 +01:00
Salman Ahmed
449e5fa6f8
Rename one more left-over skinnable naming
2023-02-17 22:09:55 +03:00
cdwcgt
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
Cootz
e3bdb3d852
Align links in one line
2023-02-17 15:32:36 +03:00
Cootz
fd1beaef87
Fix typo
2023-02-17 15:24:27 +03:00
Cootz
a3b440493a
Update xml doc
2023-02-17 15:23:43 +03:00
Andrei Zavatski
51940133df
Adjust width and add comment
2023-02-17 15:18:45 +03:00
Andrei Zavatski
0838fa636f
Make triangles slower
2023-02-17 15:16:00 +03:00
Andrei Zavatski
fa300b5ba0
Merge branch 'master' into mod-overlay-triangles
2023-02-17 15:13:51 +03:00
Cootz
ceed3606cd
Remove redundant comment
...
Co-authored-by: Dean Herbert <pe@ppy.sh>
2023-02-17 13:46:06 +03: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
c03b6cec23
Add IEquatable and ToString support to SkinComponentsContainerLookup
2023-02-17 19:27:16 +09:00
Dean Herbert
a01c3090e4
Fix tests which rely on HUDOverlay's DrawableRuleset being nullable
2023-02-17 19:27:09 +09:00
Dean Herbert
5ed038fbb3
Improve the feel of hovering toolbox component items
2023-02-17 19:26:03 +09:00
Dean Herbert
814080d982
Only show blueprint labels when hovering or selected
2023-02-17 19:23:52 +09:00
Dean Herbert
19d5293ad1
Change early return to also find the earliest nested object
2023-02-17 18:59:31 +09:00
Dean Herbert
209d41ee9d
Use RulesetInfo instead of Ruleset in skin components lookup
2023-02-17 18:24:05 +09:00
Dean Herbert
675e5b81f3
Fix SkinnableLighting showing up as a user placeable component
2023-02-17 18:24:05 +09:00
Dean Herbert
2267aa1ac2
Add ability to retrieve serialisable drawables for specific rulesets
2023-02-17 18:24:05 +09:00
Dean Herbert
ffb99364b9
Ensure skin default component layouts only apply to global layout for now
2023-02-17 18:24:05 +09:00
Dean Herbert
6c61c5f4a8
Fix selection on the edge of blueprints (in the new inflation area) failing
2023-02-17 18:19:46 +09:00
Dean Herbert
16d94b4ea2
Improve visuals of skin blueprint
2023-02-17 18:19:46 +09:00
Dean Herbert
9793774377
Update SkinDeserialisationTest to work with new serialisation structure
2023-02-17 16:22:48 +09:00
Dean Herbert
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
Dean Herbert
9685fb2114
Always return a non-null container for SkinComponentsContainerLookups
2023-02-17 14:19:19 +09:00
Dean Herbert
4cc6664dc7
Add optional ruleset identifier to SkinComponentsContainerLookup
2023-02-17 14:19:19 +09:00
Dean Herbert
1a63ca9ece
Add xmldoc around SkinComponentsContainerLookup
2023-02-17 14:18:05 +09:00
Dean Herbert
8c772a723f
Expose constant publicly rather than reexposing business
2023-02-17 13:34:19 +09:00
Dean Herbert
96b1498932
Rename max length variable to make sense (it's a filename limit, not path)
2023-02-17 13:33:22 +09:00
Andrei Zavatski
a84f20bf32
Add triangles to ModSelectColumn
2023-02-17 03:09:32 +03:00
Cootz
810712386d
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name
2023-02-17 01:51:24 +03:00
Bartłomiej Dach
3ee046000e
Merge branch 'master' into revert-result-in-playfield
2023-02-16 21:54:29 +01:00
Bartłomiej Dach
66e9bb2581
Merge branch 'master' into hide-resume-overlay
2023-02-16 21:33:23 +01:00
Bartłomiej Dach
b8084a15eb
Revert ResumeOverlay setter accessibility change
2023-02-16 21:26:01 +01:00
Bartłomiej Dach
0186062246
Merge branch 'master' into adjust-song-select-background-dim
2023-02-16 20:52:36 +01:00
Bartłomiej Dach
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
Cootz
f1da213bea
Add tests
2023-02-16 16:26:57 +03:00
Dean Herbert
cb7df7282b
Apply NRT to SerialisedDrawableInfo
2023-02-16 20:01:59 +09:00
Cootz
3057ccb635
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name
2023-02-16 13:22:11 +03:00
Dean Herbert
394d368f16
Fix song select potentially updating background parameters when not the current screen
2023-02-16 18:45:22 +09:00
Dean Herbert
affa9507a1
Fix GameplaySampleTriggerSource not considering nested objects when determining the best sample to play
2023-02-16 18:21:33 +09:00
Dean Herbert
ce9ef3bc3c
Always create ResumeOverlay, with UseResumeOverlay flag only affecting whether it is displayed or not
2023-02-16 15:47:20 +09:00
Dean Herbert
7afdcb9383
Merge branch 'master' into hide-resume-overlay
2023-02-16 15:42:14 +09:00
Dean Herbert
81dcc105a9
Rename left-over skinnable naming in SerialisedDrawableExtensions
2023-02-16 15:34:41 +09:00
Dean Herbert
76f7accd13
Standardise all local SkinComponentsContainerLookup variables to containerLookup
2023-02-16 15:33:56 +09:00
Dean Herbert
eea0cd3cf8
Reword xmldoc on ISerialisableDrawable to make less skin-centric
2023-02-16 15:31:35 +09:00
Dean Herbert
0b25f7baeb
Reword and fix typos in some new xmldoc
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-02-16 15:27:30 +09:00
Bartłomiej Dach
c315113fde
Merge branch 'master' into maximum-judgement-offset-in-hit-object
2023-02-16 00:15:51 +01:00
Bartłomiej Dach
768eea1ea8
Merge branch 'master' into skinnable-clean-up-documentation
2023-02-15 21:26:11 +01:00
Bartłomiej Dach
1d5d34ba0e
Merge pull request #22647 from peppy/remove-target-component-container
...
Simplify and rename `SkinnableTargetComponentsContainer`
2023-02-15 21:25:49 +01:00
Cootz
387a6f1330
Move logic to Export method
2023-02-15 22:43:43 +03:00
Cootz
fb06a77e2b
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name
2023-02-15 22:29:38 +03:00
Cootz
1f586c129c
fix applied
2023-02-15 22:15:44 +03: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
08ed174f61
Change GameplaySkinComponentLookup's generic to always be an enum
...
And document the class better.
2023-02-15 18:48:14 +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
