1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 08:37:40 +08:00
Commit Graph

336 Commits

Author SHA1 Message Date
ekrctb
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
7cca990be4 Merge remote-tracking branch 'upstream/master' into framework-image-changes 2018-09-07 18:56:00 +09:00
Dean Herbert
9f67119ba9 Fix potential nullref in IsPresent override 2018-09-06 18:01:32 +09:00
Dean Herbert
4ff66bf531 Update in line with framework Image changes 2018-09-06 13:28:44 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
Dean Herbert
ffcad6e0f1 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
# Conflicts:
#	osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
2018-08-24 15:26:36 +09:00
smoogipoo
34b1abeca3 Remove sliderball's input override 2018-08-21 12:24:48 +09:00
smoogipoo
eb6f1ae72c Fix spinners providing one extra combo 2018-08-17 09:16:28 +09:00
smoogipoo
31f324945e Implement combo offsets 2018-08-15 11:47:31 +09:00
smoogipoo
3a7488767c Make HitObject not store the judgement 2018-08-06 11:50:18 +09:00
smoogipoo
741ec0021e Rename more judgement-related methods to "result" 2018-08-06 11:31:46 +09:00
smoogipoo
ab642b563f CreateJudgementResult -> CreateResult 2018-08-06 11:07:41 +09:00
smoogipoo
2a4994e5ce Make hitobjects only have one judgement + result 2018-08-03 15:38:48 +09:00
smoogipoo
4548d2c87f Make Rulesets.Osu use the new judgement result structure 2018-08-02 20:36:38 +09:00
smoogipoo
462f1033c0 Migrate Rulesets.Osu to the new judgement system 2018-08-02 15:21:23 +09:00
Dean Herbert
51506efd1a Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation 2018-07-31 16:49:31 +09:00
Dean Herbert
ea6cab498e Add comment 2018-07-31 16:47:13 +09:00
Dan Balasescu
04252293a7
Merge branch 'master' into fix-repeat-arrow-interpolation 2018-07-31 16:21:15 +09:00
Dean Herbert
874b5636e4 Merge remote-tracking branch 'upstream/master' into tgi74-more-skinning 2018-07-31 16:15:27 +09:00
Dean Herbert
976653fdf9 Minor formatting fixes 2018-07-31 16:13:52 +09:00
Dean Herbert
132241424d Apply FollowPoint alpha to inner container (should not affect legacy skins) 2018-07-31 15:59:06 +09:00
Dan Balasescu
0a7a2c83a8
Merge branch 'master' into fix-follow-circle-size 2018-07-31 15:41:15 +09:00
Dean Herbert
a98bb057e2 Fix follow circle being scaled far larger than it should be 2018-07-31 15:27:21 +09:00
tgi74000
36afae5a24 Remove the inner followcircle fade, Fade the entire followcircle instead 2018-07-30 13:43:02 +02:00
Dean Herbert
21f3ff6e77 Fix slider repeat points appearing far too late 2018-07-30 18:51:25 +09:00
Dean Herbert
f4cda695e6 Improve rotation handling in edge cases 2018-07-30 18:50:59 +09:00
tgi74000
c6aabc6d2d Move the FollowCircle border to its own container 2018-07-30 10:52:37 +02:00
Dean Herbert
a39188f762 Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation 2018-07-30 17:29:21 +09:00
tgi74000
84135c49ca Fix small FollowPoint rotation bug 2018-07-29 23:21:05 +02:00
tgi74000
18096490b6 Add support for followpoint skinning 2018-07-29 23:20:37 +02:00
tgi74000
4322475ad2 Add support for sliderb skinning (single frame only) 2018-07-29 22:29:07 +02:00
tgi74000
257c035f30 Add support for sliderfollowcircle skinning 2018-07-29 21:28:13 +02:00
tgi74000
52d9461f03 Add support for reversearrow skinning 2018-07-29 20:51:06 +02:00
tgi74000
2a9818a128 Add support for sliderscorepoint skinning 2018-07-29 20:42:05 +02:00
smoogipoo
ff2a3a6e92 Fix hitobjects not properly expiring if scrolling in the editor 2018-07-26 20:07:16 +09:00
Dean Herbert
10656be954 Add interpolation to repeat point during sliding 2018-07-23 16:55:38 +02:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
79af5cb0a0 Limit shake duration to ensure it doesn't overlap miss window 2018-07-06 17:24:30 +09:00
Dean Herbert
e041352690 Add comment regarding add/clear/remove overrides 2018-07-06 13:19:43 +09:00
Dean Herbert
48d90a67ae xmldoc and formatting 2018-07-06 12:13:23 +09:00
Dean Herbert
aa96d91762 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake 2018-07-06 11:57:32 +09:00
Dean Herbert
d453414070 Forward shakes from slider head objects to sliders 2018-07-06 11:52:58 +09:00
tgi74000
558b2622a7 Move the Shake logic to a new ShakeContainer 2018-07-05 15:48:54 +02:00
Dean Herbert
1d6609d9f3 Add common custom words to dotsettings dictionary
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
smoogipoo
45a4187923 Tidy up lookups to NestedHitObjects 2018-07-02 16:10:56 +09:00
Dan Balasescu
f35ea18755
Merge branch 'master' into hit-shake 2018-06-29 17:38:02 +09:00