1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-08 03:32:55 +08:00
Commit Graph

71523 Commits

Author SHA1 Message Date
Dean Herbert
5c9e84caf0
Add lock object 2025-02-05 17:31:54 +09:00
Dean Herbert
14273824dc
Fix Carousel.FilterAsync not working when called from a non-update thread
I was trying to be smart about things and make use of our
`SynchronisationContext` setup, but it turns out to not work in all
cases due to the context being missing depending on where you are
calling the method from.

For now let's prefer the "works everywhere" method of scheduling the
final work back to update.
2025-02-05 16:40:11 +09:00
Dean Herbert
8c5b19d4f8
Merge pull request #31780 from necocat0918/pr
Added warning before bookmark reset
2025-02-05 16:02:44 +09:00
NecoDev
13fa49d5b5
Merge branch 'master' into pr 2025-02-05 14:53:20 +08:00
NecoDev
db7b665f4d Removed unused using
For https://github.com/ppy/osu/pull/31780
2025-02-05 13:31:57 +08:00
Dean Herbert
20c4badbba
Merge pull request #31795 from peppy/update-framework
Update framework
2025-02-04 23:53:55 +09:00
Dean Herbert
15ed029dd1
Merge pull request #31260 from smoogipoo/multiplayer-free-style
Add support for "freestyle" in multiplayer
2025-02-04 22:40:38 +09:00
Dean Herbert
87ff8778c6
Merge pull request #31791 from bdach/unify-selection-behaviour
Always select the closest control point group regardless of whether it has a timing point on entering timing screen
2025-02-04 22:32:22 +09:00
Dean Herbert
386fb55392
Update framework 2025-02-04 21:48:45 +09:00
Dean Herbert
a93dabd33f
Merge branch 'master' into multiplayer-free-style 2025-02-04 21:48:39 +09:00
Dean Herbert
82ccce8099
Merge pull request #31783 from bdach/bss/form-button
Implement "form button" control
2025-02-04 21:45:11 +09:00
Bartłomiej Dach
c5c1861d4b
Merge pull request #31787 from peppy/carousel-v2-expanded-state
Add expanded state tracking to beatmap carousel v2
2025-02-04 13:07:21 +01:00
Bartłomiej Dach
2dbf30a096
Select timing point on enter if no effect point is active at the time
Noticed during testing.
2025-02-04 12:44:05 +01:00
Bartłomiej Dach
a0b6610054
Always select the closest control point group regardless of whether it has a timing point 2025-02-04 12:35:02 +01:00
Bartłomiej Dach
7402f3e508
Merge branch 'master' into bss/form-button 2025-02-04 12:29:22 +01:00
Bartłomiej Dach
07ab5a5ace
Merge branch 'master' into carousel-v2-expanded-state 2025-02-04 12:07:23 +01:00
Bartłomiej Dach
95a1b0e7cb
Merge pull request #31785 from peppy/fix-carousel-tests
Fix carousel tests failing due to dependency on depth ordering
2025-02-04 12:06:57 +01:00
Dean Herbert
6c6063464a
Remove Scheduler.AddOnce from updateSpecifics
To keep things simple, let's not bother debouncing this. The debouncing
was causing spectating handling to fail because of two interdependent
components binding to `BeatmapAvailability`:

Binding to update the screen's `Beatmap` after a download completes:

5874706117/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs (L266-L267)

Binding to attempt a load request:

8bb7bea04e/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs (L67)

