1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:07:26 +08:00
Commit Graph

20942 Commits

Author SHA1 Message Date
Dean Herbert
fc0a938b83
Merge branch 'master' into fix-music-controller-skipping-more-than-once 2019-08-02 07:42:19 +02:00
Dean Herbert
daeed4767f
Merge branch 'master' into refactor-conversion-test 2019-08-02 07:42:12 +02:00
Dean Herbert
7a89476688
Update cake to resolve CI issues (#5566)
Update cake to resolve CI issues
2019-08-02 07:40:59 +02:00
smoogipoo
ba3f8a643a Update cake 2019-08-02 14:19:11 +09:00
Dan Balasescu
7076c9a882
Merge branch 'master' into fix-music-controller-skipping-more-than-once 2019-08-02 14:03:38 +09:00
Dean Herbert
0e0c2e3333
Merge branch 'master' into refactor-conversion-test 2019-08-02 06:32:10 +02:00
Dean Herbert
770b228fdb
Fix ticks in repeat spans being returned in reverse order (#5559)
Fix ticks in repeat spans being returned in reverse order
2019-08-02 06:31:11 +02:00
Dean Herbert
69c2723d90
Merge branch 'master' into refactor-conversion-test 2019-08-02 05:34:05 +02:00
Dan Balasescu
ccb989a191
Merge pull request #5552 from UselessToucan/do_not_check_cursor_visibility_on_each_update
Remove redundant ScreenshotManager.Update override
2019-08-02 00:47:14 +09:00
David Zhao
6ab9f645a2
Remove usage of no longer needed property 2019-08-01 21:26:52 +09:00
David Zhao
f0941a11b5
Remove no longer needed property 2019-08-01 21:22:08 +09:00
Dan Balasescu
67b6964eb6
Merge branch 'master' into do_not_check_cursor_visibility_on_each_update 2019-08-01 19:46:01 +09:00
Dan Balasescu
6e718664e1
Merge pull request #5557 from EVAST9919/user-loved
Add loved beatmaps section into user overlay
2019-08-01 19:43:14 +09:00
smoogipoo
e9eea7157d Trim unnecessary file contents 2019-08-01 18:04:57 +09:00
smoogipoo
2ae8cba24d Add hardrock spinner test 2019-08-01 17:58:20 +09:00
smoogipoo
a7376c6027 Merge remote-tracking branch 'smoogipoo/fix-slider-generation-order' into fix-catch-hr
# Conflicts:
#	osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
2019-08-01 17:43:33 +09:00
smoogipoo
0ff1c6184b Add generation comment 2019-08-01 17:36:20 +09:00
smoogipoo
f2b940f930 Add tests 2019-08-01 17:31:37 +09:00
smoogipoo
a2468e599b Fix ticks in repeat spans being returned in reverse order 2019-08-01 17:31:37 +09:00
Andrei Zavatski
0f36088ef8 Add loved section 2019-08-01 11:06:29 +03:00
iiSaLMaN
d772bbaf8c Simplify disposing 2019-08-01 10:04:04 +03:00
smoogipoo
b978727422 Add stream + repeat slider tests 2019-08-01 14:58:17 +09:00
smoogipoo
8a1d690011 Reset tick offsets 2019-08-01 14:57:54 +09:00
smoogipoo
423857f403 Fix inverted offset 2019-08-01 14:57:07 +09:00
Dean Herbert
b3044ed18d
Merge pull request #5554 from smoogipoo/workingbeatmap-beatmap-mods
Move IApplicableToBeatmap application to WorkingBeatmap
2019-08-01 13:31:18 +08:00
David Zhao
d05b9b1734 Use dummyAPI and move load check into MusicController 2019-08-01 14:19:45 +09:00
smoogipoo
e2420af10c Fix applying mods to the wrong beatmap 2019-08-01 13:37:52 +09:00
smoogipoo
38a2b9d92b Fix multiple invocations by using a separate variable 2019-08-01 13:33:00 +09:00
smoogipoo
fdc6a3958d Make catch HR properly utilise the RNG 2019-08-01 13:10:20 +09:00
Dean Herbert
116354b4c4
Merge branch 'master' into workingbeatmap-beatmap-mods 2019-08-01 13:08:27 +09:00
Dean Herbert
54b89114b1
Merge pull request #5553 from smoogipoo/simplify-generics
Remove generics from IApplicableToBeatmap
2019-08-01 13:07:24 +09:00
smoogipoo
ed4dda1936 Support beatmap conversion tests with mods 2019-08-01 12:49:01 +09:00
smoogipoo
0108700793 Make beatmap conversion test use WorkingBeatmap 2019-08-01 12:44:10 +09:00
smoogipoo
bc80fa11bb Mode IApplicableToBeatmap application to WorkingBeatmap 2019-08-01 12:41:46 +09:00
smoogipoo
8a64ab0384 Remove generics from IApplicableToBeatmap 2019-08-01 12:39:32 +09:00
Roman Kapustin
852079d438 Remove redundant ScreenshotManager.Update override 2019-08-01 01:35:42 +03:00
DTSDAO
0f1dd8a46e Undo #5533 for causing crashes 2019-07-31 21:44:57 +08:00
iiSaLMaN
3af1aaeabe Unsubscribe from Completed event on old beatmap 2019-07-31 15:19:02 +03:00
David Zhao
351b6e6259 Add new options test 2019-07-31 19:47:41 +09:00
David Zhao
980686f6bf get tests running again 2019-07-31 19:30:35 +09:00
Dean Herbert
3a2e0fbba5
Merge pull request #5546 from smoogipoo/score-mod-multipliers
Apply mod multipliers to the score
2019-07-31 18:09:37 +09:00
smoogipoo
e57663b39c Apply mod score multipliers 2019-07-31 17:55:22 +09:00
smoogipoo
6bfac9f8e4 Remove protected ctor 2019-07-31 17:50:13 +09:00
David Zhao
f81e691bf5 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-07-31 16:03:14 +09:00
David Zhao
5aece2d5f2 fix tests 2019-07-31 16:03:05 +09:00
Dean Herbert
8caf9ade01
Add support for legacy skin "cursormiddle" display (#5465)
Add support for legacy skin "cursormiddle" display

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-31 00:26:19 +09:00
Dean Herbert
26909dc580
Update follower count API source (#5397)
Update follower count API source
2019-07-31 00:24:18 +09:00
Dean Herbert
d5a5a866e1
Update framework (#5532)
Update framework
2019-07-31 00:04:02 +09:00
Dean Herbert
9335ebeb55 Fix missing anchor/origin specification 2019-07-30 23:45:55 +09:00
Dean Herbert
f6b6fa9633 Add disappeared null check 2019-07-30 23:44:47 +09:00