1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 10:57:27 +08:00
Commit Graph

16766 Commits

Author SHA1 Message Date
jorolf
796044ee7d *I should've rechecked the code after the master merge* 2019-02-25 23:53:44 +01:00
jorolf
501dab7b32 Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-02-25 23:49:01 +01:00
jorolf
c680d63694 Don't show the supporter text if the user already has supporter status 2019-02-25 23:44:43 +01:00
Dean Herbert
d6cfce8bce
Merge pull request #3732 from UselessToucan/notify_track_completion_failure
Use `Track.Completed` event
2019-02-25 20:48:03 +09:00
Dean Herbert
2fbb0b4e6f Don't use this 2019-02-25 19:34:03 +09:00
Dean Herbert
140de26a56 Merge remote-tracking branch 'upstream/master' into notify_track_completion_failure 2019-02-25 19:30:35 +09:00
Dean Herbert
638e89effa
Merge pull request #4331 from nyquillerium/ScrollingExitFix
Fix song select background not being exited in time for main menu
2019-02-25 19:29:23 +09:00
Dean Herbert
ed10024b22 Fix some formatting / variable naming 2019-02-25 19:29:09 +09:00
Dean Herbert
a4e119786f Fix some weird formatting 2019-02-25 19:19:28 +09:00
Dean Herbert
6881563346
Merge branch 'master' into ScrollingExitFix 2019-02-25 19:11:05 +09:00
David Zhao
59ad470eed Clean up test code 2019-02-25 18:41:13 +09:00
David Zhao
ad1bce3585 Fix song select backround not being exited in time 2019-02-25 18:40:19 +09:00
Dan Balasescu
de381f3457
Merge pull request #4102 from peppy/slider-fix
Fix slider button tracks and general replay accuracy
2019-02-25 16:37:21 +09:00
Dean Herbert
f0b26550d1
Merge branch 'master' into slider-fix 2019-02-25 16:12:52 +09:00
smoogipoo
7fde21b51a Rename testcase 2019-02-25 16:09:12 +09:00
smoogipoo
d06f38b3f3 Cleanup 2019-02-25 15:57:07 +09:00
Dean Herbert
e1f522fa44
Merge pull request #4324 from peppy/fix-direct-tab-activation
Remove limitation stopping search updates when no query present in direct
2019-02-25 12:03:22 +09:00
Dan Balasescu
b6ede6778c
Merge branch 'master' into fix-direct-tab-activation 2019-02-25 11:48:38 +09:00
Dean Herbert
33a7256b8b
Merge pull request #4307 from DJKero/master
Fix key counters being ordered incorrectly
2019-02-25 10:12:59 +09:00
Dean Herbert
cd3f3be79d
Merge branch 'master' into master 2019-02-25 09:59:18 +09:00
Dean Herbert
287870f1e1 Remove limitation stopping search updates when no query present in direct
Closes #4310.
2019-02-24 23:35:18 +09:00
Dean Herbert
b02a4ef764
Merge pull request #4318 from peppy/fix-download-failure-exception
Avoid fatal exceptions being thrown on download failure
2019-02-24 16:29:26 +09:00
Dan Balasescu
bd83a95a4f
Merge branch 'master' into fix-download-failure-exception 2019-02-24 16:01:18 +09:00
Dan Balasescu
a9bb3b7ae0
Merge pull request #4321 from peppy/fix-playback-rate-display
Fix regression causing playback rate to display incorrectly
2019-02-24 15:53:32 +09:00
Dean Herbert
2281a0235d Fix regression causing playback rate to display incorrectly 2019-02-24 15:27:06 +09:00
Dean Herbert
4e06d5c7cd Avoid fatal exceptions being thrown on download failure
Closes #4313.
2019-02-24 00:33:11 +09:00
Dean Herbert
69b9de5acd Update framework 2019-02-23 21:13:53 +09:00
Dean Herbert
90cae0a69c Simplify RulesetInputManager further 2019-02-23 15:48:34 +09:00
Dean Herbert
6d3c0e3191 Holy sheet 2019-02-23 14:39:55 +09:00
Dean Herbert
97d324ab11 Remove unnecessary using 2019-02-23 14:39:25 +09:00
Dean Herbert
7f5780c615 Simplify SliderBall and fix incorrect key up handling
Was not processing timeToAcceptAnyKeyAfter when cursor was outside valid tracking area, but should have been.
2019-02-23 14:38:53 +09:00
Dean Herbert
acc160042b Move beatmap construction to step 2019-02-23 14:38:53 +09:00
Dean Herbert
0c218eb0d5 Apply new RulesetInputManager logic
Run UpdateSubTree twice to ensure correctness
2019-02-23 14:14:41 +09:00
Dean Herbert
c877801441 Use game clock as reference 2019-02-23 14:14:34 +09:00
Dean Herbert
5f792fbacc Fix tests not running more than once 2019-02-23 14:14:34 +09:00
Dean Herbert
39b203375f Ensure variable isolation over multiple test runs 2019-02-23 14:14:34 +09:00
Dean Herbert
6b81315009 Avoid test frame being the precise time of slider end 2019-02-23 14:14:34 +09:00
Dean Herbert
2bd75fd8ae Fix some huge oversights 2019-02-23 14:14:34 +09:00
Dean Herbert
e9a22a5c5d Not sure what a bm is 2019-02-23 14:14:34 +09:00
Dean Herbert
2a544f66ea Formatting, ordering and simplification 2019-02-23 14:14:34 +09:00
Dean Herbert
490fb86f9e Make base class abstract and add documentation 2019-02-23 14:14:34 +09:00
Dean Herbert
3495aa645f Update headers 2019-02-23 14:14:34 +09:00
David Zhao
d59ba8cfe9 Rename base player test class to RateAdjustedBeatmap, refactor input tests 2019-02-23 14:14:34 +09:00
David Zhao
d80424b1d6 Remove load checks and place one in the constructor 2019-02-23 14:14:34 +09:00
David Zhao
f5aaf13363 Move all beatmap initialization logic into constructor 2019-02-23 14:14:34 +09:00
David Zhao
da922c603d Nuke whitespace again 2019-02-23 14:14:34 +09:00
David Zhao
01c4671fc8 phantom whitespace 2019-02-23 14:14:34 +09:00
David Zhao
ebcc041ac8 Nuke whitespace 2019-02-23 14:14:34 +09:00
David Zhao
4353002fde Fix dynamic compilation, use slidertick judgements 2019-02-23 14:14:34 +09:00
David Zhao
1f93fde246 Check for beatmap load state before performing test 2019-02-23 14:14:34 +09:00