cdwcgt
85a924f078
why
...
merge problem?
2023-03-23 01:02:17 +09:00
cdwcgt
8518d15b8d
use endpoint
2023-03-23 01:00:38 +09:00
Dean Herbert
3050a16bf8
Don't require a restart when selecting Automatic
and startup setting was also automatic
2023-03-22 16:56:36 +09:00
Dean Herbert
aabe86dc26
Limit renderers to those available for the current platform
2023-03-22 16:49:29 +09:00
Dean Herbert
956fabb445
Show restart notice when changing renderer
2023-03-22 16:49:29 +09:00
Dean Herbert
13be709718
Add basic renderer selection
2023-03-22 16:49:29 +09:00
Dean Herbert
ad5bdf6511
Merge branch 'master' into fix-ubo-not-bound
2023-03-22 16:46:39 +09:00
Dean Herbert
9bc6b46e4e
Update framework
2023-03-22 16:36:05 +09:00
Dean Herbert
db227b1798
Merge branch 'master' into chat-report
2023-03-22 16:26:28 +09:00
Joseph Madamba
6f3bb85eaa
Always show down arrow on inactive sort buttons
2023-03-22 00:19:23 -07:00
Dean Herbert
425be20e46
Fix song select search textbox font size incorrectly having increased
2023-03-22 14:17:39 +09:00
Joseph Madamba
d9571b6fc9
Move filter control property setters to load()
2023-03-21 21:31:35 -07:00
Joseph Madamba
74a15d7424
Fix overlay headers being blocked by loading layer
2023-03-21 20:32:26 -07:00
Joseph Madamba
e1fb63e1f3
Move beatmap listing filter control to header
2023-03-21 20:32:26 -07:00
Terochi
1478a26cc0
Addressed changes
2023-03-21 23:15:49 +01:00
Joseph Madamba
3cd01ee621
Fix beatmap listing sort direction not resetting when changing criteria
2023-03-21 15:08:37 -07:00
Joseph Madamba
df3ccdff9f
Add failing beatmap listing sort direction on criteria change test
2023-03-21 15:08:37 -07:00
Bartłomiej Dach
9ff9cd3b7f
Merge branch 'master' into skin-editor-cyclic-selection
2023-03-21 19:49:55 +01:00
Dean Herbert
e31a90e043
Don't cycle selection when more than one items are selected
2023-03-21 21:31:10 +09:00
Dean Herbert
5cb8160eee
Merge pull request #22773 from peppy/show-song-select-visible-beatmap-count
...
Show count of visible beatmaps at song select
2023-03-21 18:22:29 +09:00
Bartłomiej Dach
ea8da69263
Fix importing beatmaps not changing count of visible beatmaps
...
Reproduction steps:
1. Go to song select
2. Open beatmap listing
3. Import a beatmap that would fit the current filter criteria
4. The count of visible beatmaps does not change
Fixed by updating the count on `BeatmapSetsChanged` too.
2023-03-20 20:53:53 +01:00
Bartłomiej Dach
695ee39b87
Privatise setter
2023-03-20 20:30:54 +01:00
Dean Herbert
bec28cc7f1
Merge pull request #22883 from smoogipoo/fix-logo-animation
...
Use custom vertex shader for logo animation
2023-03-20 16:36:43 +09:00
Dean Herbert
8557589a35
Update resources
2023-03-20 15:28:13 +09:00
Joseph Madamba
970df5d88a
Update profile kudosu section in line with web
2023-03-18 19:49:30 -07:00
Dan Balasescu
c08513d590
Actually use custom vertex action
2023-03-17 20:47:11 +09:00
Dan Balasescu
bcd24873d6
Use custom vertex type
2023-03-17 20:37:05 +09:00
Dean Herbert
8bdb89d05d
Update resources
2023-03-17 19:12:43 +09:00
Dan Balasescu
1c3b60b9e6
Use custom vertex shader for logo animation
2023-03-16 23:56:41 +09:00
Salman Ahmed
678e8ed736
Update UBO usages inline with framework changes
2023-03-16 14:06:35 +03:00
Cootz
54f864463c
Merge branch 'master' into BitmapUpdatesOnScore
2023-03-16 13:54:47 +03:00
Dean Herbert
cb9b14b30f
Revert "Merge pull request #22741 from cdwcgt/do-not-fetch-deletePending"
...
This reverts commit 15c44a2817
, reversing
changes made to de2ab05e78
.
2023-03-16 19:48:36 +09:00
Cootz
556964eae0
Merge branch 'master' into BitmapUpdatesOnScore
2023-03-16 12:16:42 +03:00
Dean Herbert
3b62f87b64
Ensure Player
does not fail a score on exit if a replay is currently loaded
2023-03-16 17:14:20 +09:00
Dean Herbert
15c44a2817
Merge pull request #22741 from cdwcgt/do-not-fetch-deletePending
...
Don't fetch `beatmapset` that already `PendingDelete` when import score
2023-03-16 16:37:18 +09:00
Dean Herbert
cd102da3af
Move matches string inside text box
2023-03-16 16:34:31 +09:00
Dean Herbert
8e6a4559e3
Add xmldoc for new method and reorder methods in SkinReloadableDrawable
2023-03-16 15:58:42 +09:00
Dean Herbert
297e7d6542
Fix Flush
call being run too late in PoolableSkinnableSample
2023-03-16 15:33:30 +09:00
Dean Herbert
89b42ddd98
Don't localise beatmap count string for now
2023-03-16 15:02:38 +09:00
Dean Herbert
7b34607676
Merge branch 'master' into bubble_mod_implementation_clean
2023-03-16 13:45:22 +09:00
Terochi
edc6314634
Drank some coffee and figured out the fix
2023-03-15 10:49:59 +01:00
Dean Herbert
5f9b13a775
Rename Add
/AddRange
methods as they are no longer conflicting with Container
2023-03-15 18:02:41 +09:00
Dean Herbert
9e444af380
Use object initialisers and fix order of initialisation vs add
2023-03-15 18:02:26 +09:00
Terochi
b0f1a69523
Update the pauseLoop sample instantly on skin change
2023-03-15 09:05:34 +01:00
Terochi
a9c349fa6d
Cache any skin changes in SkinReloadableDrawable
to ScheduledDelegate
2023-03-15 09:03:29 +01:00
Dean Herbert
de2ab05e78
Merge pull request #22765 from Joehuu/fix-overlay-sidebar-scroll
...
Fix overlay sidebars not scrolling to end due to parent scroll view
2023-03-15 16:52:59 +09:00
Dean Herbert
0a19b1e9cf
Merge pull request #22860 from rozukke/fix-skin-ini-import
...
Fix import of skins with non-ASCII names that have been previously exported by lazer
2023-03-15 15:36:51 +09:00
Dean Herbert
f8e773ab8e
Merge branch 'master' into fix-overlay-sidebar-scroll
2023-03-15 15:30:50 +09:00
Dean Herbert
1cf870d956
Add test coverage and fix fail case where a drag selection ends incorrectly with cyclic selection
2023-03-15 15:16:48 +09:00
Terochi
390ad335d0
Reloading samples before playing then when skin change occurs
2023-03-14 21:35:52 +01:00
Terochi
1d5e596615
Update FailAnimation
to use SkinnableSound
2023-03-14 20:44:30 +01:00
Dean Herbert
f91af8fa64
Merge pull request #22750 from smoogipoo/veldrid-renderer
...
Update graphic code in line with framework renderer changes
2023-03-15 00:29:54 +09:00
Dean Herbert
6546f5968a
Merge branch 'master' into skin-editor-cyclic-selection
2023-03-14 20:43:56 +09:00
Dean Herbert
b46fc14e56
Merge pull request #22848 from Rovearix/Fix-Dragging-Preventing-Beatmap-Loading
...
Prevent LoadingLayer from blocking loading
2023-03-14 20:42:10 +09:00
Dean Herbert
d65d09e45f
Change field to const
2023-03-14 20:24:39 +09:00
Dean Herbert
8fd07b51f7
Merge pull request #22842 from LumpBloom7/Fix-argon-progress-bar-oversized-fill
...
Fix argon progress bar fill being oversized
2023-03-14 18:46:25 +09:00
Dean Herbert
4cea29402b
Don't show epilepsy warning when storyboards are disabled
...
I have more thoughts on this warning in general (which will likely see
it removed or moved in the future) but this seems like a quick QOL fix
for now.
As mentioned in https://github.com/ppy/osu/discussions/22861 .
2023-03-14 18:32:26 +09:00
Dean Herbert
0b23809585
Update resources
2023-03-14 17:52:17 +09:00
Dean Herbert
48d11610b3
Update framework
2023-03-14 17:44:51 +09:00
Dean Herbert
969c0e9c9d
Merge branch 'master' into veldrid-renderer
2023-03-14 17:35:38 +09:00
Rovearix
9ac9287dbd
Switched the implementation to set the blockInput flag for the BeatmapMetadataDisplay's LoadingLayer. This prevents the UIEvents from being being handled in this case without modifying the class
2023-03-13 08:07:55 -04:00
Rovearix
ba728bdab1
Changed the event to be the more correct one to block
2023-03-13 07:49:51 -04:00
rozukke
1f7721786b
Perform check to account for non-ASCII characters
2023-03-13 22:01:26 +11:00
Dean Herbert
da947d8661
Gracefully handle beatmaps specifying images using the video storyboard type
2023-03-13 18:24:16 +09:00
Dean Herbert
eb37d740b1
Update supported video filetypes to match osu-stable
2023-03-13 18:24:16 +09:00
Rovearix
c1618a7a16
Prevent elements that are anchored in the center from blocking loading
2023-03-12 10:57:53 -04:00
Joseph Madamba
6e5b1280b7
Fix multiple notice boxes having no spacing
2023-03-11 21:36:29 -08:00
Joseph Madamba
ea88aee41f
Display stub notice in marked wiki articles
2023-03-11 21:36:28 -08:00
Joseph Madamba
0cf69a1084
Make yaml line strings verbatim
2023-03-11 21:36:23 -08:00
Derrick Timmermans
febdca4547
Fix argon progress bar fill being oversized
2023-03-12 02:08:00 +01:00
Dan Balasescu
e327993d11
Merge pull request #22527 from Terochi/replay-length-extension
...
Replay recording extension until results screen transition
2023-03-11 15:41:32 +09:00
tsrk
d806b85a30
revert: make counters
an IEnumerable
again
...
As suggested by bdach as this would make the last two commits useless
Refs: 5d15426
2023-03-09 10:25:03 +00:00
Dean Herbert
d95bcb10cc
Merge pull request #22744 from EXtremeExploit/groups-badges-list
...
Add group badges to list view
2023-03-09 15:45:46 +09:00
Bartłomiej Dach
ab87f5e0c9
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name
2023-03-08 22:37:09 +01:00
EXtremeExploit
686259a33c
Make support badge in list match groups
2023-03-08 13:57:20 -03:00
Dean Herbert
4f7be332f3
Revert isDraggingBlueprint
to field
2023-03-08 19:24:03 +09:00
Dean Herbert
245c3c025c
Refactor endClickSelection
to reduce nesting
2023-03-08 19:23:32 +09:00
tsrk
5d15426c27
refactor: make Counters
return a Container
2023-03-08 01:52:12 +00:00
tsrk
5b0db94a24
docs: add XMLDoc for methods in KCD
2023-03-08 00:58:54 +00:00
tsrk
44297a7d0a
refactor: make KCD a CompositeDrawable
2023-03-08 00:47:16 +00:00
Bartłomiej Dach
72695f7c90
Merge branch 'master' into omit-barline-in-timing-control-point
2023-03-07 22:46:24 +01:00
Bartłomiej Dach
6c5ccdfd90
Merge branch 'master' into optimise-search
2023-03-07 22:07:29 +01:00
Bartłomiej Dach
12af002c4d
Reorder and add xmldoc to KeyCounter
members
2023-03-07 21:28:42 +01:00
Bartłomiej Dach
98f40b2679
Improve documentation of InputTrigger
2023-03-07 21:22:59 +01:00
Bartłomiej Dach
5213bfa5c9
Merge branch 'master' into make_skin_reset_dangerous
2023-03-07 21:06:44 +01:00
Bartłomiej Dach
cfafa8af8c
Merge branch 'master' into hud/player-components
2023-03-07 19:44:12 +01:00
Bartłomiej Dach
7ade525eef
Display corner radius setting as percentage
2023-03-07 19:43:52 +01:00
Cootz
5d41d343fd
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name
2023-03-07 15:46:52 +03:00
Cootz
7107834b9e
Fix truncating bug
2023-03-07 15:43:03 +03:00
Cootz
5191204569
Bring truncating logic back to Export
method
2023-03-07 15:39:43 +03: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
Dean Herbert
55467fcbe3
Update xmldoc for DangerousActionDialog
to match new behaviour
2023-03-07 18:07:46 +09:00
Dean Herbert
dc2945f4f8
Move avatar user loading to BDL also
2023-03-07 17:39:21 +09:00
Dean Herbert
5af41bb1c8
Move filter matching code into own method to simplify early returns
2023-03-07 17:24:17 +09:00
Dean Herbert
5e90b67be0
Move GameplayState
usage to BDL
2023-03-07 17:01:29 +09:00
Dean Herbert
d98199961b
Adjust default sizing to fit a bit better with existing elements
2023-03-07 17:00:10 +09:00
Dean Herbert
f7f1dff647
Fix incorrect case of localisable string for "corner radius"
2023-03-07 16:45:33 +09:00
Dean Herbert
6a7c4d0bf7
Remove NRT
disables in new classes
2023-03-07 16:41:39 +09:00
Dean Herbert
97ba236eb1
Add basic xmldoc to KeyCounter
classes
2023-03-07 16:41:39 +09:00
Dean Herbert
28520414aa
Move KeyCounter
components to HUD
namespace
2023-03-07 16:41:39 +09:00
Dean Herbert
15d65059b5
Tidy up Add
method logic
2023-03-07 16:21:57 +09:00
Dean Herbert
8f6df5ea0f
Merge branch 'master' into gameplay/key-counter-abstraction
2023-03-07 16:09:45 +09:00
Dean Herbert
2cce785fa5
Fix storyboard videos not fading out on completion
...
Closes https://github.com/ppy/osu/issues/22802 .
Stable uses a 1,000 ms fade-in / out. Rather than matching that, I've
stuck with 500ms (what lazer was already using for the fade-in) because
I think it feels better.
Tested using the beatmap linked in the issue thread.
2023-03-07 15:54:35 +09:00
Dean Herbert
21bdbb20e6
Add optional support for cyclic selection to BlueprintContainer
2023-03-07 14:22:12 +09:00
tsrk
fc0e27fb15
style: use normalised CornerRadius
values
2023-03-06 20:11:52 +00:00
tsrk
952814604e
style: fix late night oopsies
2023-03-06 20:06:56 +00:00
Bartłomiej Dach
ec15e2b9cc
Merge branch 'master' into dont-filter-results-on-sort-mode
2023-03-06 17:57:47 +01:00
OliBomby
1fcf41379d
Added maintainability patch by bdach
2023-03-06 16:20:36 +01:00
tsrk
3a240aaa5f
style: use 64 radius
2023-03-06 10:27:59 +00:00
Dean Herbert
87d0bef313
Use nullable comparison helper method instead of manual implementation
2023-03-06 15:16:32 +09:00
tsrk
07bde4990d
feat: implement PlayerAvatar
2023-03-05 23:17:39 +00:00
tsrk
20a610ea6c
style: a NRT pass on UpdateableFlag
2023-03-05 23:15:58 +00:00
tsrk
654eacd449
feat(l10n): localise CornerRadius
2023-03-05 23:10:42 +00:00
tsrk
082bfe3621
refactor: SkinnableAvatar
to PlayerAvatar
2023-03-05 23:09:02 +00: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
OliBomby
b0cd801405
fix code quality
2023-03-04 19:34:22 +01:00
OliBomby
5146f7c978
using array again in GetSearchableTerms
2023-03-04 16:49:46 +01:00
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
tsrk
8c94b77de1
refactor(InputTrigger): move out of KCD
...
I love JetBrains Rider.
2023-02-22 15:05:07 +00:00
tsrk
1beec71037
refactor(KeyCounterDisplay): apply suggestions
...
I also took the freedom to add type checking, as we can't limit the
usage of `Add()` since it's a Container. The exception thrown also
advises of using the suggested `AddTrigger()` instead.
2023-02-22 14:58:27 +00: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
tsrk
42a5a06b9d
style(KeyCounter): fields and methods visiblity
2023-02-21 19:10:37 +00:00
tsrk
5bec2d7c52
style(KeyCounter): forwardPlayback
2023-02-21 19:02:56 +00: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
MK56
b74c1c8334
Merge branch 'master' into bubble_mod_implementation_clean
2023-02-19 21:36:59 +01: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
tsrk
8830e06588
fix: compilation
2023-02-17 09:17:11 +00:00
tsrk
c94e647e21
style(KeyCounterDisplay): remove type check
2023-02-17 09:09:56 +00: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 SkinComponentsContainerLookup
s
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 public
ly 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
tsrk
d0e8d65766
style(KeyCounter): rename IsLit
to IsActive
2023-02-17 00:56:17 +00:00
Andrei Zavatski
a84f20bf32
Add triangles to ModSelectColumn
2023-02-17 03:09:32 +03:00
tsrk
e3ca751027
refactor: make FillFlowContainer
read-only
2023-02-16 23:17:47 +00:00
tsrk
c61fac578c
style(KeyCounter): rename methods and arguments
...
As for the second suggestion in
https://github.com/ppy/osu/pull/22654#discussion_r1109047998 ,
I went with the first one as only one Trigger actually uses this
argument for rewinding.
2023-02-16 23:15:03 +00:00
Cootz
810712386d
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name
2023-02-17 01:51:24 +03:00
tsrk
ddd6c1a1c6
refactor(KeyCounter): address bindables issues
...
`IsCounting` is back being an auto-property.
`countPresses` is now encapsulated and being exposed as an
`IBindable<int>` via `CountPresses`
2023-02-16 22:20:34 +00:00
tsrk
6340730427
refactor(KeyCounter): remove circularity
2023-02-16 21:59:39 +00: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
tsrk
74e7cc2056
feat: implement new design of key counter
2023-02-15 22:18:02 +00:00
tsrk
e9dcc257b4
reafactor: simplify type checking
2023-02-15 22:06:35 +00:00
tsrk
b0a2e69f95
style: nullable pass on KeyCounterDisplay
2023-02-15 22:06:10 +00:00
tsrk
076eb81b21
refactor: rename trigger classes
...
Makes it better to understand their purpose
2023-02-15 21:46:13 +00:00
tsrk
a644fae364
style(KeyCounter): rename (Un)lit
methods to (Un)light
2023-02-15 21:41:41 +00:00
tsrk
df0633858c
fix(KeyCounter): don't override Handle
...
This caused the Keyboard inputs to register twice, which is not what we
want.
2023-02-15 21:41:41 +00:00
tsrk
157bba7830
refactor: rename Trigger
class to InputTrigger
2023-02-15 21:41:36 +00: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
Dean Herbert
b1cf6d83d8
Move extension methods closer to serialisation classes
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
8cb5a51aa7
Add further documentation to skin classes
2023-02-15 18:23:19 +09:00
Dean Herbert
856efd9fd9
Rename SkinnableDrawableInfo
to SerialisedDrawableInfo
2023-02-15 18:23:19 +09:00
Dean Herbert
9e651a7ca2
Rename SkinnableInfo
to SkinnableDrawableInfo
2023-02-15 18:23:17 +09:00
Dean Herbert
6010dde86e
Move SkinnableInfo
to better namespace
2023-02-15 18:23:10 +09:00
Dean Herbert
8bbd00822c
Simplify and rename SkinnableTargetComponentsContainer
2023-02-15 17:30:21 +09:00
Dean Herbert
e71dfd7555
Fix skin export failing if a directory exists with the proposed filename
2023-02-15 16:11:16 +09:00
Dean Herbert
da8ab7143b
Merge branch 'master' into maximum-judgement-offset-in-hit-object
2023-02-15 14:48:15 +09:00
Dean Herbert
9ed068c1e6
Only apply dim changes when background blur is disabled
2023-02-15 14:16:34 +09:00
Dean Herbert
19e3c5d33c
Adjust song select background dimming to be more evenly applied
2023-02-15 13:59:24 +09:00