jvyden
|
854d88bfb9
|
Merge branch 'master' into master
|
2021-04-16 10:04:04 -04:00 |
|
jvyden
|
a4e3e53a63
|
Revert back to hardcoded SessionStatics reset values
|
2021-04-16 06:34:57 -04:00 |
|
Dan Balasescu
|
1f577ce566
|
Merge pull request #12444 from peppy/fix-slider-zero-length
Avoid all scenarios where sliders can become zero length
|
2021-04-16 19:33:35 +09:00 |
|
jvyden
|
9c6914d29d
|
Fix redundant lambda parentheses
|
2021-04-16 06:26:45 -04:00 |
|
Dan Balasescu
|
a1787d3819
|
Merge pull request #12445 from peppy/show-selected-objects-in-timeline
Add border showing selected blueprints in timeline
|
2021-04-16 19:22:04 +09:00 |
|
jvyden
|
8d6c30c73b
|
Fix lint
|
2021-04-16 05:57:36 -04:00 |
|
Dean Herbert
|
b413ffae3e
|
Fix test going offscreen in headless execution
|
2021-04-16 18:54:33 +09:00 |
|
jvyden
|
ec0211809f
|
Apply peppy's suggestions
|
2021-04-16 05:53:27 -04:00 |
|
Dean Herbert
|
f824105075
|
Merge branch 'master' into fix-slider-zero-length
|
2021-04-16 18:47:22 +09:00 |
|
Dean Herbert
|
473ff7c020
|
Merge pull request #12440 from smoogipoo/apply-ibindable-interface-change
Apply changes resulting from IBindable interface updates
|
2021-04-16 18:37:47 +09:00 |
|
jvyden
|
d760e81a91
|
Fix lint
|
2021-04-16 05:22:41 -04:00 |
|
Dean Herbert
|
d9d50f0e88
|
Add border showing selected blueprints in timeline
|
2021-04-16 18:16:22 +09:00 |
|
jvyden
|
43e6e5e049
|
increase GameIdleTracker time to 5 minutes
|
2021-04-16 05:15:58 -04: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 |
|
Dan Balasescu
|
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 |
|
Dean Herbert
|
fbf7d838da
|
Update framework
|
2021-04-16 17:30:39 +09:00 |
|
Dean Herbert
|
9b95cf227e
|
Merge branch 'master' into apply-ibindable-interface-change
|
2021-04-16 17:30:35 +09:00 |
|
Dean Herbert
|
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 |
|
Dan Balasescu
|
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 |
|
Dan Balasescu
|
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 |
|
Dean Herbert
|
30e00cc4aa
|
Add test coverage of selection / scaling scenarios
|
2021-04-16 17:07:20 +09:00 |
|
Dean Herbert
|
401bf368a7
|
Merge branch 'fix-slider-scale-crash' into fix-slider-zero-length
|
2021-04-16 16:58:19 +09:00 |
|
Dean Herbert
|
8de68e0ebf
|
Fix div-by-zero when scaling a 1-dimensional slider
|
2021-04-16 16:55:26 +09:00 |
|
Dean Herbert
|
ab1a1a1df4
|
Add failing test case due to div by zero
|
2021-04-16 16:55:17 +09:00 |
|
Dan Balasescu
|
3c8e2b8b32
|
Merge branch 'master' into fix-potential-deselection-crash
|
2021-04-16 16:27:47 +09:00 |
|
Dan Balasescu
|
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 |
|
smoogipoo
|
25f0f17766
|
Attempt to fix match subscreen test failure
|
2021-04-16 16:16:28 +09:00 |
|
Dean Herbert
|
c59906e925
|
Fix an occasional crash when deleting a HitObject via internal means
|
2021-04-16 15:55:33 +09:00 |
|
Dean Herbert
|
ff408b852e
|
Handle scaling a slider below minimum length
|
2021-04-16 15:45:24 +09:00 |
|
Dean Herbert
|
89373638be
|
Handle control point deletion when the resulting slider would be too short to be useful
|
2021-04-16 15:45:24 +09:00 |
|
Dean Herbert
|
2949a6bbdc
|
Handle control point drag revert
|
2021-04-16 15:45:24 +09:00 |
|
Dean Herbert
|
d38e294d96
|
Centralise length validation function
|
2021-04-16 15:45:24 +09:00 |
|
smoogipoo
|
8c4804dd7a
|
Use nameof
|
2021-04-16 15:40:06 +09:00 |
|
smoogipoo
|
d1c72f5e13
|
Apply changes resulting from IBindable interface updates
|
2021-04-16 15:10:53 +09:00 |
|
Dan Balasescu
|
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 |
|
Dean Herbert
|
965a1ead36
|
Disallow zero-length slider blueprint placements
|
2021-04-16 14:38:30 +09:00 |
|
Dean Herbert
|
af20863799
|
Merge branch 'fix-editor-placement-commit-false' into fix-slider-zero-length
|
2021-04-16 14:30:46 +09:00 |
|
ekrctb
|
a965e8a75d
|
Remove AutoGenerator workaround of now-fixed issue
|
2021-04-16 14:13:41 +09:00 |
|
ekrctb
|
91c7d8d26c
|
Introduce StartFrame and EndFrame to simplify the replay interpolation code
|
2021-04-16 14:13:41 +09:00 |
|
ekrctb
|
84bc81a6de
|
Make FramedReplayInputHandler.CurrentTime non-null
|
2021-04-16 14:13:41 +09:00 |
|
ekrctb
|
936bde28a3
|
Remove manual handling of IsActive in RulesetInputManager
Now it is supported in framework
|
2021-04-16 14:13:41 +09:00 |
|
Dean Herbert
|
119c9b4294
|
Fix placement blueprints not being correctly removed after a rolled back placement
|
2021-04-16 14:11:33 +09:00 |
|
Dean Herbert
|
5c0ef55691
|
Rename SliderPlacementState to make way for more generic version
|
2021-04-16 14:09:35 +09:00 |
|
Dean Herbert
|
42c066e6f2
|
Fix slider not displaying in timeline during zero-duration placement
|
2021-04-16 13:38:55 +09:00 |
|
Dan Balasescu
|
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 |
|
Dean Herbert
|
c2340f1fe8
|
Move zoom settings back to run in a non-loaded state
|
2021-04-16 01:01:03 +09:00 |
|
Dean Herbert
|
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 |
|
Dan Balasescu
|
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 |
|
Dan Balasescu
|
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 |
|