Commit Graph

2446 Commits

Author SHA1 Message Date
7f579850dd Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 17:03:23 +09:00
414c40d298 Reverse inheritance order of SkinnableSound's pause logic 2020-09-30 15:45:14 +09:00
59ce9fcab9 Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 15:35:55 +09:00
d6f3beffb6 Use existing bindable flow instead 2020-09-29 12:50:17 +09:00
cc9bf67d42 Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-29 12:10:24 +09:00
66e89f56d9 Merge pull request #10280 from peppy/editor-fix-spinner-extending
Fix extending spinners in editor causing them to disappear temporarily
2020-09-28 19:41:44 +09:00
b6bc829bd5 Guard against nulls (load not run) 2020-09-28 17:46:22 +09:00
fd58a24183 Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-28 17:45:48 +09:00
1b6ef60f36 Merge branch 'master' into editor-fix-slider-drag-after-snaking 2020-09-28 17:45:04 +09:00
e60e47ff66 Unbind events on disposal 2020-09-28 17:41:10 +09:00
63b5b8b841 Fix sliders not dragging correctly after snaking has begun
Closes #10278.
2020-09-28 17:33:00 +09:00
8692c24dfc Fix extending spinners in editor causing them to disappear temporarily 2020-09-28 17:20:36 +09:00
5237fa7bf2 Remove unused local in case statement 2020-09-28 16:37:54 +09:00
467a16bf75 Fix fade out extension logic (and make it generally look better for sliders) 2020-09-28 16:21:20 +09:00
6095446f10 Fix autoplay generators failing on empty hitobjects lists 2020-09-28 15:38:54 +09:00
b2261f03e2 Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-25 20:21:35 +09:00
346d14d40b Rename variables to match 2020-09-25 17:45:19 +09:00
22511c36c3 Ensure toggles are not instantiated more than once for safety 2020-09-25 17:43:09 +09:00
ae68dcd962 Add ternary toggle buttons to editor toolbox selection 2020-09-25 16:38:12 +09:00
0f8551e9ea Merge branch 'editor-ternary-states' into new-combo-toggle 2020-09-25 15:36:33 +09:00
bca774a0d4 Allow BlueprintContainer to specify toggles 2020-09-25 14:09:31 +09:00
7df8b5bce7 Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-25 13:17:03 +09:00
d9e8ac6842 Add support for slider end snapping 2020-09-24 16:24:35 +09:00
44be0ab762 Add basic osu! object to object snapping 2020-09-24 16:24:35 +09:00
ba160aab76 Fix large construction/disposal overhead on beatmaps with hitobjects at same point in time 2020-09-23 15:41:43 +09:00
625c146460 Merge pull request #10199 from peppy/fix-editor-binding-crash
Fix bindings not correctly being cleaned up in OsuHitObjectComposer
2020-09-23 12:38:18 +09:00
53788968c8 Merge pull request #10205 from peppy/fix-composer-distance-snap-selection
Fix compose mode not showing distance snap grid when entering with a selection
2020-09-23 11:55:42 +09:00
b1f7cfbd5b Reduce children levels in RingPiece 2020-09-22 17:34:21 +09:00
8e43266460 Fix compose mode not showing distance snap grid when entering with a selection 2020-09-22 16:02:07 +09:00
25bf160d94 Fix missing GameplayClock in some tests 2020-09-21 22:30:14 +09:00
3f788da06d Fix SPM changing incorrectly with playback rate changes 2020-09-21 19:39:54 +09:00
842f8bea55 Fix bindings not correctly being cleaned up in OsuHitObjectComposer 2020-09-21 18:15:33 +09:00
1e09d8fd1a Merge branch 'master' into catch-combo-counter 2020-09-21 17:53:00 +09:00
141fbbf5bb Merge pull request #10180 from smoogipoo/beatmap-conversion-cancellation
Make beatmap conversion support cancellation tokens
2020-09-17 22:30:46 +09:00
c7d24203ce Make beatmap conversion support cancellation tokens 2020-09-17 17:40:05 +09:00
009e1b4445 Make Spinner use cancellation token 2020-09-17 17:05:24 +09:00
0761aab42f Merge branch 'master' into catch-combo-counter 2020-09-15 17:20:31 +09:00
a8b405791a Fix non-convert slider and spinner serialization 2020-09-14 17:32:32 +09:00
23b51e8f7f Merge pull request #10106 from smoogipoo/score-recalc 2020-09-10 19:05:42 +09:00
ef44c7d063 Merge branch 'master' into score-recalc 2020-09-10 18:30:41 +09:00
df1537f2a0 Update framework 2020-09-10 18:10:39 +09:00
6f6adb61d7 Merge pull request #10099 from peppy/add-editor-tool-icons
Add icons for editor toolbox tools
2020-09-09 22:22:58 +09:00
fb2aced3ac Add toggle for distance snap 2020-09-09 19:15:35 +09:00
c9f5005efd Add icons for editor toolbox tools 2020-09-09 18:40:01 +09:00
117c7ec6b2 Merge branch 'master' into score-recalc 2020-09-09 14:38:36 +09:00
4680728b9c Merge branch 'master' into update-dcc-exclusions 2020-09-07 18:01:44 +09:00
025ead195c Merge branch 'master' into fix-sliderborder-more-thicker 2020-09-07 15:40:34 +09:00
1143d5d992 Update class exclusion for dynamic compilation 2020-09-04 20:41:08 +09:00
569a56eccb Revert "Move adjustment to LegacySkinConfiguration as a default value"
This reverts commit 18927304f1.
2020-09-04 13:33:23 +03:00
25e142965d Strongly type and expose default beatmap information icon implementations for other rulesets 2020-09-04 15:01:32 +09:00