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

30287 Commits

Author SHA1 Message Date
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
Bartłomiej Dach
748f7fcd8b Rename constants 2020-05-25 20:20:26 +02:00
Bartłomiej Dach
ca68d94cf7 Invert if to reduce nesting 2020-05-25 20:18:17 +02:00
Bartłomiej Dach
719da48922 Rename delegate argument 2020-05-25 20:11:00 +02:00
Shivam
4c3900cfc8 Remove unnecessary comments, simplify initialPath and clarified TestScene name 2020-05-25 17:16:40 +02: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
smoogipoo
cd65fc860b Remove extra default application 2020-05-25 16:15:55 +09:00
Dean Herbert
b44beb4137 Remove double resolution of EditorClock 2020-05-25 15:40:45 +09:00
Dean Herbert
ed83ef202a Merge branch 'master' into editor-clock-cache 2020-05-25 15:39:42 +09:00
Dan Balasescu
2f9cc0c15a
Merge pull request #9078 from peppy/editor-move-distance-snap-grid
Move distance snap grid to osu! HitObjectComposer
2020-05-25 15:05:30 +09:00
Dan Balasescu
4e84d1394d
Merge pull request #9088 from peppy/fix-placement-default-application
Fix defaults not being applied correctly to blueprints after StartTime is changed
2020-05-25 14:46:19 +09:00
Dan Balasescu
d8a03bca39
Merge branch 'master' into editor-move-distance-snap-grid 2020-05-25 14:35:11 +09:00
Dan Balasescu
1dce2a1eae
Merge pull request #9096 from turbedi/fix_benchmark
Fix running osu.Game.Benchmarks
2020-05-25 14:22:18 +09:00
Dan Balasescu
b732ea6763
Merge branch 'master' into fix-placement-default-application 2020-05-25 14:17:28 +09:00
Dan Balasescu
ebb22b2aa7
Merge branch 'master' into fix_benchmark 2020-05-25 13:45:33 +09:00
Dan Balasescu
115397e331
Merge pull request #9101 from peppy/skin-export
Add the ability to export skins
2020-05-25 13:28:46 +09:00
Dean Herbert
6904d5d247 Remove unnecessary override 2020-05-25 13:12:53 +09:00
Dean Herbert
1977affe7e Fix OpenInNativeExplorer not working correctly for wrapped storages 2020-05-25 09:27:11 +09:00
Olle Kelderman
a174117880 fix flowcontainer order properly and removed todo as its decided to do nothing there for now 2020-05-25 00:55:10 +02:00
Olle Kelderman
1062e07ec1 refactor and implemented feedback:
- button text change
- renamed ActionableInfoWithNumberBox to ResolutionSelector and moved the clamping logic inside it
- also removed the ugly right margin and added the FillFlowContainer
2020-05-24 22:24:46 +02:00
Dean Herbert
8ab65e4c5d Move implementation into own class 2020-05-24 23:15:24 +09:00
Dean Herbert
904d17224f Fix english 2020-05-24 23:09:49 +09:00
Dean Herbert
234fa28445 Ensure export filename is valid 2020-05-24 22:34:31 +09:00
Dean Herbert
f277b0c99f Use better formatting for skin display (matching BeatmapMetadata) 2020-05-24 22:30:56 +09:00
Dean Herbert
c071fe6140 Add the ability to export skins 2020-05-24 13:44:11 +09:00
Dean Herbert
6ab20c7851 Merge branch 'master' into editor-clock-transform 2020-05-24 12:55:50 +09:00
Dean Herbert
decdc58de5 Merge branch 'editor-clock-cache' into editor-clock-transform 2020-05-24 12:55:47 +09:00
Berkan Diler
de60d509e8 Remove redundant string interpolation to fix CI 2020-05-23 17:01:34 +02:00