1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 05:02:56 +08:00
Commit Graph

33903 Commits

Author SHA1 Message Date
Dean Herbert
7f30140b7e Add new method handling hit state specifically
Until now UpdateStateTransforms was applying results offsets to
StartTime. This didn't cover the case of a HitObject with duration,
where the call would be made with `StartTime + hitOffset` rather than
`EndTime + hitOffset`.

To resolve this, a new method has been added which should be used to
handle hit-specific state transforms.
2020-11-04 16:13:14 +09:00
Dan Balasescu
3322c2bbc5
Merge branch 'master' into ios-editor-crash-fix 2020-11-04 15:56:40 +09:00
Dan Balasescu
8045ea200e
Merge pull request #10655 from peppy/ios-disable-spectator
Downgrade SignalR package to avoid startup crashes on iOS
2020-11-04 15:47:40 +09:00
Dean Herbert
ce1743ab28 Fix missed usage in test scene 2020-11-04 15:35:42 +09:00
Dean Herbert
487a5ecdba Replace all usage of IBindableList.GetBoundCopy 2020-11-04 15:29:14 +09:00
Dan Balasescu
c4076cad4b
Merge pull request #10667 from peppy/fix-editor-play-after-drag
Fix editor clock not always remaining stopped when dragging timeline
2020-11-04 15:24:22 +09:00
Dean Herbert
9343f84a68 Add IBindableList.GetBoudCopy to banned symbols for now 2020-11-04 15:21:23 +09:00
Dean Herbert
8b1dd31bb4 Add gitignore ruile for new msbuild generated editorconfig file 2020-11-04 15:20:41 +09:00
Dean Herbert
7d0a7f170c
Avoid overwriting inherited nowarns
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2020-11-04 14:57:47 +09:00
Dean Herbert
d1829820e0 Remove local changes from csproj 2020-11-04 14:53:29 +09:00
Dean Herbert
6c4acb4d11 Move to props and ignore downgrade warning 2020-11-04 14:45:52 +09:00
Dean Herbert
70b762744e Merge branch 'master' into ios-disable-spectator 2020-11-04 14:45:51 +09:00
Dan Balasescu
42c543f5b9
Merge branch 'master' into fix-editor-play-after-drag 2020-11-04 14:45:20 +09:00
Dan Balasescu
98c992004b
Merge pull request #10660 from peppy/fix-song-select-first-track-looping
Fix looping mode not being set on first track after entering song select
2020-11-04 14:37:27 +09:00
Dean Herbert
5316d4c369 Force using older signalr version for iOS 2020-11-04 14:27:13 +09:00
Dean Herbert
1d90f5fc08 Revert "Disable spectator streaming connection logic on iOS to avoid startup crash"
This reverts commit c9b96a1829.
2020-11-04 14:27:13 +09:00
Dan Balasescu
c6779b414e
Merge pull request #10611 from peppy/spectator-listing
Add "currently playing" player listing and spectator UI flow
2020-11-04 14:08:11 +09:00
Dan Balasescu
9b2f396006
Merge pull request #10678 from peppy/fix-load-async-after-disposal-beatmap-wedge
Fix LoadComponentAsync calls potentially occuring after beatmap wedge disposal
2020-11-04 13:10:41 +09:00
Dean Herbert
cfe3218239 Move scheduler call to inside method itself for added safety 2020-11-04 10:23:06 +09:00
Dean Herbert
29e8e5ab94 Merge branch 'master' into fix-load-async-after-disposal-beatmap-wedge 2020-11-04 10:23:05 +09:00
Dean Herbert
9dc2ca666d
Merge branch 'master' into spectator-listing 2020-11-04 09:30:15 +09:00
Bartłomiej Dach
a395ca5e15
Merge pull request #10664 from peppy/catcher-moonwalking-in-replays-fix
Fix osu!catch replay conversion applying left movements to wrong frame
2020-11-04 00:17:18 +01:00
Bartłomiej Dach
4e80f1955c
Merge branch 'master' into catcher-moonwalking-in-replays-fix 2020-11-03 23:42:51 +01:00
Bartłomiej Dach
921f15aa29
Merge pull request #10673 from peppy/editor-waveform-opacity
Add opacity adjustment for waveform editor
2020-11-03 23:42:12 +01:00
Bartłomiej Dach
3bb86ce127
Merge branch 'master' into editor-waveform-opacity 2020-11-03 23:04:19 +01:00
Bartłomiej Dach
66e725b6a2
Merge pull request #10674 from peppy/editor-timeline-scroll-mousewheel
Change editor timeline mouse wheel handling to scroll by default (and zoom with alt held)
2020-11-03 23:03:04 +01:00
Bartłomiej Dach
13f729916a
Merge branch 'master' into editor-timeline-scroll-mousewheel 2020-11-03 22:27:35 +01:00
Bartłomiej Dach
ddf0d75c38 Don't fall through to seek if handling zoom 2020-11-03 21:49:21 +01:00
Bartłomiej Dach
4b528e80d0 Use AltPressed shorthand 2020-11-03 21:49:04 +01:00
Bartłomiej Dach
f3d5e7b15a
Merge pull request #10680 from peppy/editor-flip-keybinds
Add key bindings for flip and reverse patterns
2020-11-03 21:17:52 +01:00
Bartłomiej Dach
b0cf6e3333
Merge branch 'master' into editor-flip-keybinds 2020-11-03 20:41:08 +01:00
Bartłomiej Dach
6437c33e06
Merge pull request #10677 from peppy/fix-catch-banana-animation
Fix osu!catch banana animation not playing due to incorrect lifetimes
2020-11-03 20:24:09 +01:00
Bartłomiej Dach
211510fe9a Fix undesirable vertical spacing in currently playing display 2020-11-03 19:12:03 +01:00
Bartłomiej Dach
86d283ebf4 Adjust layout slightly to avoid specifying width twice 2020-11-03 19:03:48 +01:00
Bartłomiej Dach
18428dff8e Ensure hotkey actions are executable in handler 2020-11-03 18:01:12 +01:00
Dean Herbert
d45520be5e Fix incorrect return types on test methods 2020-11-03 21:23:10 +09:00
Dean Herbert
83c004bbde Add key bindings for flip and reverse patterns 2020-11-03 21:10:31 +09:00
Dean Herbert
9f333ac58a Add the ability to delete slider control points using shift+right click
Closes https://github.com/ppy/osu/issues/10672.

