1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 07:33:21 +08:00
Commit Graph

32690 Commits

Author SHA1 Message Date
Dean Herbert
a6d1484ad5 Add arbirary precision specification for now 2020-10-07 14:26:01 +09:00
Dan Balasescu
aae4a74d14
Merge branch 'master' into editor-setup-screen-difficulty-adjust 2020-10-06 20:11:44 +09:00
Dan Balasescu
c803be2dd2
Merge pull request #10385 from peppy/fix-slider-end-circle-fallback-case
Fix incorrect sliderendcircle fallback logic
2020-10-06 20:10:51 +09:00
Dan Balasescu
50872e3839
Merge pull request #10390 from peppy/editor-setup-sections-container
Split editor setup screen up into sections
2020-10-06 20:07:56 +09:00
Dan Balasescu
7d4b495197
Merge pull request #10395 from peppy/editor-timeline-show-repeats
Add repeats display to timeline blueprints
2020-10-06 19:53:50 +09:00
Dan Balasescu
e1b5c83ae6
Merge pull request #10386 from peppy/fix-stacked-circles-visibility
Make stacked hitcircles more visible when using default skin
2020-10-06 19:48:07 +09:00
Dan Balasescu
300423579e
Merge pull request #10394 from peppy/add-back-obsoleted-bindable-prop
Add obsoleted Bindable property back to SettingsItem for compatibility
2020-10-06 19:43:24 +09:00
Dean Herbert
461be02e6f Update with underlying changes 2020-10-06 19:34:21 +09:00
Dean Herbert
87d4e86cad Merge branch 'editor-setup-sections-container' into editor-setup-screen-difficulty-adjust 2020-10-06 19:30:32 +09:00
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
Dean Herbert
06a51297a3 Use content instead of exposing the flow container 2020-10-06 19:26:57 +09:00
Dean Herbert
a2796d2c01 Add repeats display to timeline blueprints 2020-10-06 19:22:35 +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
Dean Herbert
e64cee10b8 Add obsoleted Bindable property back to SettingsItem for compatibility 2020-10-06 19:07:31 +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
064d081138
Merge branch 'master' into editor-setup-sections-container 2020-10-06 18:36:11 +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
7e8ab1cb95 Add description text 2020-10-06 17:36:18 +09:00
Dean Herbert
7a20a34aff Add support to EditorBeatmap to update all hitobjects 2020-10-06 17:36:18 +09:00
Dean Herbert
6d7f12ad4b Add basic difficulty setting sliders 2020-10-06 17:33:50 +09:00
Dean Herbert
13b67b93a5 Add difficulty section 2020-10-06 17:33:50 +09:00
Dean Herbert
e1a6f47d90 Add the most basic implementation of LabelledSliderBar feasible 2020-10-06 17:33:50 +09:00
Dean Herbert
505dd37a75 Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:33:50 +09:00
Dean Herbert
98fe5f78ee Split setup screen up into sections (and use a SectionContainer) 2020-10-06 17:29:08 +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
Dean Herbert
048507478e Join declaration and specification 2020-10-06 14:12:46 +09:00
Dean Herbert
ed982e8dd1 Make stacked hitcircles more visible when using default skin 2020-10-06 14:09:31 +09:00
Dean Herbert
767a2a10bd Fix incorrect sliderendcircle fallback logic
Correctly handle the case where a skin has "sliderendcircle.png" but not
"sliderendcircleoverlay.png".
2020-10-06 13:56:42 +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