Commit Graph

40749 Commits

Author SHA1 Message Date
d9d50f0e88 Add border showing selected blueprints in timeline 2021-04-16 18:16:22 +09:00
43e6e5e049 increase GameIdleTracker time to 5 minutes 2021-04-16 05:15:58 -04:00
471b8e3c74 Merge branch 'master' of https://github.com/ppy/osu 2021-04-16 05:02:40 -04:00
7d23973ef8 Reset SessionStatics on activity
Closes #12424
2021-04-16 05:01:58 -04:00
7648d6f7fb Merge pull request #12443 from peppy/fix-slider-scale-crash
Fix div-by-zero when scaling a 1-dimensional slider
2021-04-16 17:31:42 +09:00
ca74f413cd Change to explicit method instead 2021-04-16 17:31:02 +09:00
fbf7d838da Update framework 2021-04-16 17:30:39 +09:00
9b95cf227e Merge branch 'master' into apply-ibindable-interface-change 2021-04-16 17:30:35 +09:00
0030b2dde6 Merge pull request #12442 from smoogipoo/fix-match-subscreen-test
Attempt to fix match subscreen test failure
2021-04-16 17:29:58 +09:00
5ad2d0e759 Merge pull request #12439 from ekrctb/further-refactor-framed-replay
Further refactor FrameReplayInputHandler, simplify the template code
2021-04-16 17:16:09 +09:00
b8d5839baf Merge pull request #12441 from peppy/fix-potential-deselection-crash
Fix an occasional crash when deleting a HitObject via internal means
2021-04-16 17:15:52 +09:00
30e00cc4aa Add test coverage of selection / scaling scenarios 2021-04-16 17:07:20 +09:00
401bf368a7 Merge branch 'fix-slider-scale-crash' into fix-slider-zero-length 2021-04-16 16:58:19 +09:00
8de68e0ebf Fix div-by-zero when scaling a 1-dimensional slider 2021-04-16 16:55:26 +09:00
ab1a1a1df4 Add failing test case due to div by zero 2021-04-16 16:55:17 +09:00
3c8e2b8b32 Merge branch 'master' into fix-potential-deselection-crash 2021-04-16 16:27:47 +09:00
d3acbcced7 Merge pull request #12437 from peppy/fix-editor-placement-commit-false
Fix placement blueprints not being correctly removed after a rolled back placement
2021-04-16 16:25:05 +09:00
25f0f17766 Attempt to fix match subscreen test failure 2021-04-16 16:16:28 +09:00
c59906e925 Fix an occasional crash when deleting a HitObject via internal means 2021-04-16 15:55:33 +09:00
ff408b852e Handle scaling a slider below minimum length 2021-04-16 15:45:24 +09:00
89373638be Handle control point deletion when the resulting slider would be too short to be useful 2021-04-16 15:45:24 +09:00
2949a6bbdc Handle control point drag revert 2021-04-16 15:45:24 +09:00
d38e294d96 Centralise length validation function 2021-04-16 15:45:24 +09:00
8c4804dd7a Use nameof 2021-04-16 15:40:06 +09:00
d1c72f5e13 Apply changes resulting from IBindable interface updates 2021-04-16 15:10:53 +09:00
1ebd9975f6 Merge pull request #12436 from peppy/fix-placement-slider-timeline-display
Fix slider not displaying in timeline during zero-duration placement
2021-04-16 14:52:03 +09:00
965a1ead36 Disallow zero-length slider blueprint placements 2021-04-16 14:38:30 +09:00
af20863799 Merge branch 'fix-editor-placement-commit-false' into fix-slider-zero-length 2021-04-16 14:30:46 +09:00
a965e8a75d Remove AutoGenerator workaround of now-fixed issue 2021-04-16 14:13:41 +09:00
91c7d8d26c Introduce StartFrame and EndFrame to simplify the replay interpolation code 2021-04-16 14:13:41 +09:00
84bc81a6de Make FramedReplayInputHandler.CurrentTime non-null 2021-04-16 14:13:41 +09:00
936bde28a3 Remove manual handling of IsActive in RulesetInputManager
Now it is supported in framework
2021-04-16 14:13:41 +09:00
5652490d61 Fix OnUserBeganPlaying not being invoked if already watching 2021-04-16 14:11:55 +09:00
119c9b4294 Fix placement blueprints not being correctly removed after a rolled back placement 2021-04-16 14:11:33 +09:00
5c0ef55691 Rename SliderPlacementState to make way for more generic version 2021-04-16 14:09:35 +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
42c066e6f2 Fix slider not displaying in timeline during zero-duration placement 2021-04-16 13:38:55 +09:00
1c086d99de Add loading spinner 2021-04-16 13:28:32 +09:00
5ac0eb02cd Always add player instances at first, populate later 2021-04-16 12:25:29 +09:00
a9d1d163bb Merge pull request #12431 from peppy/fix-timeline-initial-seek
Fix timeline seeking to an incorrect initial location
2021-04-16 10:19:12 +09:00
0e545e1ed9 Add IHasDuration interface with EndTime for storyboard elements to implement 2021-04-15 17:17:02 -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
c2340f1fe8 Move zoom settings back to run in a non-loaded state 2021-04-16 01:01:03 +09:00
15d48a924b Set the timeline's height to a sane non-zero default
This isn't required but makes the initial appearance animation nicer.
2021-04-16 00:58:32 +09:00
215ad78045 Merge pull request #12404 from peppy/volume-control-acceleration
Add simple acceleration to volume metre adjustments
2021-04-16 00:31:26 +09:00
587973be25 Merge pull request #12405 from frenzibyte/top-left-cursor
Add support for legacy skin's `CursorCentre` setting
2021-04-16 00:30:53 +09:00
34859a4760 Invalidate drawnode on change 2021-04-15 23:37:05 +09:00
a19f3bac35 Merge pull request #12408 from peppy/hide-top-right-elements-as-part-of-hud
Hide top-right HUD overlay elements as part of HUD visibility
2021-04-15 23:29:55 +09:00