1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-19 03:33:20 +08:00
Commit Graph

12054 Commits

Author SHA1 Message Date
Dean Herbert
9b1d94b5be
Merge branch 'master' into skinnable-mod-display 2024-12-20 21:27:31 +09:00
Bartłomiej Dach
e62b329d4a
Merge pull request #31143 from peppy/no-pause-cooldown-break-intro
Skip the pause cooldown when in intro / break time
2024-12-20 12:29:46 +01:00
Bartłomiej Dach
3ec63d00cb
Silence test that apparently can't work on CI 2024-12-20 11:20:32 +01:00
Bartłomiej Dach
767be9d0d6
Merge pull request #31146 from peppy/global-volume-scroll-better-maybe
Move "global" scroll-adjusts-volume to a per-screen component-based implementation
2024-12-20 11:04:57 +01:00
Dean Herbert
5d17014698
Fix mouse wheel disable not working during gameplay 2024-12-20 16:31:06 +09:00
Dean Herbert
55dff1f0ef
Merge branch 'master' into skinnable-mod-display 2024-12-20 14:08:51 +09:00
Dean Herbert
f9939e7f95
Remove invalid test 2024-12-20 00:50:53 +09:00
Bartłomiej Dach
68a5618e81
Add test coverage 2024-12-16 16:03:26 +09:00
Dean Herbert
bdd417c1a1
Move "global" scroll-adjusts-volume to a per-screen component-based implementation 2024-12-16 15:21:07 +09:00
Dean Herbert
64555debc2
Fix adjusting control point offset after undo/redo causing catastrophic failure
Closes https://github.com/ppy/osu/issues/31098.

Low effort fix because it was already half broken. The test was testing
in isolation but in actual editor usage it wasn't working as expected.
2024-12-13 19:33:51 +09:00
Dan Balasescu
f84c67babd
Merge pull request #31101 from Joehuu/recommended-diff-beatmap-listing
Add recommended difficulty numerical value near filter in beatmap listing
2024-12-13 18:57:16 +09:00
Dan Balasescu
e2af8820de
Merge pull request #31107 from bdach/flaky-editor-test
Attempt to fix flaky editor beatmap creation test
2024-12-13 18:53:43 +09:00
Dan Balasescu
edbaaa9468
Fix test 2024-12-13 17:41:55 +09:00
Bartłomiej Dach
fdc41ace7e
Fix flaky editor beatmap creation test
As seen in
https://github.com/ppy/osu/actions/runs/12289146465/job/34294167417#step:5:1588
or
https://github.com/ppy/osu/actions/runs/12310133160/job/34358241666#step:5:53.

