1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 12:17:46 +08:00
Commit Graph

13268 Commits

Author SHA1 Message Date
miterosan
884ac71874
Merge branch 'master' into Private_Messages 2018-06-28 21:04:02 +02: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
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
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
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
smoogipoo
ede59f63f6 Merge remote-tracking branch 'origin/master' into make-loading-more-visible 2018-06-27 12:52:06 +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
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
smoogipoo
80501de4b9 Add legacy slider offsets 2018-06-27 12:09:21 +09:00
Dean Herbert
0f123734f5
Merge pull request #2827 from smoogipoo/editor-seek-snapping-fix
Fix editor not always scrolling beyond timing point beats
2018-06-27 12:03:46 +09:00
Dean Herbert
ac1bf3b092
Merge branch 'master' into editor-seek-snapping-fix 2018-06-27 11:08:19 +09:00
Dean Herbert
73994482d5
Merge pull request #2860 from peppy/fix-unauthorized-request
Fix API getting stuck in an endless loop under a certain unauthorized scenario
2018-06-26 22:37:50 +09:00
Dean Herbert
1b050ca68e
Merge branch 'master' into fix-unauthorized-request 2018-06-26 22:25:19 +09:00
Dan Balasescu
c58728d72e
Merge pull request #2883 from peppy/update-framework
Update framework and other nuget dependencies
2018-06-26 20:54:59 +09:00
Dan Balasescu
830ce0da4c
Merge branch 'master' into update-framework 2018-06-26 20:41:08 +09:00
smoogipoo
8a81fba1ea Other input states need to be considered for wheel bindings 2018-06-26 20:34:22 +09:00
Dean Herbert
f9e2aabbdb
Merge pull request #2635 from ekrctb/catch-droplet-fix
Use FastRandom for catch droplets and bananas positions
2018-06-26 20:32:50 +09:00
Dean Herbert
1a8aa6eab1 Fix regression causing new combos to once again not be respected 2018-06-26 20:13:55 +09:00
smoogipoo
f1dfe04bd9 Fix broken conditional 2018-06-26 20:13:44 +09:00
smoogipoo
02b733a42e Merge remote-tracking branch 'origin/master' into fix-unauthorized-request 2018-06-26 19:58:51 +09:00
Dean Herbert
f7f17bab78
Merge branch 'master' into catch-droplet-fix 2018-06-26 19:29:15 +09:00
Dean Herbert
a8579c49f9
Merge pull request #2628 from ekrctb/catch-stable-hyper
Modify catch hyperdash behavior to match to stable
2018-06-26 13:29:35 +09:00
Dean Herbert
cc746c0dde Merge remote-tracking branch 'upstream/master' into ekrctb-catch-stable-hyper 2018-06-26 13:02:39 +09:00