1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:22:55 +08:00
Commit Graph

29511 Commits

Author SHA1 Message Date
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
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
Berkan Diler
edc46d1dce Fix osu.Game.Benchmarks 2020-05-23 16:18:55 +02:00
Dean Herbert
224a3ff462
Add note about gameplay mechanics in osu!lazer 2020-05-23 11:44:45 +09:00
Dean Herbert
a8dbfe2791 Fix distance snap grid not disappearing when exiting playfield 2020-05-23 10:57:17 +09:00
Dean Herbert
bc82c2d3b7 Move drawable addition above event bindings 2020-05-23 10:44:53 +09:00
Dean Herbert
a3a9810344 Merge branch 'master' into editor-clock-cache 2020-05-23 00:44:04 +09:00
Dean Herbert
1311fd2f64
Merge branch 'master' into editor-move-distance-snap-grid 2020-05-23 00:42:43 +09:00
Dean Herbert
95a30226ea
Merge pull request #9021 from smoogipoo/mania-distance-snap-grid
Implement beat snapping grid for mania's editor
2020-05-23 00:42:16 +09:00
Dean Herbert
e763473e23
Merge pull request #9089 from frenzibyte/fix-beatmap-lookup-cache-not-disposed
Fix beatmap-online-lookup-queue potentially throwing on OsuGameTestScene
2020-05-23 00:40:46 +09:00
Salman Ahmed
3d3cc2c15e
Dispose BeatmapOnlineLookupQueue cache download request 2020-05-22 17:26:37 +03:00
Dean Herbert
83f4ba107f Fix defaults not being applied correctly to blueprints after StartTime is changed 2020-05-22 22:42:17 +09:00
Dean Herbert
12d65f305f Simplify and fix incorrect seeking 2020-05-22 22:11:55 +09:00
Dan Balasescu
7846445b45
Merge branch 'master' into mania-distance-snap-grid 2020-05-22 21:17:25 +09:00
Dan Balasescu
ae133c2c2d
Merge pull request #9070 from peppy/editor-position-snap
Refactor editor snapping logic and add osu!mania beat snapping support
2020-05-22 21:16:19 +09:00
smoogipoo
d5ea076427 Merge branch 'master' into results-screen-condensed-panel 2020-05-22 20:45:39 +09:00
smoogipoo
80388feac4 Disable scroll user scroll controls in list 2020-05-22 20:39:02 +09:00
smoogipoo
6bcc4c95cc Schedule api callback 2020-05-22 20:19:23 +09:00
smoogipoo
5005986049 Cleanup test 2020-05-22 20:18:47 +09:00
Dan Balasescu
9ede390c60
Merge branch 'master' into editor-position-snap 2020-05-22 20:05:18 +09:00
Dean Herbert
1486a44b55 Merge branch 'editor-clock-cache' into editor-clock-transform 2020-05-22 19:51:02 +09:00
Dean Herbert
8b79e14225 Fix remaining test regressions 2020-05-22 19:49:49 +09:00
Dean Herbert
ffaec9f9f7 Merge branch 'master' into editor-clock-cache 2020-05-22 19:35:05 +09:00
Dean Herbert
5ea33f4c04 Fix incorrect rounding in DragBar 2020-05-22 19:23:07 +09:00
Dean Herbert
af30d1201f Fix slider path control point blueprint not working correctly 2020-05-22 18:57:28 +09:00