1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 16:22:57 +08:00
Commit Graph

47447 Commits

Author SHA1 Message Date
MBmasher
a7aea49cb3 Rename osuPreviousHitObject to currentHitObject 2021-12-21 20:06:07 +11:00
MBmasher
0a33f336b0
Merge branch 'master' into fl-opacity 2021-12-21 19:48:49 +11:00
Dan Balasescu
4ba5a939db
Merge pull request #16178 from bdach/lounge-background-screen-correct
Fix lounge screen showing information sourced from wrong playlist item
2021-12-21 17:36:23 +09:00
Dan Balasescu
05b79f864e
Merge pull request #15867 from MBmasher/fl-cumulative-strain
Fix cumulative strain time calculation in Flashlight skill
2021-12-21 17:19:09 +09:00
Dan Balasescu
a53c67b2ea
Merge pull request #16194 from peppy/fix-results-screen-wait-test
Fix intermittent test failures on `TestSceneResultsScreen` due to long delay step
2021-12-21 16:56:49 +09:00
Dan Balasescu
32fbaf47c0
Merge pull request #16192 from peppy/add-room-lost-logging
Add logging of `MultiplayerMatchSubScreen` exiting from room loss
2021-12-21 16:37:08 +09:00
Bartłomiej Dach
bd1fb33ad6
Add and use separate extensions for historical and upcoming playlist items 2021-12-21 08:01:04 +01:00
Dean Herbert
2707b2fbda
Merge pull request #16012 from bdach/beatmap-card/extra
Implement "extra" beatmap card size
2021-12-21 15:40:33 +09:00
Dean Herbert
c0a8758839 Fix intermittent test failures on TestSceneResultsScreen due to long delay step
Using real time delays of 3 seconds doesn't play well with headless runs.
2021-12-21 15:15:05 +09:00
Dan Balasescu
a8cd96278d
Merge pull request #16189 from peppy/fix-beatmap-listing-overlay-test-failure
Fix intermittent failures on `TestSceneBeatmapListingOverlay`
2021-12-21 15:11:25 +09:00
Dan Balasescu
5cea8da80f
Merge pull request #16188 from peppy/multiplayer-button-enabled
Centralise all multiplayer button clicking test logic
2021-12-21 15:10:26 +09:00
Dean Herbert
d08b66a5ff Also add logging to OnlinePlayScreen 2021-12-21 15:07:06 +09:00
Dan Balasescu
3b700b6967
Merge pull request #16187 from peppy/fix-threading-colour-error-meter
Fix potential wrong thread mutation in `ColourHitErrorMeter`
2021-12-21 15:05:57 +09:00
Dean Herbert
ddadf3c4b5 Add logging of MultiplayerMatchSubScreen exiting from room loss 2021-12-21 14:53:24 +09:00
Dean Herbert
0f8a6a3f64 Fix intermittent failures on TestSceneBeatmapListingOverlay
In the specific method, there was no wait step after the initial fetch
(unlike all of the rest), meaning the fetch may not have finished in
time for the follow-up steps.

As seen at
https://github.com/ppy/osu/runs/4588058438?check_suite_focus=true.
2021-12-21 14:12:06 +09:00
Dan Balasescu
2ea31c26a5
Merge pull request #16168 from peppy/windows-key-when-inactive
Avoid blocking windows key usage when the osu! window is not active
2021-12-21 13:51:10 +09:00
Dean Herbert
bb3f375958 Add note about local button clicking usage 2021-12-21 13:49:51 +09:00
Dean Herbert
aad55ef89e Remove unused method in TestSceneMultiplayerQueueList 2021-12-21 13:49:51 +09:00
Dean Herbert
9aff646ff4 Centralise all multiplayer button clicking test logic
This adds the "wait for enabled" check in a way that can be easily
reused, as it keeps getting missed in test implementations.

