1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 17:32:54 +08:00
Commit Graph

13266 Commits

Author SHA1 Message Date
Dean Herbert
8cf1553fd5 Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player 2018-06-29 20:30:42 +09:00
Dan Balasescu
9bf906df80
Merge pull request #2849 from peppy/fix-dialog-overlay-sounds
Fix dialog overlay playing double samples on show/hide
2018-06-29 18:59:46 +09:00
Dan Balasescu
513129d4a8
Merge branch 'master' into fix-dialog-overlay-sounds 2018-06-29 18:45:37 +09:00
Dan Balasescu
bacf91938c
Merge pull request #2899 from peppy/fix-negative-online-set-id
Fix beatmaps importing with -1 as online set ID
2018-06-29 18:45:29 +09:00
smoogipoo
1e696d247e Re-privatise 2018-06-29 18:33:28 +09:00
Dan Balasescu
8abcf68188
Merge branch 'master' into fix-negative-online-set-id 2018-06-29 18:29:36 +09:00
Dean Herbert
4212a9d0d7
Fix incorrect migration conditional 2018-06-29 18:23:53 +09:00
Dan Balasescu
34ddb79a96
Merge pull request #2915 from peppy/fix-delta-patching
Revert SharpCompress library to fix delta patching regression
2018-06-29 18:19:02 +09:00
Dan Balasescu
f149289c83
Merge branch 'master' into fix-delta-patching 2018-06-29 18:01:56 +09:00
Dean Herbert
d6fae1e4b9
Merge pull request #2778 from cl8n/catch-scoring
Add judgements to osu!catch
2018-06-29 17:50:39 +09:00
Dean Herbert
23aa2a2361
Merge branch 'master' into catch-scoring 2018-06-29 17:29:15 +09:00
Dan Balasescu
558969b2c5
Merge pull request #2914 from tgi74/beatmap-defaults
Add BeatmapInfo's stable defaults to fix compatibility with old beatmaps
2018-06-29 17:23:47 +09:00
Dean Herbert
e12ce3c2a8 Adjust xmldoc 2018-06-29 17:21:55 +09:00
Dean Herbert
098aeabc9e
Merge branch 'master' into catch-scoring 2018-06-29 17:16:14 +09:00
Dan Balasescu
845d1400dc
Merge branch 'master' into beatmap-defaults 2018-06-29 17:14:40 +09:00
Dan Balasescu
b6caccbe44
Merge pull request #2913 from peppy/fix-combo-index
Fix combo index being wrong
2018-06-29 17:12:44 +09:00
Dean Herbert
c0b65a6a73 Change default IsBonus definition and remove unnecessary overrides 2018-06-29 17:07:08 +09:00
Dean Herbert
cacabeb67e Remove unused field 2018-06-29 17:00:41 +09:00
Dean Herbert
750f5a86c3 Fix catch test failing due to disabled bindable 2018-06-29 16:49:11 +09:00
Dean Herbert
f1a35f77d2 Make bananas explode even on miss 2018-06-29 16:49:01 +09:00
Dean Herbert
f7fbf61306 Centralise judgement logic 2018-06-29 15:27:02 +09:00
Dean Herbert
3b262e0d16 Use better casting 2018-06-29 15:01:33 +09:00
Dean Herbert
0940715631
Merge branch 'master' into catch-scoring 2018-06-29 14:59:15 +09:00
Dean Herbert
70a119dde7 Remove unused/duplicate interface 2018-06-29 12:20:53 +09:00
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
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
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