The first must update the beatmap before the second runs, else gameplay
will not load due to `Beatmap.IsDefault`.
2025-02-04 18:41:28 +09:00
Dean Herbert
599b59cb14
Add expanded state to sample drawable representations 2025-02-04 18:06:16 +09:00
Dean Herbert
58560f8acf
Add tracking of expansion states for groups and sets 2025-02-04 17:51:51 +09:00
Dean Herbert
ccdb6e4c48
Fix carousel tests failing due to dependency on depth ordering 2025-02-04 17:50:16 +09:00
Dean Herbert
2f2dc158e0
Ensure test step doesn't consider pooled instances of drawables 2025-02-04 17:45:02 +09:00
Bartłomiej Dach
3893303988
Implement "form button" control 2025-02-04 09:05:33 +01:00
Bartłomiej Dach
6e59cab928
Merge pull request #31764 from peppy/beatmap-carousel-v2-grouping
Add group support to beatmap carousel v2
2025-02-04 08:13:54 +01:00
Dean Herbert
1e1fb5476e
Merge pull request #31734 from bdach/simplify-slider-encoding-logic
Fix multi-segment-type sliders getting mangled on legacy export
2025-02-04 15:08:44 +09:00
Dean Herbert
ec88c5ed75
Merge pull request #31776 from frenzibyte/carousel-v2-depth-ordering
Fix depth ordering in new carousel not being relative to selected item
2025-02-04 13:02:21 +09:00
Dean Herbert
e454fa558c
Adjust group traversal logic to handle cases where keyboard selection redirects 2025-02-04 02:55:59 +09:00
Dean Herbert
b5c4e3bc14
Add failing tests for traversal on group headers 2025-02-04 02:55:34 +09:00
Dean Herbert
b433eef138
Remove redundant conditional check 2025-02-04 02:41:39 +09:00
Dean Herbert
c7780c9fdc
Refactor how grouping is performed 2025-02-03 20:40:52 +09:00
Bartłomiej Dach
1793b8ccb4
Merge pull request #31775 from peppy/avoid-beatmap-access-beat-sync-container
Avoid accessing `WorkingBeatmap.Beatmap` every update call
2025-02-03 12:24:05 +01:00
Bartłomiej Dach
b60a8341e4
Merge pull request #31778 from peppy/editor-menu-mutual-exclusive
Make distance snap settings mutually exclusive
2025-02-03 11:58:34 +01:00
Dean Herbert
99192404f1
Tidy up WorkingBeatmap passing in ctor 2025-02-03 19:26:14 +09:00
Dean Herbert
8bb7bea04e
Rename freestyle select screen classes for better discoverability 2025-02-03 19:21:21 +09:00
Dean Herbert
37abb1a21b
Tidy up button construction code 2025-02-03 19:09:58 +09:00
Dean Herbert
444e0970d6
Standardise naming to use "Freestyle" not "FreeStyle" 2025-02-03 19:01:59 +09:00
Dean Herbert
56000ddb37
Merge pull request #31743 from bdach/fix-limit-distance-snap-to-current
Avoid moving already placed objects temporally when "limit distance snap to current time" is active
2025-02-03 17:48:24 +09:00
NecoDev
55f46e3b66 Added warning 2025-02-03 16:47:38 +08:00
Dean Herbert
26a8fb6984
Make distance snap settings mutually exclusive 2025-02-03 17:34:55 +09:00
Bartłomiej Dach
ee7d281e73
Merge branch 'master' into fix-limit-distance-snap-to-current 2025-02-03 08:57:27 +01:00
Dean Herbert
5668a90781
Merge pull request #31737 from bdach/fix-post-refactor
Fix distance snap time part ceasing to work when grid snap is also active
2025-02-03 16:56:28 +09:00
Dean Herbert
b9f840c32e
Merge pull request #31742 from smoogipoo/fix-results-persistent-sounds
Fix results screen sounds persisting after exit
2025-02-03 16:39:47 +09:00
Salman Alshamrani
c587958f38 Apply depth ordering relative to selected item 2025-02-03 02:34:29 -05:00
Dean Herbert
a23de0b188
Avoid accessing WorkingBeatmap.Beatmap every update call
Notice in passing.

Comes with overheads that can be easily avoided. Left a note for a
future (slightly more involved) optimisation.
2025-02-03 16:30:31 +09:00
Dan Balasescu
9033a4d480
Remove unused using 2025-02-03 14:20:56 +09:00
Dan Balasescu
210fa14759
Play sound via results screen instead 2025-02-03 14:15:46 +09:00
Dean Herbert
6a18d18feb
Fix null handling when no items are populated but a selection is made 2025-02-03 02:39:45 +09:00
Dean Herbert
9c34819ff4
Add test coverage for grouped selection 2025-02-03 02:39:45 +09:00
Dean Herbert
645c26ca19
Simplify keyboard traversal logic 2025-02-03 02:24:27 +09:00
Dean Herbert
d74939e6e9
Fix backwards traversal of groupings and allow toggling groups without updating selection 2025-02-03 02:24:27 +09:00