This particular commit hopefully fixes
https://github.com/ppy/osu/runs/4583845033?check_suite_focus=true.
2021-12-21 13:49:51 +09:00
Dean Herbert
edcbd4de6d Fix incorrect event unbind logic 2021-12-21 13:05:26 +09:00
Dean Herbert
52db7b36fc Move Schedule call to base implementation of error meter for extra safety 2021-12-21 12:55:21 +09:00
Dan Balasescu
f366cdc73e Extract initial set out of loop 2021-12-21 12:39:34 +09:00
Dan Balasescu
c21b2d1662 Fix incorrect variable 2021-12-21 12:39:09 +09:00
Dean Herbert
28d6ff5d9c Fix potential wrong thread mutation in ColourHitErrorMeter 2021-12-21 12:36:04 +09:00
Dan Balasescu
e21dbf10ff Refactor further to remove indexing confusion 2021-12-21 12:25:32 +09:00
Dan Balasescu
377cb1d9e3
Merge pull request #15728 from MBmasher/fl-decay
Remove decay factor in Flashlight skill
2021-12-21 07:59:32 +09:00
MBmasher
c71655a75e
Merge branch 'master' into fl-cumulative-strain 2021-12-21 06:06:19 +11:00
Bartłomiej Dach
f1a03aced5
Merge branch 'master' into beatmap-card/extra 2021-12-20 15:49:00 +01:00
Dean Herbert
488e1f858b
Merge pull request #16167 from peppy/fix-song-select-test-failure
Fix occasional failures in `TestScenePlaySongSelect`
2021-12-20 23:11:06 +09:00
Bartłomiej Dach
0975f570ba
Return last playlist item if all expired 2021-12-20 13:49:05 +01:00
Bartłomiej Dach
a5a9922f81
Fix lounge screen content not matching current room playlist item 2021-12-20 13:32:42 +01:00
Bartłomiej Dach
a59583ee09
Add extension method for returning next playlist item 2021-12-20 13:18:02 +01:00
Bartłomiej Dach
0b7daf542f
Merge branch 'master' into fix-song-select-test-failure 2021-12-20 11:36:49 +01:00
Bartłomiej Dach
6bbc9ccf97
Merge pull request #16169 from peppy/fix-ready-button-test
Add better defined steps to `TestLoseHostWhileReady` ready button test
2021-12-20 11:36:20 +01:00
Bartłomiej Dach
f492cf84d9
Ensure presence of at least 1 difficulty for each ruleset 2021-12-20 11:34:39 +01:00
Bartłomiej Dach
d8be455a43
Merge branch 'master' into fix-ready-button-test 2021-12-20 11:02:43 +01:00
Bartłomiej Dach
e4702b8729
Merge pull request #16172 from peppy/update-framework
Update framework
2021-12-20 11:02:15 +01:00
Dean Herbert
ec0a6735eb Rename TestMultiplayerScreenStack to TestMultiplayerComponents 2021-12-20 18:24:59 +09:00
Dean Herbert
6907a9a3cc Name some screen stacks for better logging context 2021-12-20 18:24:14 +09:00
Dean Herbert
1533aefce5 Update framework 2021-12-20 18:22:19 +09:00
Dean Herbert
87051d5d61 Add better defined steps to TestLoseHostWhileReady ready button test
Not 100% sure this will solve the issue but it's worth a try. The button
state checks are using `Until` everywhere else so this brings the test
in line with the standards.

As seen
https://github.com/ppy/osu/runs/4579641456?check_suite_focus=true.
2021-12-20 17:47:06 +09:00
Dean Herbert
090c3e84e7 Avoid blocking windows key usage when the osu! window is not active
As discussed in https://github.com/ppy/osu/discussions/16147.
2021-12-20 17:40:11 +09:00
Bartłomiej Dach
51386bb48d
Merge pull request #16166 from peppy/playlist-tests-wait-step
Add wait step to `TestScenePlaylistResultScreen` explicitly for screen load
2021-12-20 09:36:57 +01:00
MBmasher
6caa950c44 Rename osuPrevious to osuLoop 2021-12-20 19:16:41 +11:00
Dean Herbert
5c8e317a6e Chooser earlier items in song select tests to avoid potentially not having enough 2021-12-20 17:11:15 +09:00
Dean Herbert
af78a3e99d Fix weird loop logic 2021-12-20 17:09:08 +09:00
Dean Herbert
d79602a912 Add wait step to TestScenePlaylistResultScreen explicitly for screen load 2021-12-20 16:58:36 +09:00
Dean Herbert
2e47c4e25d
Merge pull request #16164 from smoogipoo/fix-intermittent-background-test
Fix intermittent background screen test failures
2021-12-20 14:00:53 +09:00
Dean Herbert
ce6503ff8b
Merge pull request #16165 from smoogipoo/fix-multiplayer-tests
Add better fix for intermittent multiplayer tests as a result of async room joins
2021-12-20 13:44:29 +09:00
Dan Balasescu
9316abc278 Better fix for intermittent multiplayer tests 2021-12-20 13:10:13 +09:00