1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 18:33:22 +08:00
Commit Graph

32667 Commits

Author SHA1 Message Date
Dan Balasescu
77ccbb087c
Merge pull request #10393 from peppy/fix-editor-backwards-seek
Increase backwards seek magnitude when the track is running
2020-10-06 19:28:28 +09:00
Dan Balasescu
fa65e14455
Merge pull request #10392 from peppy/fix-editor-seek-modifier
Seek at 4x normal speed when holding shift (not 2x)
2020-10-06 19:19:41 +09:00
Dan Balasescu
39a1171a35
Merge pull request #10389 from peppy/labelled-slider-bar-2020
Add the most basic implementation of LabelledSliderBar feasible
2020-10-06 19:02:24 +09:00
Dan Balasescu
4036412387
Merge branch 'master' into labelled-slider-bar-2020 2020-10-06 18:29:20 +09:00
Dan Balasescu
e2d081e3cc
Merge pull request #10388 from peppy/editor-setup-placeholder-text
Add placeholder text/colour when no beatmap background is specified yet
2020-10-06 18:29:01 +09:00
Dan Balasescu
786b2592e8
Merge pull request #10387 from peppy/settings-item-ihascurrentvalue
Make SettingsItem conform to IHasCurrentValue
2020-10-06 18:28:15 +09:00
Dean Herbert
b1a64f89d7 Increase backwards seek magnitude when the track is running
This matches osu-stable. When the track is running, seeking backwards
(against the flow) is harder than seeking forwards. Adding a mutliplier
makes it feel much better.