Exception messages hint pretty strongly at this being a threading issue
and there does seem to be a rather frivolous lack of waiting for
`CreateNewDifficulty()` to do its thing, so I'm thinking maybe this will
help.
2024-12-13 17:35:41 +09:00
Dean Herbert
b470e30cc0
Add failing test showing player settings appearing in skin editor 2024-12-13 17:18:34 +09:00
Joseph Madamba
f7364de01a
Add test and null protections 2024-12-12 15:23:00 -08:00
Bartłomiej Dach
88241d5b95
Merge pull request #30838 from smoogipoo/better-room-status
Improve multiplayer room status handling
2024-12-12 13:05:59 +09:00
Dean Herbert
862b41c38e
Move BeatmapInfoWedgeV2 to correct namespace 2024-12-12 12:53:05 +09:00
Dean Herbert
a3998fbd52
Merge branch 'master' into better-room-status 2024-12-11 18:06:55 +09:00
Dean Herbert
a868c33380
Remove BeatmapCarousel testing backdoor 2024-12-11 16:28:51 +09:00
Dean Herbert
c94b393e30
Access beatmap store via abstract base class
The intention here is to make things more testable going forward.
Specifically, to remove the "back-door" entrance into `BeatmapCarousel`
where `BeatmapSets` can be set by tests and bypas/block realm retrieval.
2024-12-11 16:28:51 +09:00
Bartłomiej Dach
89e3c551ff
Merge pull request #30860 from frenzibyte/editor-multiple-background-audio-files
Allow choosing different background/audio files for individual difficulties
2024-12-11 14:12:58 +09:00
Dean Herbert
48bf2fa001
Merge pull request #30960 from bdach/bookmarks
Implement basic bookmark support in editor
2024-12-09 23:42:04 -08:00
Dean Herbert
7ec2d91e14
Merge branch 'master' into editor-multiple-background-audio-files 2024-12-10 14:19:55 +09:00
Dan Balasescu
1b8d9370aa
Merge pull request #30973 from frenzibyte/copy-effect-points
Preserve effect point specifications when creating blank difficulties
2024-12-09 16:13:52 +09:00
Bartłomiej Dach
459533aba6
Merge branch 'master' into bookmarks 2024-12-07 22:22:04 +09:00
Dean Herbert
2713ae601a
Remove unused using 2024-12-07 14:41:30 +09:00
Bartłomiej Dach
13759f5aa0
Back out test change
It was mostly a demonstrative thing to use in the heat in the moment for
the skinnable mod display and it breaks all other tests. So let's just
not.
2024-12-07 13:47:09 +09:00
Thomas Müller
db18492fbc Update default osk for skinnable mod display 2024-12-07 13:12:09 +09:00
Thomas Müller
0a00f7a7c2 Implement skinnable mod display
Also makes the mod display initialization sequence (start expanded, then
unexpand) controlled by HUDOverlay rather than mod display itself. This
enabled different treatment depending on whether the mod display is
viewed in the skin editor or in the player.

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2024-12-07 12:06:33 +09:00
Dean Herbert
e22f3b7d05
Merge branch 'master' into named-pipe 2024-12-07 10:42:55 +09:00
Dean Herbert
5849a69a86
Merge pull request #30921 from huoyaoyuan/netcore-analyzer
Set up-to-date .NET code quality analyzers
2024-12-06 17:29:09 -08:00
Dean Herbert
8d0e1f9d18
Merge branch 'master' into improve-menu-sample-playback 2024-12-05 21:07:03 +09:00
Huo Yaoyuan
d92ea910cf Merge branch 'master' into netcore-analyzer 2024-12-05 17:18:56 +08:00
Dean Herbert
791416c8f1
Merge pull request #30937 from frenzibyte/fix-quick-restart-not-saving-score
Fix score no longer being saved when quick-restarting after pass
2024-12-04 23:48:18 -08:00
Salman Alshamrani
8e0f6fc12d Re-encode difficulties on resource change 2024-12-04 04:36:00 -05:00
Salman Alshamrani
60d91bada8 Merge branch 'master' into editor-multiple-background-audio-files 2024-12-04 04:31:15 -05:00
Salman Alshamrani
06824c1658 Add failing test case 2024-12-04 04:20:09 -05:00
Salman Alshamrani
2a6fbb59ff Add failing test case 2024-12-04 02:32:00 -05:00
Bartłomiej Dach
808934581f
Move bookmarks out of BeatmapInfo
Not sure why I didn't do that in https://github.com/ppy/osu/pull/28473...
2024-12-03 14:17:14 +01:00
Dean Herbert
75781e3436
Update usages of IPC in line with framework changes 2024-12-03 16:34:23 +09:00
Dan Balasescu
be05f2a1c2
Merge pull request #30929 from timschumi/rate-change-ready
Account for rate changing mods when disabling the "Ready" button
2024-12-03 16:30:16 +09:00
Dan Balasescu
6ff1dec7b2
Add tests 2024-12-03 15:45:58 +09:00
Dean Herbert
5b2558cec2
Merge pull request #28473 from bdach/beatmap-info-purge
Move unnecessary properties from `BeatmapInfo` / realm to `IBeatmap`
2024-12-02 16:19:12 +09:00
Salman Alshamrani
9140893249 Fix score no longer being saved when quick-restarting after pass 2024-11-30 23:36:02 -05:00
Huo Yaoyuan
68f21709a8 Fix CA1865 2024-11-30 02:32:09 +08:00
Huo Yaoyuan
fa3c95c296 Merge branch 'master' 2024-11-30 01:07:08 +08:00
Dean Herbert
f56b2b9aef
Merge pull request #30793 from bdach/close-playlists
Add ability to close playlists within grace period after creation
2024-11-29 22:37:32 +09:00
Salman Alshamrani
489d7a30ec Perform a single Save call rather than doing it in each difficulty 2024-11-28 18:37:13 -05:00
Salman Alshamrani
078d62fe09 Fix weird default in test scene 2024-11-28 17:54:03 -05:00