1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:47:24 +08:00
Commit Graph

17362 Commits

Author SHA1 Message Date
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
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
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
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
David Zhao
acc133896b Correct null check 2019-03-18 18:19:59 +09:00
David Zhao
05147768d3 Permit nulls 2019-03-18 15:50:34 +09:00
David Zhao
6a26972284 DI gameplay clock for Storyboards 2019-03-18 15:25:54 +09:00
David Zhao
0024a0bdb2 Remove unused using 2019-03-18 14:35:03 +09:00
David Zhao
eac7672c6b Clean up debug logging 2019-03-18 14:03:54 +09:00
Dan Balasescu
9cabd12c45
Merge pull request #4473 from peppy/update-framework
Update framework
2019-03-18 12:06:36 +09:00
Dean Herbert
392a0a1d74
Merge branch 'master' into update-framework 2019-03-18 11:34:59 +09:00
Dan Balasescu
5692b85334
Merge pull request #4465 from peppy/api-testability
Use interface to access API
2019-03-18 11:13:54 +09:00
Dan Balasescu
e0b3149e32
Merge branch 'master' into api-testability 2019-03-18 10:59:06 +09:00
Dan Balasescu
107fb55172
Merge pull request #4475 from peppy/frame-stability-container
Extract RulesetInputManager's timing logic to FrameStabilityContainer
2019-03-18 10:59:01 +09:00
Dean Herbert
9ca4d9d4d1
Remove regions 2019-03-18 10:48:44 +09:00
Dean Herbert
c496f6e56b Fix usages of OnLoadComplete 2019-03-17 13:44:20 +09:00
Dean Herbert
771d676ba1 Split RulesetInputManager out to FrameStabilityContainer 2019-03-17 13:30:52 +09:00
Dean Herbert
8c6caf0b18 Update framework 2019-03-16 01:38:42 +09:00
Dean Herbert
14af957599
Merge pull request #4468 from smoogipoo/fix-min-tick-distance
Fix ticks not being generated at the minimum tick distance
2019-03-15 12:12:48 +09:00
Dean Herbert
36e5c09710
Merge pull request #4433 from nekodex/prevent-null-lookup
Don't perform lookup of beatmap stats unless an online id is present
2019-03-15 10:39:39 +09:00
Dean Herbert
0bcad1b534
Merge pull request #4472 from Joehuu/styling-1
Address styling issues on CodeFactor
2019-03-15 09:25:04 +09:00
Joehu
e31680e373 Address styling issues on CodeFactor 2019-03-14 16:05:54 -07:00
Dan Balasescu
bbf42fdd00
Merge pull request #4470 from smoogipoo/fix-catch-diffcalc-mods
Fix catch difficulty calculator not providing adjustment mods
2019-03-14 23:28:30 +09:00
smoogipoo
d13423fcdb Fix catch difficulty calculator not providing adjustment mods 2019-03-14 23:06:23 +09:00
Dean Herbert
5cbe42f5b8
Merge pull request #4469 from nekodex/fix-disappearing-slider-ball
Fix slider ball disappearing for one frame
2019-03-14 22:17:28 +09:00
Jamie Taylor
144b8761d4
Change "Redundant argument with default value" inspection from warning to hint. 2019-03-14 19:17:28 +09:00
Jamie Taylor
5cc670cd19
Prevent ApplyTransformsAt from propogating to SliderBall children 2019-03-14 19:17:28 +09:00
Dan Balasescu
b131ca12f1
Merge pull request #4462 from peppy/increase-osu-file-validation
Increase validation performed on .osu files to avoid hard crashes
2019-03-14 19:09:28 +09:00
Dan Balasescu
2c80f73a88
Merge branch 'master' into increase-osu-file-validation 2019-03-14 18:47:32 +09:00