Commit Graph

1016 Commits

Author SHA1 Message Date
fdcb5e924c Initialize skipOutroOverlay with alpha 0, other small changes 2021-04-17 17:45:38 -04:00
81be562379 Read StoryboardEndTime directly from Beatmap 2021-04-17 12:28:31 -04:00
5e82f40d67 Merge branch 'master' into gcc-abstraction 2021-04-16 20:14:53 +09:00
33a665224e Clean up skipOutroOverlay if skipping is disabled 2021-04-16 01:03:15 -04:00
b15838b220 Move storyboard outro logic to DrawableStoryboard 2021-04-16 00:59:10 -04:00
45c2b72a25 Merge branch 'master' into play-storyboard-outro 2021-04-15 15:11:35 -04:00
25b8c2f257 Allow skipping storyboard outro
Reuses SkipOverlay by calculating the endtime of the storyboard and using that as a "start point". Upon skipping the outro the score is instantly shown.
When the end of the storyboard is reached the score screen automatically shows up. If the player holds ESC (pause) during the outro, the score is displayed

The storyboard endtime is calculated by getting the latest endtime of the storyboard's elements, or simply returning 0 if there is no storyboard.

Co-Authored-By: Marlina José <marlina@umich.edu>
2021-04-15 13:20:40 -04:00
1aa36818df Abstractify GameplayClockContainer 2021-04-14 17:47:11 +09:00
36510309d1 Merge EnableUserDim and IgnoreUserSettings to one bindable 2021-04-13 10:58:56 +03:00
571124669d Remove all references to "score submission" from Player 2021-03-23 18:20:55 +09:00
6cb14e91c9 Make Player abstract and introduce SoloPlayer 2021-03-23 18:18:49 +09:00
b1cd01ceb8 Apply ConfigureAwait changes to game side 2021-03-08 14:36:35 +09:00
6a5c6febc5 Add inline comment explaining the retry loop 2021-02-23 13:23:32 +09:00
5493c55da7 Fix silly mistake 2021-02-22 16:59:35 +03:00
5e9040c291 Use "pausing supported" conditional instead 2021-02-22 16:26:35 +03:00
6bac83964a Merge branch 'master' into fix-pofl-on-cooldown 2021-02-22 10:03:27 +03:00
38a2124921 Support instant exit if pausing is not allowed in the current game mode 2021-02-20 14:26:50 +09:00
0771154dd2 Make PauseCooldownActive protected and expose on test class 2021-02-19 11:42:30 +03:00
ddd1dcff88 Attempt pausing every single frame 2021-02-19 11:33:26 +03:00
82cc06ca57 Fix new logic not considering fail overlay correctly 2021-02-19 17:26:54 +09:00
4c214b74ce Merge branch 'master' into fix-error-exit-during-results-transition 2021-02-19 17:13:55 +09:00
4436585aa4 Keep attempting to pause gameplay while window not active 2021-02-19 10:46:32 +03:00
772471a6d8 Add failing test case 2021-02-19 10:46:31 +03:00
9cba350337 Refactor again to better cover cases where the pause dialog should definitely be shown 2021-02-15 15:57:36 +09:00
1aea840504 Add missing return in early exit scenario (MakeCurrent isn't compatible with the following Exit) 2021-02-15 15:03:12 +09:00
2b69c7b325 Fix incorrect order of operation in pause blocking logic 2021-02-15 14:24:08 +09:00
d3f0c0730d Merge branch 'master' into non-concurrent-sample-playback 2021-02-12 17:22:15 +09:00
2c052d70e8 Only trigger pause cooldown on pause (not exit) 2021-02-09 17:29:18 +09:00
cba116ff09 Fix incorrect call parameter for quick exit 2021-02-09 17:28:57 +09:00
61b9539864 Fix regression in quick exit logic 2021-02-09 17:14:16 +09:00
5bd4f74ddf Fix a potential crash when exiting play during the results screen transition 2021-02-09 16:24:29 +09:00
156f5bd5df Add newline between statements 2021-02-08 20:05:16 +09:00
19368f87fb Fix failing test 2021-02-08 19:59:07 +09:00
9e0724b138 Remove unnecessary double resolution of OsuGame 2021-02-08 15:58:41 +09:00
d0ca2b99a8 Remove unnecessary injected dependency 2021-02-06 20:57:01 +03:00
40ddccf0c7 Do not consider replays for "pause on focus lost"
Replays are not pausable as can be seen in the `canPause` check.
2021-02-06 20:56:08 +03:00
f29938e15d Make last binding game activity more sensible 2021-02-05 20:39:57 +03:00
e1789c29b1 Use Pause() instead of performUserRequestedExit() to avoid unexpected operations 2021-02-05 10:28:13 +03:00
730e66f0ee Make pausing on window focus lose instant 2021-02-05 09:07:59 +03:00
b220939650 Fix storyboard samples continuing to play when the beatmap is paused or the intro is skipped. 2021-01-21 17:10:11 -05:00
de9d075f94 Initial sample + samplechannel rework 2021-01-19 17:11:40 +09:00
b3f08b29ca Ensure that all changes to screen backgrounds are on the correct thread 2021-01-05 15:22:50 +09:00
d5fc517fab Merge branch 'master' into disallow-skipping 2020-12-24 12:35:22 +01:00
ee5a6ff9fa Merge branch 'master' into improved-loading-experience 2020-12-24 11:59:46 +01:00
6bd6888a93 Disallow skipping in multiplayer for now 2020-12-24 16:29:51 +09:00
e86e9bfae6 Don't begin gameplay until all users are in a completely prepared state 2020-12-24 15:32:55 +09:00
76935b93b6 Merge branch 'master' into disallow-multiplayer-restart-retry 2020-12-24 13:31:54 +09:00
980e85ce25 Refactor player exit logic to convey intention better 2020-12-23 16:16:24 +01:00
f9fd909187 Fix missed inspections 2020-12-23 18:07:38 +09:00
3c8f871b28 Move player constructor configuration to dedicated class; add AllowRestart parameter 2020-12-23 17:47:46 +09:00