1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 05:42:56 +08:00
Commit Graph

44875 Commits

Author SHA1 Message Date
Dean Herbert
9bf29503fb Rename remaining usage 2021-10-07 20:57:14 +09:00
Dean Herbert
310d7965b6 Merge branch 'master' into more-filter-effects 2021-10-07 20:52:38 +09:00
Dan Balasescu
f8e50731b7
Merge pull request #14991 from peppy/intro-tests-no-menu-load
Allow intro screens to be created without loading a `MainMenu`
2021-10-07 20:48:54 +09:00
Dean Herbert
9b404d983c
Merge pull request #14892 from nekodex/popup-filter-effect
Add a dynamic audio `Filter` effect component and use it with `DialogOverlay` popups
2021-10-07 20:45:57 +09:00
Dean Herbert
ba84da6ef8 Tidy up test scene 2021-10-07 20:08:28 +09:00
Dean Herbert
b88d4f1913 Fix weird edge case in TestSceneIntroWelcome 2021-10-07 19:58:34 +09:00
Dean Herbert
ef64c64f0b
Merge branch 'master' into popup-filter-effect 2021-10-07 18:56:07 +09:00
Dean Herbert
e578046b20 Rename Filter -> AudioFilter 2021-10-07 18:50:08 +09:00
Dean Herbert
0348c6c7e5 Apply some renaming and code quality fixes 2021-10-07 18:49:22 +09:00
Dan Balasescu
bece807857
Merge pull request #14980 from peppy/difficulty-move-to-beatmap
Copy `BaseDifficulty` to `Beatmap<T>` and move the majority of write operations across
2021-10-07 18:43:44 +09:00
Dan Balasescu
d7701e0ab4
Merge pull request #14990 from peppy/test-scene-osu-game-fix-async-disposal-contention
Change `TestSceneOsuGame` to use `OsuGameTestScene` to avoid async disposal deadlock
2021-10-07 18:43:22 +09:00
Dean Herbert
f98dd1b811
Merge branch 'master' into popup-filter-effect 2021-10-07 18:40:21 +09:00
Dean Herbert
189358240d Fix intro tests and move steps out of constructor 2021-10-07 18:39:48 +09:00
Jamie Taylor
f6458aa26d
Add filter effect to collection management dialog 2021-10-07 17:56:11 +09:00
Jamie Taylor
cc209f0f2d
Add filter effect to fail sequence 2021-10-07 17:55:30 +09:00
Jamie Taylor
5c48340520
Add filter effect to beatmap loading 2021-10-07 17:55:21 +09:00
Dean Herbert
ee66414e4f Move difficulty copy inside context retrieval 2021-10-07 17:49:13 +09:00
Dan Balasescu
7074021d1f
Merge branch 'master' into test-scene-osu-game-fix-async-disposal-contention 2021-10-07 17:47:11 +09:00
smoogipoo
e586fee091 Remove unused usings 2021-10-07 17:46:30 +09:00
Dan Balasescu
0e0779e45b
Merge pull request #14988 from peppy/remove-gameplay-mod-bindable-storage
Remove local overridden storage of `Mods` in `Player`
2021-10-07 17:36:23 +09:00
Dan Balasescu
061697b4cd
Merge pull request #14989 from peppy/osu-game-test-scene-improvements
Improve performance of `OsuGameTestScene` based tests
2021-10-07 17:30:50 +09:00
Dean Herbert
d3efec3c04 Remove unnecessary clone operations 2021-10-07 17:22:10 +09:00
Dean Herbert
7dd7d35fc8 Remove unnecessary difficulty copy operation 2021-10-07 17:19:34 +09:00
Dean Herbert
0df409c050 Move difficulty copy to BeatmapModelManager.Save 2021-10-07 17:16:45 +09:00
smoogipoo
ca9c79b758 Use object initialiser (fixes CI inspection) 2021-10-07 16:51:42 +09:00
Dan Balasescu
d50443fdf2
Merge branch 'master' into difficulty-move-to-beatmap 2021-10-07 16:50:10 +09:00
Dean Herbert
d0001f760d Group applicable comment above new addition 2021-10-07 16:50:05 +09:00
Dean Herbert
f88d898960 Allow intro screens to be created without loading a MainMenu 2021-10-07 16:38:22 +09:00
Dean Herbert
c41271ea78 Fix hidden test failures 2021-10-07 16:26:24 +09:00
Dean Herbert
7e0379441c Change TestSceneOsuGame to use OsuGameTestScene to avoid async disposal deadlock
The original implementation was done so in a way that the nested `OsuGame` would be disposed via the async queue, causing a deadlock for 10-20s during test runs. `OsuGameTestScene` was already fixed to avoid this, so consuming it here seems like the easy fix.
2021-10-07 16:18:48 +09:00
Dean Herbert
0bd5136a29 Fix TestOverlayClosing occasionally failing due to running too fast 2021-10-07 15:55:29 +09:00
Dean Herbert
290c9755e2 Always use circles intro for OsuGame tests
The triangles intro tracks video time, which is not adjusted based on
the game's playback rate (ie. it runs in realtime even for headless
tests).

