1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 23:37:26 +08:00
Commit Graph

52594 Commits

Author SHA1 Message Date
Salman Ahmed
f7fc456bb1
Merge branch 'master' into reidrect-graceful-exit 2022-06-18 19:37:53 +03:00
Dean Herbert
3105e04839
Merge pull request #18736 from frenzibyte/latency-certifier/hidden-cursor
Refactor `LatencyCursorContainer` to display menu cursor when inactive
2022-06-19 01:19:37 +09:00
Dean Herbert
b2663d9399 Update xmldoc to suggest that GracefullyExit may be overridden 2022-06-19 01:14:48 +09:00
Dean Herbert
3fa8c19acd Merge branch 'master' into latency-certifier/hidden-cursor 2022-06-19 00:31:11 +09:00
Dean Herbert
56abe54fe6 Redirect graceful exiting to standard exit flow
Rather than doing a completely forced exit as we were, this will now
follow a more standard flow with the ability for the user to abort along
the way. This is more in line with how I wanted this to work.

Note that this means a confirmation is now shown. It has been discussed
in the past that this confirmation should only show when there's an
ongoing action implies the user may want to cancel the exit. For now I
think this is fine.

Addresses
https://github.com/ppy/osu/discussions/18399#discussioncomment-2811311
2022-06-18 23:43:46 +09:00
Bartłomiej Dach
cbc218200a
Merge pull request #18708 from smoogipoo/multi-song-select-operation
Block multiplayer operations until beatmap selection completes
2022-06-18 12:42:04 +02:00
Bartłomiej Dach
5917c70127
Merge branch 'master' into multi-song-select-operation 2022-06-18 11:58:13 +02:00
Bartłomiej Dach
9334e7b949
Merge pull request #18703 from frenzibyte/editor-metadata-name-unification
Use unified name for background/track files on editor import
2022-06-18 11:12:03 +02:00
Bartłomiej Dach
f6a3047596
Merge branch 'master' into editor-metadata-name-unification 2022-06-18 10:22:52 +02:00
Dan Balasescu
24c78c24f0
Merge pull request #18754 from peppy/placement-object-use-last-sample-point
Fix new hitobject placements not taking on the existing sample settings
2022-06-18 14:46:00 +09:00
Dan Balasescu
77e7e4ecb2 Fix selection being blocked after early return 2022-06-18 14:28:30 +09:00
Dean Herbert
bd5037fcad Fix new hitobject placements not taking on the existing sample settings
Similar to velocity / difficulty points, a user expectation is that
volume and sample settings will be transferred to newly placed objects
from the most recent one.

