jvyden
1e56f14f5b
Merge remote-tracking branch 'upstream'
2021-04-17 09:35:24 -04:00
Bartłomiej Dach
f3ea51eeed
Adjust tests to not rely on invalid assumption
2021-04-17 14:23:32 +02:00
smoogipoo
d5b26b0ab5
Fix incorrect test spectator client implementation
2021-04-16 23:01:34 +09:00
smoogipoo
a7aa3cb263
Merge branch 'gcc-abstraction' into multiplayer-spectator-screen
2021-04-16 20:16:26 +09:00
smoogipoo
5e82f40d67
Merge branch 'master' into gcc-abstraction
2021-04-16 20:14:53 +09:00
jvyden
8d6c30c73b
Fix lint
2021-04-16 05:57:36 -04:00
jvyden
ec0211809f
Apply peppy's suggestions
2021-04-16 05:53:27 -04:00
smoogipoo
65a6f9f8a4
Merge branch 'fix-initial-spectator-state-callback' into multiplayer-spectator-screen
2021-04-16 18:26:46 +09:00
jvyden
d760e81a91
Fix lint
2021-04-16 05:22:41 -04:00
smoogipoo
46d2181d42
Remove now unnecessary (duplicating) test
2021-04-16 18:21:56 +09:00
smoogipoo
377e5ce6b3
Fix test incorrect sending state too often
2021-04-16 18:21:35 +09:00
jvyden
471b8e3c74
Merge branch 'master' of https://github.com/ppy/osu
2021-04-16 05:02:40 -04:00
jvyden
7d23973ef8
Reset SessionStatics on activity
...
Closes #12424
2021-04-16 05:01:58 -04:00
smoogipoo
ca74f413cd
Change to explicit method instead
2021-04-16 17:31:02 +09:00
smoogipoo
25f0f17766
Attempt to fix match subscreen test failure
2021-04-16 16:16:28 +09:00
smoogipoo
5652490d61
Fix OnUserBeganPlaying not being invoked if already watching
2021-04-16 14:11:55 +09:00
Christine Chen
b15838b220
Move storyboard outro logic to DrawableStoryboard
2021-04-16 00:59:10 -04:00
smoogipoo
5ac0eb02cd
Always add player instances at first, populate later
2021-04-16 12:25:29 +09:00
Christine Chen
45c2b72a25
Merge branch 'master' into play-storyboard-outro
2021-04-15 15:11:35 -04:00
Christine Chen
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
Dean Herbert
7cf15fe729
Merge pull request #12412 from peppy/timeline-adjustments
...
Update timeline control point display
2021-04-15 22:43:26 +09:00
Dan Balasescu
ac8e462d32
Merge branch 'master' into refactor-framed-replay-input-hander
2021-04-15 21:48:58 +09:00
Dean Herbert
ad671ee07a
Merge branch 'master' into timeline-adjustments
2021-04-15 20:42:38 +09:00
Dan Balasescu
6f17c19a48
Merge branch 'master' into summary-timeline-design-refactors
2021-04-15 20:11:39 +09:00
Dean Herbert
5b06a68b93
Merge pull request #12330 from Cublibre/master
...
Send a warning notification if device is unplugged and at low battery
2021-04-15 19:21:04 +09:00
smoogipoo
1705d472b5
Reimplement multiplayer syncing using new master/slave clocks
2021-04-15 19:12:52 +09:00
Dean Herbert
18e8682f39
Remove unused using statements
2021-04-15 17:01:25 +09:00
Dean Herbert
dd9a142e89
Fix TestSceneEditorSummaryTimeline not displaying actual beatmap content
2021-04-15 16:39:20 +09:00
Dean Herbert
66bb5766b9
Make Mod.Description abstract and add missing descriptions
2021-04-15 16:39:20 +09:00
Dan Balasescu
a56391c6ca
Merge pull request #12418 from peppy/abstract-mod-description
...
Make `Mod.Description` abstract and add missing descriptions
2021-04-15 15:42:36 +09:00
Dean Herbert
346e36d32a
Make Mod.Description abstract and add missing descriptions
2021-04-15 14:36:26 +09:00
Salman Ahmed
92fd34cea9
Revert "Inverse ignore user settings bindable to "apply user settings" instead"
...
This reverts commit 175b8da2b27002c262d53cfa5c8f44d46034abbf.
2021-04-15 08:02:12 +03:00
Salman Ahmed
175b8da2b2
Inverse ignore user settings bindable to "apply user settings" instead
2021-04-15 07:34:20 +03:00
Salman Ahmed
7a9ff2ab38
Use until steps instead
...
Ah..
2021-04-15 00:48:25 +03:00
Salman Ahmed
505dc15e03
Add failing test case
2021-04-14 23:35:42 +03:00
Dean Herbert
9dea0ae935
Update test scene to be able to see a bit more
2021-04-14 21:03:52 +09:00
smoogipoo
54643f53e3
Merge branch 'gcc-abstraction' into multiplayer-spectator-screen
2021-04-14 19:56:58 +09:00
smoogipoo
1aa36818df
Abstractify GameplayClockContainer
2021-04-14 17:47:11 +09:00
Dean Herbert
7654df94f6
Merge pull request #12395 from frenzibyte/fix-cinema-ignore-settings
...
Fix beatmap background displayed if storyboard is hidden on "Cinema" mod
2021-04-14 14:31:03 +09:00
smoogipoo
3039b7b0f9
Make tests a bit more resilient
2021-04-13 22:40:24 +09:00
smoogipoo
20823abb30
Make resyncing a bit more resilient
2021-04-13 22:10:35 +09:00
Dan Balasescu
1505a38164
Merge pull request #12396 from peppy/update-timeline-slider-apperance
...
Update timeline slider/spinner apperance
2021-04-13 20:47:44 +09:00
Dan Balasescu
b2aa46690d
Merge pull request #12389 from peppy/fix-editor-ctrl-drag-deselection
...
Fix ctrl-dragging on an existing selection unexpectedly causing deselection
2021-04-13 20:38:29 +09:00
smoogipoo
5b53a2b211
Merge branch 'master' into multiplayer-spectator-screen
2021-04-13 20:07:56 +09:00
Dean Herbert
00f235760d
Update visual appearance of timeline blueprints to close match new designs
2021-04-13 19:26:20 +09:00
Dean Herbert
fca9c70c1b
Move timeline hit object test to immediately viewable area
2021-04-13 19:26:20 +09:00
Dean Herbert
0cf13dab8d
Merge pull request #12391 from frenzibyte/replays-tooltip-graph
...
Display separate "replays watched" tooltip for replays subsection
2021-04-13 19:25:50 +09:00
Dean Herbert
2884ed3ab9
Merge pull request #12350 from smoogipoo/multiplayer-spectator-player-grid
...
Add the multiplayer spectator player grid
2021-04-13 19:25:32 +09:00
Dan Balasescu
a0513f64f9
Merge branch 'master' into replays-tooltip-graph
2021-04-13 18:21:10 +09:00
Salman Ahmed
15658eda55
Add failing test case
2021-04-13 12:00:13 +03:00