Maybe we want to make the triangles video adjust its rate along with
tests?
2021-10-07 15:55:29 +09:00
Dean Herbert
a57b080f10 Avoid showing the disclaimer in game tests
No real performance gain, but this is handy to bypass when actually
using one of these tests to test something.
2021-10-07 15:55:15 +09:00
Dean Herbert
697f53c445 Fix test failure due to reference of Player.Mods 2021-10-07 15:00:47 +09:00
Dean Herbert
5f129ae33c Remove local overridden storage of Mods in Player
Not required and only causing headaches. Accessing mods should now be
done via `GameplayState`.

Closes #14912.
2021-10-07 14:53:39 +09:00
Dean Herbert
acaef26af7
Merge pull request #14986 from peppy/fix-wind-mods
Fix rate mods not working if pp counter is displayed
2021-10-06 22:29:44 +09:00
Dean Herbert
9705c7b546 Use cloned mods in one more place 2021-10-06 21:30:30 +09:00
Dean Herbert
433e7cd403 Fix rate mods not working if pp counter is displayed 2021-10-06 21:26:30 +09:00
Jamie Taylor
99fb86878e
Only detach filter on disposal if attached 2021-10-06 18:31:56 +09:00
Dean Herbert
622e81f47a
Merge pull request #14982 from smoogipoo/fix-score-panel-test
Fix intermittent score panel test failure
2021-10-06 17:56:18 +09:00
Jamie Taylor
bd0c986144
Add asserts to ensure correct state when attaching/detaching the filter 2021-10-06 17:34:24 +09:00
Jamie Taylor
fc0c3e8758
Attach filters at load time 2021-10-06 17:32:28 +09:00
smoogipoo
456cfd62bf Fix intermittent score panel test failure 2021-10-06 16:46:27 +09:00
Dan Balasescu
0d1243a0b5
Merge pull request #14981 from peppy/fix-leaderboard-incorrect-load
Fix leaderboard potentially displaying the wrong scores
2021-10-06 16:40:26 +09:00
Dean Herbert
4ca97bc60a
Merge branch 'master' into difficulty-move-to-beatmap 2021-10-06 16:14:21 +09:00
Dean Herbert
3803f2f462 Fix leaderboard potentially displaying the wrong scores
Closes #14762.

This class is ugly. I think the whole process should be clened up once
we have correctly-scheduled `SynchronizationContext`s. There's not much
saving it as long as all these interdispersed `Schedule`s around
required.
2021-10-06 16:07:29 +09:00
Dean Herbert
222997f2b9 Copy difficulty settings back out to BeatmapInfo on editor changes 2021-10-06 15:19:26 +09:00
Dean Herbert
0ab8dcc2a0 Fix taiko weird difficulty multiplier failing on double convert 2021-10-06 15:18:06 +09:00
Dean Herbert
b339c149d8 Copy BaseDifficulty to Beatmap<T> and move all write operations across 2021-10-06 15:10:45 +09:00
Dan Balasescu
e6aa05a4a4
Merge pull request #14978 from peppy/fix-editor-file-selector-textbox-drags
Fix dragging on an editor file selection text box causing repeated popover display
2021-10-06 13:52:08 +09:00