1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 00:53:20 +08:00
Commit Graph

8874 Commits

Author SHA1 Message Date
Dan Balasescu
c0b13c7e1f Refactor ScoreProcessor ComputeScore() methods 2022-08-29 13:51:10 +09:00
Dan Balasescu
289b6f1a58
Merge pull request #19924 from peppy/fix-playlist-overlay-test-failures
Fix intermittent test failures in `TestScenePlaylistOverlay`
2022-08-26 23:36:16 +09:00
Salman Ahmed
1fd1672d89
Merge branch 'master' into mod-validation-tests 2022-08-26 15:00:07 +03:00
Dean Herbert
6dc859973b
Merge branch 'master' into fix-playlist-overlay-test-failures 2022-08-26 20:25:53 +09:00
Dan Balasescu
91e044542d
Merge pull request #19828 from peppy/no-gameplay-clock-gameplay-offset
Introduce `FramedBeatmapClock` (and use in gameplay flow)
2022-08-26 20:21:34 +09:00
Dean Herbert
5ef8e26ebe Fix check not accounting for mods not existing in certain rulesets
Also check all instances, rather than first.
2022-08-26 19:59:26 +09:00
Dean Herbert
580754833f Merge branch 'master' into mod-validation-tests 2022-08-26 19:48:42 +09:00
Dean Herbert
9050f54681 Split out test assertion methods to read better 2022-08-26 16:56:03 +09:00
Dean Herbert
a8c699610a Fix lead in tests not waiting for player to start running
The tests are only meant to ensure that gameplay eventually starts.

The case where failures can occur is where the master clock is behind
the player clock (due to being in lead-in time). Because the test is
running in real-time, it can take arbitrary amounts of time to catch up.

If it took too long, the test would fail.
2022-08-25 18:00:14 +09:00
Dean Herbert
ddb434f47a Rename asserts to method names to make it easier to track in logs 2022-08-25 17:30:13 +09:00
Dean Herbert
a5c61d9a52 Improve understandability of TestMostInSyncUserIsAudioSource 2022-08-25 16:47:33 +09:00
Dean Herbert
3a17c6df08 Merge branch 'master' into no-gameplay-clock-gameplay-offset 2022-08-25 16:24:55 +09:00
Salman Ahmed
eb57ea76ab
Merge branch 'master' into legacy-combo-increase 2022-08-25 09:46:12 +03:00
Dean Herbert
1032b2a68c Fix some BeatmapCarousel tests not correctly reinitialising local data per run
Closes https://github.com/ppy/osu/issues/19949.
2022-08-25 14:03:26 +09:00
Dan Balasescu
73f41439ae Remove redundant qualifiers 2022-08-25 13:34:58 +09:00
Dan Balasescu
c9ff39f8c3 Add HitResult.LegacyComboIncrease 2022-08-24 19:46:41 +09:00
Dean Herbert
ddccf4defe Remove dollar sign 2022-08-24 17:17:59 +09:00
Dean Herbert
27b57947e4 Rename PlayerArea.GameplayClock to SpectatorPlayerClock for clarity 2022-08-24 17:13:14 +09:00
Dean Herbert
5f01f461b3 Ensure elapsed time is always non-zero when advancing SpectatorPlayerClock 2022-08-24 17:13:14 +09:00
Dean Herbert
5079e0d83d Merge branch 'master' into no-gameplay-clock-gameplay-offset 2022-08-24 16:52:10 +09:00
Dean Herbert
d33d705684 Make WaitingOnFrames non-bindable 2022-08-24 16:03:38 +09:00
Dean Herbert
995e6664b6 Rename spectator clock sync classes 2022-08-24 15:13:08 +09:00
Dean Herbert
31f657fe01 Remove ISpectatorPlayerClock interface
Too many levels of redirection.

One interface with one implementation is not useful, IMO.
2022-08-24 15:12:57 +09:00
Dean Herbert
46d000b8ce Fix test regressions on windows due to Reset never being called
I'm not sure this is great. Without calling `Reset`, the correct initial
time may not be set (ever). In practice this doesn't happen anywhere in
the gameplay flow, but something worth noting.

This change is required now that `Reset` isn't called in the
constructor. It couldn't be called in the constructor because it would
cause the audio track to reset its position too early.

