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

13529 Commits

Author SHA1 Message Date
Dean Herbert
8742f41b7d Revert SharpCompress library to fix delta patching regression 2018-06-29 11:34:52 +09:00
tgi74000
b0739023ce Add BeatmapInfo's stable defaults to fix compatibility with old maps 2018-06-28 19:02:38 +02:00
Dean Herbert
9d4bc7b630 Fix combo index being wrong 2018-06-29 01:34:47 +09:00
Dan Balasescu
71b759841b
Merge pull request #2895 from peppy/fix-slider-colours
Fix slider heads displaying in incorrect colour
2018-06-28 23:19:59 +09:00
Dean Herbert
0a945e4709 Check whether initialised first 2018-06-28 22:44:40 +09:00
Dean Herbert
9b789fb8b0
Merge branch 'master' into fix-slider-colours 2018-06-28 22:36:19 +09:00
Dean Herbert
e4d494fb15
Merge pull request #2616 from HoutarouOreki/unifyDates
Make profile dates match style of website
2018-06-28 19:35:40 +09:00
Dean Herbert
8ba2ac922f Move to local components namespace 2018-06-28 19:23:56 +09:00
Dean Herbert
0ef5b8f464 Tidy up code, remove unnecessary string.Formats 2018-06-28 19:19:00 +09:00
Dean Herbert
98fec94693 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-unifyDates 2018-06-28 19:14:47 +09:00
smoogipoo
9fd9af22f0 Remove unused using 2018-06-28 18:40:12 +09:00
smoogipoo
94f1b2eeb8 Only custom sample banks > 1 modify the filename 2018-06-28 18:29:17 +09:00
smoogipoo
3a9a82c80c Add back legacy custom sample banks 2018-06-28 18:29:12 +09:00
smoogipoo
781095b96b Encapsulate the method to apply SampleControlPoints to SampleInfos 2018-06-28 18:29:07 +09:00
smoogipoo
2882981f9c Implement and use equality comparers for ControlPoint 2018-06-28 18:28:59 +09:00
Dean Herbert
8242236ddf
Merge pull request #2897 from Joehuu/fix-supporter-naming
Fix osu!supporter wording
2018-06-28 17:54:35 +09:00
Dean Herbert
be2d3d6ad4
Merge branch 'master' into fix-supporter-naming 2018-06-28 17:34:21 +09:00
Dean Herbert
a377e87bf6 Add missing licence headers 2018-06-28 17:34:04 +09:00
Dan Balasescu
3c8ae0389c
Merge pull request #2906 from peppy/fix-mania-processing-issues
Fix mania maps not being treated as mania maps in release builds
2018-06-28 17:25:15 +09:00
Dean Herbert
b1a3f01212 Fix mania maps not being treated as mania maps in release builds 2018-06-28 17:10:30 +09:00
Dean Herbert
663778b2f6
Merge pull request #2889 from smoogipoo/better-virtualtrack-handling
Handle virtual beatmap tracks more gracefully
2018-06-28 14:39:22 +09:00
Dean Herbert
3b0c4ff16b Tidy code 2018-06-28 14:08:15 +09:00
smoogipoo
d879b96d9f Implement storyboard samples 2018-06-28 13:43:56 +09:00
Dean Herbert
c44a81bdf5 Add word wrap support 2018-06-28 13:04:39 +09:00
smoogipoo
01b90aaffe Fix CI not passing 2018-06-28 11:58:06 +09:00
smoogipoo
2f2bd59844 Remove editor functionality from VirtualBeatmapTrack
/shrug
2018-06-28 11:47:41 +09:00
smoogipoo
87e8074cd2 Use a const for excess length 2018-06-28 11:46:56 +09:00
smoogipoo
c0c94e24b9 Use VirtualBeatmapTrack in testcases 2018-06-28 11:45:48 +09:00
Dean Herbert
ac7ee59d50 Add migration for previous incorrectly imported beatmaps 2018-06-28 10:48:01 +09:00
Dean Herbert
5ad122bfec Fix beatmaps importing with -1 as online set ID 2018-06-28 10:28:35 +09:00
Joehu
8518fce4a9 Fix osu!supporter naming 2018-06-27 17:57:55 -07:00
Dean Herbert
e197ebe4c5 Fix slider heads displaying in incorrect colour 2018-06-28 01:55:09 +09:00
ekrctb
1ed6a672f2 Update volme control
Use IMouseWheelBindingHandler for volume VolumeControlReceptor.
VolumeMeter is no longer an IKeyBindingHandler because it is unused.
2018-06-27 18:43:29 +09:00
smoogipoo
5640385f48 Update the length once during construction 2018-06-27 16:12:49 +09:00
smoogipoo
b4b28f8ae8 Make GetWaveform() not hard bail if errors occur 2018-06-27 16:07:18 +09:00
smoogipoo
b88c4464cb Make virtual beatmap tracks approximate beatmap length 2018-06-27 16:02:49 +09:00
Dean Herbert
527d7c29f2
Merge branch 'master' into fix-background-screen-crash 2018-06-27 16:00:59 +09:00
Dan Balasescu
6eb3e6c541
Merge pull request #2857 from peppy/make-loading-more-visible
Improve the visibility of the global loading animation
2018-06-27 13:06:43 +09:00
smoogipoo
f8acd9e451 Cleanup 2018-06-27 12:59:19 +09:00
Dean Herbert
0866dd11bd DefaultBackAction -> BackAction, defaults to last button
The last button is more commonly the escape condition.
2018-06-27 12:57:26 +09:00
smoogipoo
ede59f63f6 Merge remote-tracking branch 'origin/master' into make-loading-more-visible 2018-06-27 12:52:06 +09:00
Dean Herbert
d7ce4ab6fd Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player 2018-06-27 12:36:10 +09:00
Dean Herbert
2bb1550040
Merge pull request #2794 from smoogipoo/legacy-slider-offset
Add legacy slider offsets to osu!/osu!catch
2018-06-27 12:25:38 +09:00
Dean Herbert
bebf47d0d5
Merge branch 'master' into fix-dialog-overlay-sounds 2018-06-27 12:21:29 +09:00
Dean Herbert
10220a61a5 Use playfield size constants where possible 2018-06-27 12:18:00 +09:00
smoogipoo
0e6cc78d9a Add slider ticks conversion test 2018-06-27 12:09:40 +09:00
smoogipoo
6f65ad33f0 Output one value per slider nested hitobject 2018-06-27 12:09:40 +09:00
smoogipoo
0366b0f081 The tail circle will always be the last hitobject 2018-06-27 12:09:40 +09:00
smoogipoo
de3708ea3a Public + explicitly define test fixtures 2018-06-27 12:09:39 +09:00
smoogipoo
8e4dd58e68 Restore ignored unit tests 2018-06-27 12:09:39 +09:00