Note that this is additive not multiplicative because for larger seeks
the (where `amount` > 1) we don't want to jump an insanely huge amount -
just offset the seek slightly to account for playing audio.
2020-10-06 17:53:12 +09:00
Dean Herbert
3ce234d552 Seek at 4x normal speed when holding shift
This matches osu-stable 1:1. Not sure if it feels better or not but
let's stick with what people are used to for the time being.
2020-10-06 17:47:25 +09:00
Dean Herbert
87bf3bdc16 Add the most basic implementation of LabelledSliderBar feasible 2020-10-06 17:26:06 +09:00
Dean Herbert
28756d862b Add placeholder text/colour when no beatmap background is specified yet 2020-10-06 17:21:01 +09:00
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
Dan Balasescu
461fa22e74
Merge pull request #10381 from peppy/ios-update-notifications
Add update notifications for iOS builds
2020-10-06 14:36:49 +09:00
Dan Balasescu
cfdff2389d
Merge pull request #10380 from peppy/fix-cross-thread-disclaimer
Fix disclaimer potentially running same code from two different threads
2020-10-06 13:23:10 +09:00
Dean Herbert
5e10ac418b Add update notifications for iOS builds 2020-10-06 13:19:52 +09:00
Dean Herbert
46f6e84a33 Fix disclaimer potentially running same code from two different threads 2020-10-06 12:33:57 +09:00
Dean Herbert
798dc9bc25
Merge pull request #10377 from bdach/reenable-gameplay-sample-playback-test
Re-enable and fix gameplay sample playback test
2020-10-06 08:22:49 +09:00
Bartłomiej Dach
9eeac759b8 Re-enable and fix gameplay sample playback test 2020-10-05 21:22:32 +02:00
Dean Herbert
3630aa30d4
Merge pull request #10315 from peppy/colourise-control-point-table
Colourise control point table
2020-10-05 21:29:59 +09:00
Dan Balasescu
783a463772
Merge branch 'master' into colourise-control-point-table 2020-10-05 20:47:06 +09:00
Dan Balasescu
54f1bcf2ce
Merge pull request #10313 from peppy/control-point-timeline-representation
Display all control point information on the main editor timeline
2020-10-05 20:46:52 +09:00
Dan Balasescu
141b8eb766
Merge pull request #10374 from peppy/ignore-failing-test
Temporarily ignore failing gameplay samples test
2020-10-05 20:46:21 +09:00
Dean Herbert
6bc0afdafb Fix remaining conflicts 2020-10-05 20:09:18 +09:00
Dan Balasescu
051ea7eda9
Merge pull request #10329 from peppy/editor-file-drop-support
Add drag-drop support in editor setup screen for audio and background images
2020-10-05 20:05:41 +09:00
Dan Balasescu
ef8e6b3d96
Merge pull request #10310 from peppy/osu-selection-flip-rotate-buttons
Add buttons to flip/rotate the current selection by known amounts
2020-10-05 20:02:09 +09:00
Dean Herbert
606a08c6ad Temporarily ignore failing gameplay samples test 2020-10-05 20:01:12 +09:00
Dean Herbert
e20c28f166
Merge pull request #10306 from smoogipoo/dynamic-difficulty-icon 2020-10-05 19:40:18 +09:00
Dan Balasescu
a920342a09
Merge branch 'master' into editor-file-drop-support 2020-10-05 19:28:44 +09:00
Dan Balasescu
2b824787c1
Guard against potential nullref 2020-10-05 19:28:13 +09:00
Dean Herbert
ba55256fb4
Merge branch 'master' into control-point-timeline-representation 2020-10-05 19:24:28 +09:00
Dan Balasescu
6d50a1ed7d
Merge branch 'master' into osu-selection-flip-rotate-buttons 2020-10-05 19:17:33 +09:00
Dan Balasescu
08f7b18dbe
Merge pull request #10294 from peppy/osu-selection-scaling
Add selection scale and rotate support
2020-10-05 19:17:19 +09:00
Dan Balasescu
cbf697336f
Merge pull request #10323 from peppy/skin-slider-end-circle-support
Add legacy skin "sliderendcircle" support
2020-10-05 19:02:38 +09:00
Dan Balasescu
b20dc793cc
Merge pull request #10321 from LittleEndu/trail-density
Try to match stable's cursor trail density
2020-10-05 19:02:28 +09:00
Dan Balasescu
b8ee9c3793
Merge pull request #10312 from peppy/more-timeline-toggles
Move control points display to base timeline class (and add toggles)
2020-10-05 18:57:27 +09:00
Dan Balasescu
2df5ea8ba8
Merge branch 'master' into osu-selection-scaling 2020-10-05 18:47:17 +09:00
Dean Herbert
2ed43c14f8
Merge branch 'master' into editor-file-drop-support 2020-10-05 17:48:06 +09:00
Dean Herbert
f0b5ba9534
Merge branch 'master' into skin-slider-end-circle-support 2020-10-05 17:45:51 +09:00
Dean Herbert
365a38e92f
Merge branch 'master' into dynamic-difficulty-icon 2020-10-05 17:37:01 +09:00
Dan Balasescu
16a599850c
Merge branch 'master' into more-timeline-toggles 2020-10-05 17:33:18 +09:00
Dan Balasescu
12c84df208
Merge pull request #10371 from peppy/fix-gameplay-seek-sample-pausing
Fix seeking in replays not correctly pausing samples
2020-10-05 17:13:43 +09:00
Dan Balasescu
0c93de858e
Merge pull request #10373 from peppy/fix-hitobject-samples-cut-off
Don't stop non-looping samples immediately when pausing
2020-10-05 17:13:11 +09:00
Dan Balasescu
38b99a5f42
Merge pull request #10352 from peppy/fix-spinner-rewind-crash
Fix spinner crashing on rewind
2020-10-05 16:26:22 +09:00
Dean Herbert
c622adde7a Rename method back and add xmldoc 2020-10-05 16:24:02 +09:00
Dean Herbert
d43ea68709
Merge branch 'master' into fix-gameplay-seek-sample-pausing 2020-10-05 16:21:28 +09:00
Dean Herbert
0605bb9b8d Fix incorrect parent state transfer 2020-10-05 16:20:29 +09:00
Dan Balasescu
421e061fd1
Merge pull request #10330 from peppy/editor-timing-screen-change-handling
Add change handler callbacks from timing screen / components
2020-10-05 16:10:46 +09:00
Dan Balasescu
d3e1da5922
Merge branch 'master' into editor-timing-screen-change-handling 2020-10-05 15:40:43 +09:00
Dan Balasescu
692ca87bec
Merge branch 'master' into fix-spinner-rewind-crash 2020-10-05 15:32:52 +09:00
Dean Herbert
a69b1636be Update tests 2020-10-05 15:18:28 +09:00
Dean Herbert
9f43dedf59 Fix missing line 2020-10-05 15:12:34 +09:00