Commit Graph

1425 Commits

Author SHA1 Message Date
66a0f3334d Merge branch 'master' into fix-perfect-judgements 2020-03-10 23:50:57 +09:00
8ec2c35c4f Change origin of nested objects inside JuiceStream to fix visibility issues 2020-03-10 19:35:10 +09:00
9ad519e5a5 Remove fade and custom InitialLifetimeOffset 2020-03-10 19:35:10 +09:00
4daba48a1d Stop rotating DrawableCatchHitObjects at the top level 2020-03-10 19:30:31 +09:00
14192c069f Don't play samples on catching a tiny droplet 2020-03-10 18:05:44 +09:00
5329b222f6 Fix hyperdash test having a zero-length juice stream 2020-03-10 17:49:51 +09:00
eab544b49f Add afterimage glow when entering hyperdash 2020-03-10 16:41:08 +09:00
2b33594400 Add random rotation and scale factors to osu!catch bananas 2020-03-10 15:59:13 +09:00
7069cef9ce Add catcher kiai/fail animation states 2020-03-10 15:28:37 +09:00
a6cf6207aa Merge pull request #8192 from peppy/fix-hyperdash
Fix hyperdash not initiating correctly when juice streams are present
2020-03-10 14:00:44 +09:00
0d18ea1d29 Add animation and fallback catcher support 2020-03-10 12:36:25 +09:00
e7f1f0f38b Fix hyperdash not initiating correctly when juice streams are present 2020-03-10 10:21:32 +09:00
6d051d9e42 Fix perfect mod failure cases 2020-03-02 13:25:56 +09:00
b5306d16cf Merge pull request #8005 from peppy/fix-catcher-dropping-streams
Fix catcher dropping juice streams due to it considering ignored judgements
2020-02-26 20:58:22 +09:00
2aa649e073 Fix catcher dropping juice streams due to it considering ignored judgements 2020-02-26 19:31:49 +09:00
e5927447fc Fix hyperdash fruit not visible on custom skins 2020-02-26 19:22:46 +09:00
015a39abc7 Fix hyperdash fruit not visible on default skin 2020-02-26 19:22:31 +09:00
bf36dc10a5 Fix invalid cast
Since introduction of IgnoreJudgement and its usage in JuiceStream
and BananaShower the hard cast in CatcherArea that was used to check
if the drawable hit object should cause the fruits on the plate explode
at the end of combo caused a hard crash instead, since IgnoreJudgement
was no longer deriving from CatchJudgement.

Replace the hard cast with a soft pattern-matched cast.
2020-02-25 23:21:54 +01:00
ffc7eaa3f2 Fix hitobjects with unknown lifetimes by enforcing non-null judgement
We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container
due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward
CreateJudgement() must be implemented and return a non-null judgement.

This fixes BananaShower and JuiceStreams in osu!catch.

This also makes HitObject abstract and cleans up convert HitObject implementations.
2020-02-23 13:49:06 +09:00
a55b2b8918 Add explosion effect when catching fruit 2020-02-21 18:09:50 +09:00
8d48008dd5 Merge branch 'master' into split-out-pulp-formations 2020-02-21 11:45:06 +09:00
9344f62cf0 Merge branch 'master' into catch-droplet-rotation 2020-02-21 11:09:02 +09:00
a7e3e8ace9 Merge branch 'master' into catch-drawable-namespace 2020-02-21 10:31:31 +09:00
8a6a424893 Merge branch 'master' into catch-droplet-rotation 2020-02-21 10:31:02 +09:00
6468bfa543 Apply adjustments 2020-02-21 10:01:38 +09:00
049975b5a4 Use kebaberize shorthand 2020-02-20 15:45:54 +09:00
8f5d3896f6 Remove unnecessary cast by changing method siganture 2020-02-20 15:45:47 +09:00
5551343cf3 Throw instead of null return 2020-02-20 15:45:25 +09:00
2869128e11 Update in line with combo colour API changes 2020-02-20 15:41:57 +09:00
13873ff1b6 Split out pulp formations into own piece classes 2020-02-19 23:32:56 +09:00
ea0bbd2926 Rename drawable namespace to avoid clashes with framework class 2020-02-19 18:01:59 +09:00
7b27f6b378 Add droplet rotation animation 2020-02-19 17:55:40 +09:00
e1140d7c91 Fix caught fruit radius being incorrect due to moved scale 2020-02-19 17:28:40 +09:00
4c4140ae54 Adjust droplets to match stable 2020-02-19 15:55:22 +09:00
5261579531 Fix indices in beatmap not being transferred to children (and being off by one) 2020-02-19 15:37:12 +09:00
69b5d5606a Fix nested catch objects not having a correct IndexInBeatmap 2020-02-19 15:32:24 +09:00
3f99d25e37 Use new UpdateComboColour method to simplify colouring 2020-02-19 15:28:29 +09:00
26fe15b038 Fix fruit representation not cycling as often as it should 2020-02-19 14:41:25 +09:00
aeb45c8442 Fix ordering of fruits to match stable 2020-02-19 14:31:43 +09:00
24e33abcbf Fix banana colouring for skins 2020-02-19 14:31:32 +09:00
3eeb60f60f Centralise and fix scaling 2020-02-19 14:31:14 +09:00
ce1a57550f Add droplet skinning support 2020-02-19 13:29:05 +09:00
0f85e81240 Fix handling of bindable changes in accent colour 2020-02-19 12:10:09 +09:00
f245fe5934 Fix catch combo colouring 2020-02-19 10:28:20 +09:00
ab863cdfd9 Fix incorrect scaling factor being applied 2020-02-19 09:52:29 +09:00
73e5018696 Move radius adjust local to fruit piece 2020-02-19 09:39:56 +09:00
ded7f5ff1b Merge branch 'master' into catch-fruit-skinning 2020-02-19 09:38:03 +09:00
65320ace47 Merge branch 'master' into fix-catch-skin-change 2020-02-18 13:41:00 +09:00
79f3249d37 Fix typo in method 2020-02-18 13:40:50 +09:00
b4887f9120 Fix dropping fruit as well (with tidying along the way) 2020-02-18 12:24:22 +09:00