1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 02:27:25 +08:00
Commit Graph

29497 Commits

Author SHA1 Message Date
Dan Balasescu
74ad734270
Merge pull request #9125 from peppy/fix-save-causing-delete
Fix saving in the editor causing the current beatmap to change
2020-05-27 21:40:58 +09:00
Dan Balasescu
0891c47d09
Merge pull request #9124 from peppy/editor-hide-non-alive-blueprints-default
Hide non-alive selection blueprints by default
2020-05-27 21:29:53 +09:00
Dan Balasescu
c54bebfa11
Merge pull request #9126 from peppy/editor-selection-range-expand
Allow drag selections to occur from outside the playfield
2020-05-27 21:29:46 +09:00
Dean Herbert
9928bff664
Merge branch 'master' into results-screen-condensed-panel 2020-05-27 21:19:33 +09:00
Dean Herbert
9a060cfb3a Allow drag selections to occur from outside the playfield 2020-05-27 20:44:15 +09:00
Dean Herbert
f989f1aa00 Change event flow to avoid firing store delete events on update 2020-05-27 16:08:47 +09:00
Dean Herbert
f5c974dd89 Hide non-alive selection blueprints by default 2020-05-27 13:40:16 +09:00
Dean Herbert
cbd563e80b Rename to IHasDuration 2020-05-27 12:38:39 +09:00
Dean Herbert
b8e0a6f127 Move sett from EndTime to Duration 2020-05-27 12:37:44 +09:00
Dean Herbert
6b5b215299 Split out IHasPath from IHasCurve to better define hitobjects 2020-05-26 17:44:47 +09:00
Dan Balasescu
ad10a7f0b2
Merge pull request #9114 from peppy/editor-handle-movement-default
Allow HandleMovement by default
2020-05-26 17:34:23 +09:00
smoogipoo
c07a33b24f Fix ctor accessibility 2020-05-26 17:31:50 +09:00
Dean Herbert
7e1e26de2a Allow HandleMovement by default 2020-05-26 17:04:31 +09:00
smoogipoo
de0b6ec9f1 Create abstract implementation 2020-05-26 17:00:41 +09:00
smoogipoo
c86a003ef9 Adjust transition for smaller sizes 2020-05-26 16:27:41 +09:00
smoogipoo
a1ece4f308 Add expansion/contraction test 2020-05-26 16:26:58 +09:00
smoogipoo
906a317a3d Reduce casting 2020-05-26 16:26:53 +09:00
smoogipoo
1768cbd131 Format score same as expanded panel 2020-05-26 15:56:56 +09:00
smoogipoo
b53b97e1cb Merge branch 'master' into results-screen-condensed-panel 2020-05-26 15:54:21 +09:00
smoogipoo
aaf5596f9c Cleanup test 2020-05-26 15:54:07 +09:00
smoogipoo
51e74687f8 Merge branch 'editor-scrolling-playfield-support' of https://github.com/peppy/osu; branch 'results-screen-condensed-panel' of https://github.com/smoogipoo/osu into results-screen-condensed-panel 2020-05-26 15:39:39 +09:00
Dan Balasescu
c3c2c6c0f5
Merge pull request #9108 from peppy/editor-scrolling-playfield-support
Simplify scrolling ruleset editor implementation by adding base position support
2020-05-26 15:38:10 +09:00
Dan Balasescu
b5de30ef3d
Merge branch 'master' into editor-scrolling-playfield-support 2020-05-26 14:46:58 +09:00
Dan Balasescu
1761721b54
Merge pull request #9112 from peppy/editor-selection-handler-custom-context-menu
Allow SelectionHandler to provide custom context menu items without local hover check
2020-05-26 14:46:52 +09:00
Dan Balasescu
2b7f86a1ae
Merge pull request #9111 from peppy/fix-dim-tests
Fix test failures on TestSceneUserDimBackgrounds
2020-05-26 14:45:22 +09:00
Dean Herbert
d041de63ce Allow SelectionHandler to provide custom context menu items without local hover check 2020-05-26 13:53:09 +09:00
Dean Herbert
0cc6d6d97c
Merge pull request #9033 from smoogipoo/applydefaults-cancellation
Add cancellation token support to CreateNestedHitObjects()
2020-05-26 12:04:06 +09:00
Dean Herbert
2bf066d72c Rename tests to match convention 2020-05-26 11:30:36 +09:00
Dean Herbert
13bd6be8a3 Convert wait steps into until steps 2020-05-26 11:29:56 +09:00
Dean Herbert
417e31d77f Rename function for consistency 2020-05-26 10:17:56 +09:00
Dean Herbert
d69111c665 Fix spelling of breadth 2020-05-26 10:17:34 +09:00
Dan Balasescu
98f3d790df
Merge pull request #9107 from peppy/editor-remove-size-propagation
Remove unnecessary size propagation in HitObjectComposer
2020-05-25 23:55:26 +09:00
Dan Balasescu
2717c5699e
Merge pull request #9102 from peppy/fix-wrapped-storage-native-open
Fix OpenInNativeExplorer not working correctly for wrapped storages
2020-05-25 23:43:19 +09:00
Dean Herbert
cf341998c3 Update framework 2020-05-25 22:55:21 +09:00
Dean Herbert
f8d9c044df Merge branch 'master' into fix-wrapped-storage-native-open 2020-05-25 22:50:36 +09:00
Dean Herbert
8fc60d12c9 Add back comments 2020-05-25 22:09:09 +09:00
Dan Balasescu
98f49a4236
Merge pull request #9084 from peppy/editor-clock-transform
Transform seeks in editor to allow for better visual context
2020-05-25 22:07:56 +09:00
Dean Herbert
827345ed88 Fix mania offsets 2020-05-25 22:06:02 +09:00
Dean Herbert
e7442ec3a2 Remove need for ManiaSnapResult 2020-05-25 19:33:03 +09:00
Dean Herbert
2c16619ecd Move time to position conversion to ScrollingHitObjectContainer 2020-05-25 19:32:39 +09:00
Dean Herbert
b8130bd366 Make mania selection blueprint abstract 2020-05-25 19:31:09 +09:00
Dean Herbert
af5fac471e Remove unnecessary size propagation in HitObjectComposer 2020-05-25 19:29:46 +09:00
Dan Balasescu
5cf3d53534
Merge pull request #9106 from ppy/dependabot/nuget/SharpCompress-0.25.1
Bump SharpCompress from 0.25.0 to 0.25.1
2020-05-25 19:15:00 +09:00
smoogipoo
ebe2e97372 Merge branch 'master' into editor-clock-transform 2020-05-25 19:01:04 +09:00
dependabot-preview[bot]
c4665048db
Bump SharpCompress from 0.25.0 to 0.25.1
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.25.0 to 0.25.1.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.25...0.25.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-25 09:34:26 +00:00
Dan Balasescu
9655c382a2
Merge pull request #9105 from ppy/dependabot/nuget/DiffPlex-1.6.2
Bump DiffPlex from 1.6.1 to 1.6.2
2020-05-25 18:33:07 +09:00
dependabot-preview[bot]
d09b579aee
Bump DiffPlex from 1.6.1 to 1.6.2
Bumps [DiffPlex](https://github.com/mmanela/diffplex) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/mmanela/diffplex/releases)
- [Commits](https://github.com/mmanela/diffplex/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-25 09:32:24 +00:00
Dan Balasescu
0728c2cd84
Merge pull request #9083 from peppy/editor-clock-cache
Cache EditorClock as its own type
2020-05-25 18:31:03 +09:00
smoogipoo
6f4cd6111c Drop obsoletion status for now 2020-05-25 16:50:49 +09:00
smoogipoo
bc35bc5efb Merge branch 'master' into applydefaults-cancellation 2020-05-25 16:45:30 +09:00