94d0b06493
Expose mute adjustment instead
2021-04-26 19:01:30 +09:00
4c5a5c449a
Merge branch 'multiplayer-spectator-screen' of https://github.com/smoogipoo/osu into multiplayer-spectator-screen
2021-04-26 17:35:37 +09:00
d7618b63fa
Fix test failure
2021-04-26 17:35:13 +09:00
6626e70c95
Pass in master clock instead of slave clock
2021-04-26 17:30:27 +09:00
120fb8974d
Combine more instances of test player IDs
2021-04-26 17:22:16 +09:00
5b4cb71cc7
Change terminology from "slave" to "player clock"
2021-04-26 17:19:44 +09:00
737a15c2d4
Extract out test player IDs to constants
2021-04-26 17:04:39 +09:00
55f383c71e
Rename test to match new MultiSpectatorLeaderboard class name
2021-04-26 16:48:40 +09:00
6d30a1a80f
Reference constant for test startup delay
2021-04-26 16:45:20 +09:00
aa99c192d0
Fix type in inline comment
2021-04-26 16:21:12 +09:00
56da0a63da
Merge branch 'master' into multiplayer-spectator-screen
2021-04-26 16:09:24 +09:00
cefdf1bf98
Merge pull request #12574 from frenzibyte/animate-circle-piece-usages
...
Fix missing animation of slider repeat and tail circle pieces
2021-04-26 14:42:46 +09:00
3b876a43c2
Merge branch 'master' into multiplayer-spectator-screen
2021-04-26 14:12:35 +09:00
2764a42824
Merge pull request #12546 from smoogipoo/gcc-change-source-on-reset
...
Ensure source is set on GameplayClockContainer.Reset()
2021-04-26 14:12:12 +09:00
0b9172a1dc
Animate back slider repeat and tail circle pieces
2021-04-26 02:39:49 +03:00
6eee229a20
Merge pull request #12569 from plan-do-break-fix/Typo-correction
...
fix(docs): corrects typo in project README
2021-04-25 13:00:33 +09:00
fa8e8ed36f
fix(docs): corrects typo in project README
2021-04-24 22:57:18 -05:00
e937b778f6
Fix potential failure in ensureSourceClockSet()
...
`ensureSourceClockSet()` was intended to only run when the adjustable
source hasn't been set at all yet. As it turns out permitting it to run
unconditionally can break the state of the underlying interpolated
clock. This is caused by the following factors:
* While the decoupleable clock is running, its `CurrentTime` does not
come from either the source clock, or the internal stopwatch; it is
instead calculated using the base `InterpolatingFramedClock` logic.
* A source change of a decoupleable clock seeks the provided source
clock to the decoupleable's current time.
* When an interpolating clock is seeked (decoupleable clock is also
an interpolating one), its interpolation state
(`{Last,Current}InterpolatedTime`) are reset to 0.
* If the interpolating clock determines that its current time is too
far away from the source's time (which was set when the source is
changed), it will ignore the source and instead continue to use
its current time until the source clock has caught up.
Overall, the source change is not really necessary if a source is
already there. The only reason to ensure it was set was to make sure
the first seek of the gameplay clock wasn't performed in decoupled
mode. Therefore, add a guard to make sure the source is only set if
there isn't one already.
2021-04-24 14:19:39 +02:00
34fa51dee9
Merge branch 'master' into gcc-change-source-on-reset
2021-04-24 13:23:02 +02:00
a2215d8078
Merge pull request #12555 from PercyDan54/issue-template
2021-04-24 13:08:56 +02:00
4edf8216a4
Merge branch 'master' into issue-template
2021-04-24 12:32:20 +02:00
2e2f843e22
Refine android game logs path in contributing guidelines
2021-04-24 09:27:05 +03:00
6b6f44793b
Merge pull request #12461 from LiterallyFabian/reversed-fruits
...
Add "Floating Fruits" mod
2021-04-24 15:11:25 +09:00
6f6d57bb02
Merge pull request #12553 from peppy/update-framework
...
Update framework
2021-04-24 15:11:13 +09:00
1ec99577ce
Incorrect path on Android
2021-04-24 14:05:11 +08:00
2ae144be8e
Update framework
2021-04-24 14:38:00 +09:00
0ccdfeea57
Fix code quality issues
2021-04-24 14:35:49 +09:00
86a361a922
Merge branch 'master' into reversed-fruits
2021-04-24 14:33:48 +09:00
5222dcf0ab
Merge pull request #12552 from subfluid/patch-1
...
Fix Spelling Error 'passses'
2021-04-24 13:02:22 +09:00
04958a043f
Fix Spelling Error 'passses'
...
line 20
2021-04-23 20:54:06 -07:00
fdb5490e51
Attempt to explain source initialisation better
2021-04-23 21:56:08 +02:00
b41897fd9b
Rename testscene to match class
2021-04-23 19:23:52 +09:00
b18635341e
Rename file
2021-04-23 19:12:30 +09:00
63a9484255
Expose WaitingOnFrames as mutable bindable
2021-04-23 19:11:47 +09:00
575ec7c528
Document + refactor max player limitation
2021-04-23 19:11:35 +09:00
ae2fd2f2e1
Ensure source is set on reset
2021-04-23 18:46:59 +09:00
d4ffd2ef4b
Merge branch 'master' into reversed-fruits
2021-04-23 15:08:18 +09:00
bc0e1d8c37
Remove dead newline
2021-04-23 15:06:39 +09:00
3b77d02752
Merge pull request #12537 from smoogipoo/fix-initial-playingusers
...
Fix current match playing users not updated on room join
2021-04-23 12:00:33 +09:00
8ee881b57a
Merge pull request #12528 from nekodex/ruleset-switch-sounds
...
Add support for playing a per-ruleset sound when switching rulesets
2021-04-23 11:35:19 +09:00
fbb9cb3f6f
Fix broken merge resolution
2021-04-23 11:01:48 +09:00
a9a24bd481
Merge branch 'master' into ruleset-switch-sounds
2021-04-23 10:50:41 +09:00
b25340653d
Fix failing tests
2021-04-23 00:49:14 +09:00
8de885622b
Merge pull request #12536 from peppy/update-framework
...
Update framework
2021-04-23 00:42:20 +09:00
90ecda91af
Fix exception
2021-04-23 00:06:54 +09:00
4f0857f946
Xmldocs and general refactorings
2021-04-22 23:52:22 +09:00
ee25949751
Rename classes
2021-04-22 23:39:02 +09:00
8a0ba3a055
Merge GameplayIsolationContainer into PlayerInstance, remove track
2021-04-22 23:38:51 +09:00
4aceb75eb2
Disable spectate button on closed rooms
...
Doesn't have an effect normally - only for safety purposes in case we
allow entering the match subscreen after a match has finished in the
future.
2021-04-22 23:37:45 +09:00
fd0b030cf4
Refactor gameplay screen creation
2021-04-22 23:37:33 +09:00
