RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,628 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

17628 Commits

Author SHA1 Message Date
Dean Herbert 45b8bfcfd3 Better protect not-generic DrawableRuleset 2019-03-20 11:31:03 +09:00
Dean Herbert 7b6d882ce6 Remove double-generic type 2019-03-20 11:29:16 +09:00
Dan Balasescu e5db0c973e
Merge branch 'master' into fix-background-loading 2019-03-20 11:25:23 +09:00
Dean Herbert 3b7a76aa4e Fix typo 2019-03-20 11:22:34 +09:00
Dean Herbert e59917ed03 Merge remote-tracking branch 'upstream/master' into correct-preview-loop 2019-03-20 10:58:15 +09:00
Dean Herbert 3cc1e822af
Merge pull request #4460 from smoogipoo/remove-unnecessary-code 
Remove unnecessary early return for maching beatmap IDs

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-03-20 10:43:54 +09:00
Dean Herbert 7b65d3437f
Merge branch 'master' into fix-background-loading 2019-03-20 10:33:53 +09:00
Dean Herbert 5b6ac7abdc Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-20 10:31:42 +09:00
Dean Herbert 461a0a5038
Merge branch 'master' into remove-unnecessary-code 2019-03-20 10:22:24 +09:00
Dean Herbert e0ab40b082 Rename missed files 2019-03-19 23:56:12 +09:00
Dean Herbert baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert 9ca6699c64 Merge remote-tracking branch 'upstream/master' into player-test-flexibility 2019-03-19 20:33:39 +09:00
David Zhao 3af3baf5e6 Fix merge 2019-03-19 20:22:21 +09:00
Dean Herbert 68f28326a2 Refactor RulesetContainer for readability 2019-03-19 20:21:31 +09:00
David Zhao a1000524ee
Merge branch 'master' into visual-settings-container 2019-03-19 20:17:12 +09:00
David Zhao a8e2072286 Make blurtarget private, improve documentation 2019-03-19 20:15:28 +09:00
Dean Herbert 46720d7d26
Merge pull request #4490 from peppy/update-framework 
Update framework
 2019-03-19 17:55:51 +09:00
Dean Herbert 8f5e02cbe5 Fix a couple of missed cases 2019-03-19 17:41:22 +09:00
Dean Herbert def15645f7 Update framework 2019-03-19 17:32:36 +09:00
Dean Herbert 025a266112 Update framework 2019-03-19 17:02:03 +09:00
Dean Herbert 6f372e7c07
Merge pull request #4489 from smoogipoo/fix-diffcalc-catcher-size 
Fix difficulty calculation using the pre-mod catcher size

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-03-19 16:49:38 +09:00
Dean Herbert 0fbc049f8d
Remove newline 2019-03-19 16:25:34 +09:00
Dean Herbert b65361b9fb
Merge pull request #4467 from peppy/disclaimer-support-text 
Disclaimer support text
 2019-03-19 16:24:57 +09:00
Dean Herbert e36ad3eb6b Add initial alpha in case 2019-03-19 16:11:22 +09:00
Dean Herbert d2007cfb38 Fix weird transition 2019-03-19 16:10:28 +09:00
Dean Herbert 83f3d3abde Merge remote-tracking branch 'upstream/master' into disclaimer-support-text 2019-03-19 16:02:34 +09:00
Dean Herbert 3327e2841a
Merge branch 'master' into fix-background-loading 2019-03-19 16:00:09 +09:00
smoogipoo dd60e3f1c4 Fix halfCatchWidth not being reset between runs 2019-03-19 15:59:04 +09:00
smoogipoo 57727ac184 Remove preprocess until a later point in time 2019-03-19 15:53:27 +09:00
Dean Herbert 1b192d722b
Merge pull request #4486 from smoogipoo/catch-hr-fixes 
Fix catch HR inaccuracies
 2019-03-19 15:47:30 +09:00
smoogipoo 5d9477e1e4 Fix difficulty calculation using the pre-mod catcher size 2019-03-19 15:35:14 +09:00
smoogipoo 5b07cce3cb Invert unintuitive variable 2019-03-19 14:12:10 +09:00
smoogipoo 1b696ade50 Refactor to reduce code complexity 2019-03-19 14:10:39 +09:00
David Zhao dc26e90a8d Remove unused usings 2019-03-19 13:16:06 +09:00
David Zhao df37973e84 Move showstoryboard into player 2019-03-19 13:13:19 +09:00
David Zhao 27a92e017c rename back to UserDimContainer 2019-03-19 13:06:14 +09:00
David Zhao f1b2073bf6 Merge remote-tracking branch 'upstream/master' into visual-settings-container 2019-03-19 13:01:05 +09:00
Dean Herbert 4031cad4f8
Merge pull request #4484 from nyquillerium/storyboard-clock 
Fix storyboards not having the correct gameplay clock
 2019-03-18 21:26:37 +09:00
Dean Herbert 4390e163fc
Merge branch 'master' into storyboard-clock 2019-03-18 21:11:41 +09:00
Dean Herbert f56e8d9bfe Make tests better 2019-03-18 20:33:56 +09:00
Dean Herbert 4f075f4740 Add more comprehensive testing 2019-03-18 20:33:43 +09:00
Dean Herbert 9433a97747 Add resume requesting support and fix exit scenarios 2019-03-18 20:33:43 +09:00
Dean Herbert 536b5e0dab Remove PausableGameplayContainer 2019-03-18 20:33:43 +09:00
Dean Herbert f13003c53b Simplify and localise storyboard logic in Player.cs 2019-03-18 20:33:43 +09:00
Dean Herbert bcaff9f7b4 Add basic pause tests 2019-03-18 20:33:43 +09:00
Dean Herbert 465c95e952 Refactor pause logic so GameplayClockContainer is in control 2019-03-18 20:33:43 +09:00
Dean Herbert 15dd132c92 Use SetUpSteps attribute 2019-03-18 20:32:36 +09:00
Dean Herbert a81461ba12 Add ability to test without nofail enabled 2019-03-18 20:32:28 +09:00
smoogipoo a26e237e26 Fix relative position being compared to time 2019-03-18 18:59:38 +09:00
smoogipoo bb8171b88a Fix HR mod being applied to non-fruit objects 2019-03-18 18:36:16 +09:00