What an ordeal.
2022-08-24 11:50:20 +09:00
Dean Herbert
ec61a94dc9 Merge branch 'master' into no-gameplay-clock-gameplay-offset 2022-08-23 17:36:06 +09:00
Dean Herbert
9a579871c0 Remove pointless initial import 2022-08-23 17:33:53 +09:00
Dean Herbert
a62deae3cc Use local realm rather than fetching from dependencies 2022-08-23 17:33:53 +09:00
Dean Herbert
690e048864 Ensure all initial imports are completed before running playlist overlay tests steps 2022-08-23 17:33:53 +09:00
Dean Herbert
553897f2f0 Remove AddClock method to CreateManagedClock 2022-08-23 13:52:43 +09:00
Dan Balasescu
5d3d8681d4 Invert creation of clocks in multi spectator 2022-08-22 19:14:06 +09:00
Dean Herbert
058d67f8e8
Merge pull request #19695 from naoei/ruleset-localization
Change most ruleset-accessible string types to Localisable strings
2022-08-22 16:13:23 +09:00
Dan Balasescu
0815b01b75
Merge pull request #19783 from bdach/mod-select/presets-dont-open-customisation
Fix selecting preset containing Difficulty Adjust automatically opening customisation panel
2022-08-22 15:44:00 +09:00
Dean Herbert
af2e82d7d5 Move operation of setting GameplayClockContainer.StartTime to Reset call 2022-08-22 14:11:06 +09:00
Nao
189a407cb1
Merge branch 'master' into ruleset-localization 2022-08-20 21:39:10 -04:00
Dean Herbert
15d49b0357 Update TestSceneSpectator to user new assert style 2022-08-19 01:46:19 +09:00
Dean Herbert
cc86909633 Increase lenience on TestSceneLeadIn tests
I've gone through these in detail and can't find an issue with the
actual flow of things. For whatever reason, the new structure has a
slightly higher delay, likely due to performing less `Seek` calls
(previously a `Seek` was called after the clock start which may have
been making this more accurate on the first `Player.Update`).

I don't think it really matters that this is slightly off, but we'll see
how this plays out.
2022-08-19 01:39:00 +09:00
Dean Herbert
2eba8650ca Update TestSceneLeadIn to use new assert style 2022-08-18 19:26:19 +09:00
Dean Herbert
43879633db Ensure setting a StartTime on a GameplayClockContainer always resets to the new time 2022-08-18 18:54:10 +09:00
Dean Herbert
728cd96508 Update TestSceneLeadIn to use new assert style 2022-08-18 18:54:10 +09:00
Dan Balasescu
fa167b1d12
Merge pull request #19779 from peppy/no-gameplay-clock
Remove all remaining usage of `GameplayClock`
2022-08-18 18:52:57 +09:00
Dan Balasescu
7878231a73
Merge pull request #19817 from peppy/various-test-fixes
Refactor some tests
2022-08-18 14:39:43 +09:00
Dean Herbert
e7ddbc41c8
Merge branch 'master' into no-gameplay-clock 2022-08-17 22:21:10 +09:00
Dan Balasescu
11301f52b7
Merge pull request #19814 from peppy/update-framework
Update framework (and other dependencies)
2022-08-17 19:24:01 +09:00
Dean Herbert
553ae4781f Remove unnecessary local implementation in TestScenePlaybackControl 2022-08-17 19:21:54 +09:00
Dean Herbert
4ef4d66f49 Add some extra initial state checks to TestSceneEditorSeekSnapping 2022-08-17 19:21:46 +09:00
Dan Balasescu
3a0017c87b Fix flaky quick retry test 2022-08-17 17:09:44 +09:00
Dean Herbert
a5ac69a554 Update various dependencies 2022-08-17 16:57:56 +09:00
Dean Herbert
20256aad11 Merge branch 'master' into no-gameplay-clock 2022-08-17 15:21:20 +09:00
Dan Balasescu
24fd411720
Merge pull request #19594 from BlauFx/improve_retry_behaviour
Skip song intro on quick restart
2022-08-16 20:18:12 +09:00
Dean Herbert
9a1a7bae89 Make test actually test things 2022-08-16 14:40:02 +09:00