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

54925 Commits

Author SHA1 Message Date
Dean Herbert
af56cd0126 Fix merge breakage 2022-08-24 16:52:36 +09:00
Dean Herbert
5079e0d83d Merge branch 'master' into no-gameplay-clock-gameplay-offset 2022-08-24 16:52:10 +09:00
Salman Ahmed
e378c5b866 Remove no longer necessary switch case 2022-08-24 10:50:40 +03:00
Dean Herbert
b5c244e624
Merge pull request #19936 from peppy/catch-up-woes-2
Move `MasterClockState` handling in to `SpectatorSyncManager`
2022-08-24 16:48:28 +09:00
Andrew Hong
ec5fd7ac1d Remove possible 'System.NullReferenceException' 2022-08-24 03:42:16 -04:00
Khang
adea29c106 Fix test failures 2022-08-24 03:37:33 -04:00
Salman Ahmed
8f4a2b4936 Separate passed/failed states from calling EndGameplay 2022-08-24 10:36:13 +03:00
Andrew Hong
b24513038c Add popupdialog button to copy url 2022-08-24 03:35:19 -04:00
Andrew Hong
a8867d4245
Merge branch 'master' into add-date-created-sort 2022-08-24 03:23:27 -04:00
Andrew Hong
6344b87b14
Merge branch 'master' into copyexternalurl-user 2022-08-24 03:12:00 -04:00
Dean Herbert
7f9246637a Simplify MultiSpectatorScreen hierarchy construction 2022-08-24 16:08:48 +09:00
Andrew Hong
edd50dc05b Add profile url context menu to user container 2022-08-24 03:07:03 -04:00
Dean Herbert
7c1fc4814e Remove unused CreateMasterGameplayClockContainer method 2022-08-24 16:03:38 +09:00
Dean Herbert
871365bbb0 Inline ReadyToStart action binding for added safety 2022-08-24 16:03:38 +09:00
Dean Herbert
6c50f618a3 Don't use bindable flow for masterState 2022-08-24 16:03:38 +09:00
Dean Herbert
683d49c608 Move MasterClockState handling in to SpectatorSyncManager 2022-08-24 16:03:38 +09:00
Dean Herbert
d33d705684 Make WaitingOnFrames non-bindable 2022-08-24 16:03:38 +09:00
Dean Herbert
d05d8aeb22 Simplify interface implementations 2022-08-24 16:03:38 +09:00
Dean Herbert
2f5be6efca Tidy up ProcessFrame and privatise const 2022-08-24 16:03:38 +09:00
Dean Herbert
b564c34dbc Don't process master clock (is a noop) 2022-08-24 16:03:38 +09:00
Dan Balasescu
f5a71ecdfe
Merge pull request #19933 from peppy/catch-up-woes
Tidy up spectator clock/manager naming and interfaces
2022-08-24 16:03:29 +09:00
Salman Ahmed
2fa8b61f3c Handle completion user state updates during spectating 2022-08-24 10:02:21 +03:00
Salman Ahmed
7e5086c8d7 Fix spectator client not handling multiple watch calls properly 2022-08-24 10:02:21 +03:00
Khang
9c6968e96d Remove unused import in Slider 2022-08-24 02:54:40 -04:00
Khang
c7d4c739aa Add a basic NaN control point test for LegacyBeatmapDecoder 2022-08-24 02:53:55 -04:00
Dean Herbert
b4eede61fb Use readonly instead of get-only 2022-08-24 15:28:18 +09:00
Dean Herbert
0b271fe4b3 Fix incorrect IsRunning value 2022-08-24 15:27:31 +09:00
Dean Herbert
b6254a1f25 Remove unnecessary casting 2022-08-24 15:23:31 +09:00
Dean Herbert
a86fc6f248 Change running state of SpectatorPlayerClock using IsRunning 2022-08-24 15:17:56 +09:00
Dean Herbert
0c9a4ec13c Don't expose MasterClock in SpectatorClockSyncManager 2022-08-24 15:13:08 +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
882dd93942 Remove ISyncManager 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
22963ab951 Fix multiplayer spectator getting stuck 2022-08-24 15:12:57 +09:00
Khang
c9f364d6a0 Document why beatLength can be NaN 2022-08-24 02:10:19 -04:00
Dean Herbert
ec31f37ff7 Accept MasterGameplayClockContainer rather than generic clock 2022-08-24 14:51:14 +09:00
Dean Herbert
85fbe7abca Fix multiplayer spectator getting stuck 2022-08-24 13:11:53 +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
vun
fb9bb2d42d Declare Parent as non-nullable 2022-08-24 08:57:13 +08:00
OliBomby
631ea9a3ed added a gap between objects and made it theoretically possible to retain sample control point 2022-08-23 23:29:59 +02:00
OliBomby
1f9cdff013 remove these lines 2022-08-23 22:19:40 +02:00
Khang
ec9daec93b Remove unnecessary workaround 2022-08-23 14:18:40 -04:00
Khang
ada61e6fe7 Forgot to undo broken changes in JuiceStream 2022-08-23 14:10:26 -04:00
Khang
c1ced85b5e Move GenerateTicks to LegacyDifficultyControlPoint and remove support for NaN slider velocity support for other rulesets (at least for now) 2022-08-23 14:07:18 -04:00
Andrew Hong
3cedd1cd1c
Merge branch 'master' into add-date-created-sort 2022-08-23 12:00:30 -04:00
Dean Herbert
c840977acb Fix filtering potentially not running after new items added 2022-08-23 20:42:20 +09:00
Dean Herbert
29fed0c4a3 Avoid setting the source clock until gameplay is ready to start
Without this change, the audio track may audibly seek during load
proceedings.
2022-08-23 18:34:17 +09:00
Dean Herbert
ec61a94dc9 Merge branch 'master' into no-gameplay-clock-gameplay-offset 2022-08-23 17:36:06 +09:00
Dean Herbert
db004c9d9f Fix collection dropdown potentially overwriting value change with schedule hotfix 2022-08-23 17:33:53 +09:00
Dean Herbert
9a579871c0 Remove pointless initial import 2022-08-23 17:33:53 +09:00