In two minds about how this should be implemented but went in this
direction initially. The other way would be to add local handling of
Shift-Right Click inside PathControlPointPiece (which is already doing
mouse handling itself).
2020-11-03 20:46:33 +09:00
Dean Herbert
1b2bd6a8c9 Remove redundant base call 2020-11-03 20:10:13 +09:00
Dean Herbert
3e29e468ea Ensure "start watching" button starts in a disabled state 2020-11-03 20:06:42 +09:00
Dean Herbert
aaffd59dfe Add test step to reset players (to better allow multiple runs of tests) 2020-11-03 20:02:02 +09:00
Dean Herbert
d4f8c63f9e Fix reference to dummyAPI not using helper property 2020-11-03 19:59:06 +09:00
Dean Herbert
a3c67aabe2 Merge branch 'master' into spectator-listing 2020-11-03 19:56:25 +09:00
Dean Herbert
d788931661 Fix LoadComponentAsync calls potentially occuring after beatmap wedge disposal
As seen in https://ci.appveyor.com/project/peppy/osu/builds/36109658/tests.

Also adds cancellation logic for good measure.
2020-11-03 19:53:45 +09:00
Dean Herbert
9f8ea93068 Fix osu!catch banana animation not playing due to incorrect lifetimes
Closes #10117.
2020-11-03 18:45:21 +09:00
Dean Herbert
b069372b29 Fix skin changes resulting in incorrectly applied transforms in MainCirclePiece 2020-11-03 17:49:48 +09:00
Dean Herbert
ff2b01fa6f Add test coverage of zoom-then-scroll 2020-11-03 17:22:56 +09:00
Dean Herbert
ff4dcf065a Update tests 2020-11-03 17:06:33 +09:00
Dean Herbert
df9ff76f23 Reduce assert to guard in the outwards direction 2020-11-03 16:49:13 +09:00
Dean Herbert
f701a38e20 Merge branch 'master' into fix-song-select-first-track-looping 2020-11-03 16:48:20 +09:00