1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 04:07:25 +08:00
Commit Graph

33738 Commits

Author SHA1 Message Date
Dean Herbert
70b762744e Merge branch 'master' into ios-disable-spectator 2020-11-04 14:45:51 +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
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
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
Dean Herbert
c2ffc18379 Change editor timeline mouse wheel handling to scroll by default (and zoom with alt held) 2020-11-03 16:30:11 +09:00
Dean Herbert
0dcb4ea441 Add handling of opacity to timeline waveform display 2020-11-03 16:07:01 +09:00
Dean Herbert
7e4314684b Add editor waveform opacity selection to menu 2020-11-03 16:01:14 +09:00
Dean Herbert
6bf35d5767 Fix editor menu not supporting stateful item drawables 2020-11-03 16:00:07 +09:00
Dean Herbert
71c04472fa Fix osu!catch replay conversion applying left movements to wrong frame 2020-11-03 14:21:19 +09:00
Bartłomiej Dach
2d1db6a22d
Merge pull request #10658 from peppy/spectator-connection-logging
Add very basic connection status logging for spectator streaming client
2020-11-02 20:59:04 +01:00
Bartłomiej Dach
b152514bc7
Merge branch 'master' into spectator-connection-logging 2020-11-02 20:21:45 +01:00
Bartłomiej Dach
3fe965346c
Merge pull request #10661 from peppy/debounce-update-ternary-states
Debounce calls to UpdateTernaryStates
2020-11-02 18:00:32 +01:00
Dean Herbert
ab308d28d2 Debounce calls to UpdateTernaryStates
Just something I noticed in passing recently which may help with
reducing performance overhead of some batch operations.
2020-11-03 01:08:36 +09:00
Dean Herbert
d5c95a8b46 Centralise into methods and add assertions for safety 2020-11-03 00:45:55 +09:00
Dean Herbert
c3d3856a64 Fix looping mode not being set on first track after entering song select
Closes #10656.
2020-11-02 23:51:02 +09:00
Dean Herbert
3765c8abb9
Merge pull request #10659 from smoogipoo/fix-editor-seek-transform
Fix editor seek transform seeking too much
2020-11-02 21:52:14 +09:00
Dean Herbert
c1d9a0c92c Move click action out of user panel 2020-11-02 21:09:47 +09:00
smoogipoo
3956a0669a Fix editor seek transform seeking too much 2020-11-02 21:08:58 +09:00