smoogipoo
31c5fb350f
Merge branch 'master' into gcc-abstraction
2021-04-21 16:33:36 +09:00
Bartłomiej Dach
881043bc5d
Fix failing test after mod settings layout changes
...
The slight hack which was used in the test to ensure that the mod
settings overlay covered the entire width of the mod overlay broke after
adjustments to the layout in the previous commit.
Locally adjust the hack to use the parent of the `ModSettingsContainer`
rather than the container itself.
2021-04-20 19:38:25 +02:00
smoogipoo
156a518068
Merge branch 'master' into fix-initial-spectator-state-callback
2021-04-20 21:16:05 +09:00
smoogipoo
c5d6b6ea8d
Fix tests failing intermittently
...
This was due to this code happening in UpdateAfterChildren(), after the
GCC has processed one frame. During this time, the clock could have
advanced an arbitrary amount.
The cause of this is the removal of the Task.Run() to set the clock in
Restart() (now called Reset()) which changed the timing, so it only worked before due to pure
luck.
2021-04-20 18:41:09 +09:00
Denrage
505a117862
splitted updateable part of wedge
2021-04-20 10:37:52 +02:00
smoogipoo
80473a356e
Merge branch 'fix-pre-seek-sample-lifetime' into gcc-abstraction
2021-04-20 17:27:01 +09:00
Denrage
c73bbf0aa7
Fixed Tests
2021-04-19 19:24:58 +02:00
Bartłomiej Dach
97573fb11d
Merge branch 'master' into combo-colours-display
2021-04-19 18:21:57 +02:00
Dean Herbert
fc41ad65f8
Merge pull request #12447 from smoogipoo/fix-non-60fps-recording
...
Record every 60fps interval
2021-04-19 23:26:58 +09:00
smoogipoo
c12848ce4d
Apply fixes to tests
2021-04-19 17:02:59 +09:00
smoogipoo
5397f4faba
Merge branch 'master' into fix-initial-spectator-state-callback
2021-04-19 16:49:06 +09:00
jvyden
a854ce429a
add blank line between method
2021-04-18 23:49:13 -04:00
jvyden
999f2d810c
Fix accidentally removed code
2021-04-18 23:30:07 -04:00
Christine Chen
fd1241cc85
Added tests
...
New tests:
- storyboard ending during the failing animation
- showResults = false
- storyboard ending before score processor completion
Co-Authored-By: Marlina José <marlina@umich.edu>
2021-04-18 23:26:50 -04:00
jvyden
e44d11667c
Merge remote-tracking branch 'upstream'
2021-04-18 23:04:35 -04:00
jvyden
b727faace3
Revert changes to IdleTracker
2021-04-18 23:03:43 -04:00
Christine Chen
98460c8feb
Rename IStoryboardElementHasDuration, remove unnecessary step in tests, add Duration field
2021-04-18 20:20:14 -04:00
Bartłomiej Dach
577755ee19
Add placeholder when no colours are visible
...
Will be removed once combo colours are mutable.
2021-04-18 20:46:42 +02:00
Bartłomiej Dach
0cd1aa8c1c
Add support for custom colour prefixes
2021-04-18 20:44:55 +02:00
Bartłomiej Dach
67c19df000
Add test coverage for adding/removing colours
2021-04-18 19:35:42 +02:00
Bartłomiej Dach
1b2c43b92c
Add basic structure of colour palette
2021-04-18 19:29:04 +02:00
Dean Herbert
2678089e0b
Add test case failing on selection after paste
2021-04-18 20:28:39 +09:00
Salman Ahmed
2847dd7e05
Merge branch 'master' into play-storyboard-outro
2021-04-18 06:40:22 +03:00
Christine Chen
7b1d40db7d
Remove redundant string interpolation
2021-04-17 22:13:28 -04:00
Christine Chen
e9f8fa64b8
Added a test for toggling the storyboard after the map is loaded
2021-04-17 21:49:29 -04:00
Christine Chen
7f5b1e84a1
Update TestSceneStoryboardWithOutro.cs
...
- Construct storyboard in CreateWorkingBeatmap()
- Use GameplayClockContainer.GameplayClock.CurrentTime
- Remove unnecessary lines
2021-04-17 13:57:32 -04:00
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
