1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 22:07:28 +08:00
Commit Graph

17330 Commits

Author SHA1 Message Date
Dean Herbert
4390e163fc
Merge branch 'master' into storyboard-clock 2019-03-18 21:11:41 +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
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
Dan Balasescu
719056c485
Merge pull request #4458 from peppy/mod-ramp-hotfix
Fix "wind" mods adjusting rate twice
2019-03-14 15:23:22 +09:00
smoogipoo
71d79f0a39 Fix ticks not being generated at the minimum tick distance 2019-03-14 15:20:12 +09:00
smoogipoo
2815c3b07c Remove unused variable 2019-03-14 15:12:26 +09:00
Jamie Taylor
69eb4ef983
Change updateMetrics parameter to be optional 2019-03-14 13:35:49 +09:00
Dean Herbert
0042cc5337
Merge branch 'master' into mod-ramp-hotfix 2019-03-14 13:02:29 +09:00
Dean Herbert
7d56ce63d3 Fix test case failures 2019-03-14 12:31:17 +09:00
Dean Herbert
85c518f146 Change logic to better handle external adjustments 2019-03-14 12:29:16 +09:00
Dean Herbert
108dcd0a92 Update framework 2019-03-13 21:58:50 +09:00
Dean Herbert
c40e24739b Fix weird application logic 2019-03-13 21:37:33 +09:00
Dan Balasescu
5d23a966d7
Fix incorrect application logic for rate fallback
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-13 20:55:33 +09:00
Dean Herbert
dd6fbccb56 Slight refactoring of order for readability 2019-03-13 19:57:45 +09:00
Dean Herbert
7fc8e07f12
Merge branch 'master' into prevent-null-lookup 2019-03-13 19:40:44 +09:00
Dean Herbert
7d637691d7 Use non-guest user ID for non-guest user 2019-03-13 19:01:42 +09:00
Dan Balasescu
6aa3dc9f55
Use non-real domain
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-13 18:56:48 +09:00
Dean Herbert
0ce8bcffe1
Merge pull request #4461 from nyquillerium/mania-judgemetns
Fix mania miss judgement animations disappearing too quickly
2019-03-13 18:44:39 +09:00
Dean Herbert
3d4a80957f Improve comment 2019-03-13 18:27:54 +09:00
Dean Herbert
1617e2a729
Merge branch 'master' into mania-judgemetns 2019-03-13 18:17:42 +09:00
Dean Herbert
8f00f2290a Log issues 2019-03-13 14:56:41 +09:00
Dean Herbert
241e336c21 Fix break parsing 2019-03-13 14:22:16 +09:00
Jamie Taylor
7a2af5634c
Merge remote-tracking branch 'upstream/master' into prevent-null-lookup 2019-03-13 14:13:50 +09:00
Jamie Taylor
e6449db8e3
Null metrics on null beatmap for transition animation 2019-03-13 14:13:42 +09:00
Jamie Taylor
04b88cdd11
Add required types for BeatmapDetailArea test case 2019-03-13 14:13:42 +09:00
Dean Herbert
f4c505709a Use parsing methods in more places
Limiting scope to beatmap decoding for this pass. Can expand to skin/storyboard in the future.
2019-03-13 13:56:31 +09:00
Dean Herbert
f8b5cf8c8e Add extra clamping of endTime to startTime 2019-03-13 13:46:41 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
Dan Balasescu
a35d9ccc09
Apply clamping suggestion
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-13 12:35:05 +09:00