Closes https://github.com/ppy/osu/issues/18742.
2022-06-18 13:49:59 +09:00
Dean Herbert
6c0106f1e7
Merge pull request #18752 from frenzibyte/cancel-metronome-on-pause
Cancel previous metronome sound playback on pause
2022-06-18 11:19:18 +09:00
Dean Herbert
f3c9f9a216
Merge pull request #18751 from frenzibyte/tournament-beatmap
Improve tournament beatmap JSON storage using lightweight model
2022-06-18 11:00:26 +09:00
Dean Herbert
fbca7c761d
Merge pull request #18750 from frenzibyte/tournament-player
Improve tournament player JSON storage using lightweight model
2022-06-18 10:52:54 +09:00
Salman Ahmed
8a1d11fefb Cancel previous metronome sound playback on pause 2022-06-18 04:07:21 +03:00
Dan Balasescu
e04df371d1 Merge branch 'master' into multi-song-select-operation 2022-06-18 08:51:24 +09:00
Dan Balasescu
14cdb01fd8 Revert unintended change 2022-06-18 08:49:48 +09:00
Salman Ahmed
4c47996130 TournamentPlayer -> TournamentUser 2022-06-18 02:33:26 +03:00
Salman Ahmed
60903be566 Standardise naming for online ID
Rather than continuing with `ID` or `Id`, this should follow the new
standards and use `OnlineID` instead. Only updating this since it's a
newly introduced class.
2022-06-18 01:48:16 +03:00
Salman Ahmed
9f97d1a7db Replace tournament beatmap storage type with lightweight model 2022-06-18 01:34:09 +03:00
Salman Ahmed
200b23c689 Add lightweight TournamentBeatmap model 2022-06-18 01:30:56 +03:00
Salman Ahmed
b977ce7995 Replace tournament player storage type with lightweight model 2022-06-17 21:35:04 +03:00
Salman Ahmed
f3793c8809 Add lightweight TournamentPlayer model 2022-06-17 21:35:04 +03:00
Dean Herbert
4bc26dbb48
Merge pull request #18743 from smoogipoo/nullable-by-default
Enable NRT by default
2022-06-17 23:18:35 +09:00
Dean Herbert
5d93db1522
Merge pull request #18726 from peppy/disclaimer-stop-handling-after-suspend
Fix `Disclaimer` screen handling user change events after initial display
2022-06-17 18:28:06 +09:00
Dan Balasescu
42c97baa97 Cache bust on more files 2022-06-17 17:55:58 +09:00
Dean Herbert
1900480d51 Inline animation method 2022-06-17 17:06:06 +09:00
Dan Balasescu
869db52540 Tie loading layer to ongoing operation state 2022-06-17 17:05:23 +09:00
Dean Herbert
e51babdb96 Change heart animation flow to be more correct 2022-06-17 17:01:11 +09:00
Dan Balasescu
11bd87045e Add automated commit to git-blame-ignore-revs 2022-06-17 16:49:53 +09:00
Dan Balasescu
fd9902e816 Manual #nullable processing 2022-06-17 16:38:35 +09:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
Dan Balasescu
968640c951 Enable NRT by default 2022-06-17 16:34:09 +09:00
Dan Balasescu
ea191da496
Merge pull request #18728 from peppy/fix-unsafe-sample-playback
Fix unsafe sample playback in `GameplaySampleTriggerSource`
2022-06-17 12:26:46 +09:00
Salman Ahmed
c9a02aafd8
Merge pull request #18739 from bdach/unpin-xamarin-on-ci
Revert Xamarin regression workaround in Android CI build definition
2022-06-17 00:10:19 +03:00
Salman Ahmed
8ee6a49ad9
Merge branch 'master' into unpin-xamarin-on-ci 2022-06-16 23:30:07 +03:00
Bartłomiej Dach
b74bb83176
Merge pull request #18737 from frenzibyte/fix-up-down
Fix toolbar music button handling keys while not hovered
2022-06-16 22:29:35 +02:00
Bartłomiej Dach
6ff6a3f5b3
Rename and document chooserPath 2022-06-16 21:51:31 +02:00
Bartłomiej Dach
6f2f4dda37
Merge branch 'master' into fix-up-down 2022-06-16 21:44:56 +02:00
Bartłomiej Dach
9141a7a907
Revert Xamarin regression workaround in Android CI build definition
This commit is a revert of 53e52d2c4b.
Partially done because the workaround is no longer needed, partially
because macOS images have begun to fail after a new image rollout with
bumped NuGet versions.
2022-06-16 21:03:29 +02:00
Bartłomiej Dach
73ec43338a
Merge pull request #18731 from peppy/database-migration-reliability
Fix database migration potentially hard crashing during backup process without informing the user why
2022-06-16 19:53:05 +02:00
Salman Ahmed
db02cb81c5 Fix file chooser path not opening home directory initially 2022-06-16 20:48:17 +03:00
Salman Ahmed
f7a27b412a Revert "Let latency certifier buttons steal hover from area"
This reverts commit beb0331640.
2022-06-16 20:35:30 +03:00
Salman Ahmed
e4ddf03ad6 Fix toolbar music button handling keys while not hovered 2022-06-16 20:22:57 +03:00
Salman Ahmed
42378dbb88 Improve test coverage to ensure volume is unaffected when mouse is away 2022-06-16 20:22:57 +03:00
Salman Ahmed
8e088140b2 Reword comment since IRequireHighFrequencyMousePosition isn't the issue 2022-06-16 20:09:10 +03:00
Salman Ahmed
beb0331640 Let latency certifier buttons steal hover from area 2022-06-16 20:00:30 +03:00
Salman Ahmed
ed6817ae6a Allow switching between latency and menu cursor using IProvideCursor 2022-06-16 19:46:31 +03:00
Salman Ahmed
52538dc708 Refactor LatencyCursorContainer to become a cursor container 2022-06-16 19:46:04 +03:00