Commit Graph

300 Commits

Author SHA1 Message Date
0014a8404e GetHyperDashEndGlowColour() -> GetHyperDashCatcherAfterImageColour() 2020-04-04 23:12:42 +03:00
19f39fe632 Change AdditiveTarget into a set method 2020-04-04 19:33:52 +03:00
fbe95a52e3 Remove unnecessary restating comment 2020-04-04 19:29:41 +03:00
50604dc7b2 Update catcher hyper-dashing colours on changing hyper-dash state only 2020-04-04 19:29:06 +03:00
f3bcb0628c Add helper methods for retrieving other skin hyper-dash colours 2020-04-04 19:09:52 +03:00
ee247e58c8 Merge branch 'catch-hyperdash-fruit-colouring' into catch-hyperdash-catcher-colouring 2020-04-04 18:07:29 +03:00
f67a62699b Merge remote-tracking branch 'upstream/master' into catch-hyperdash-fruit-colouring 2020-04-03 19:57:52 +03:00
51db361c32 Update usages of Animation and Video in line with framework changes 2020-04-03 16:00:06 +09:00
f653d37058 Merge pull request #8521 from peppy/remove-scale-down-to-fit
Remove ScaleDownToFit as it was implemented without enough safety
2020-03-31 23:22:04 +09:00
b7d73f96ea Fix osu!catch catcher hit area being too large 2020-03-31 18:33:09 +09:00
1fce7cce01 Remove ScaleDownToFit as it was not implemented without enough safety 2020-03-31 13:50:04 +09:00
c2e31f53f1 Merge remote-tracking branch 'upstream/master' into catch-hyperdash-fruit-colouring 2020-03-28 07:44:11 +03:00
2949e8dc27 Reduce spread of stacked fruit 2020-03-26 16:58:23 +09:00
fecafc2e48 Fix additive target accidentally clears all of the added containers
It sets the AdditiveTarget on the object initializer but then the catcher is set to Child which wipes up all of the existing children (containers added by Catcher through AdditiveTarget setter)
2020-03-26 09:14:44 +03:00
302fdd834a Add support for custom hyper-dash catcher colouring 2020-03-26 09:11:59 +03:00
e3a7c8a124 Make catcher trails colouring per container 2020-03-26 09:11:31 +03:00
0a368f13d9 Add default hyper-dash colour constant on Catcher 2020-03-26 05:42:11 +03:00
388cf5c83a Fix catch positional data being incorrectly recorded 2020-03-24 15:38:54 +09:00
96a849f897 Add remaining replay recorders 2020-03-24 14:55:49 +09:00
f904859943 Remove leftover unused private methods 2020-03-15 15:45:13 +01:00
d3f23b766e Move across to new file in line with master 2020-03-14 17:06:23 +09:00
9ea0e83f3d Merge branch 'master' into correct-trail-animation-frame 2020-03-14 16:57:35 +09:00
45dfb22bd5 Centralise additive texture creation 2020-03-14 16:39:44 +09:00
202c8cdad8 Add braces to satisfy codefactor 2020-03-14 15:35:59 +09:00
1733519c3a Split out CatcherArea nested classes and reorder methods 2020-03-13 12:59:30 +09:00
c30bfa79e7 Merge branch 'master' into correct-trail-animation-frame 2020-03-13 09:55:41 +09:00
bc2a1cdb62 Apply suggestions 2020-03-12 12:04:36 +03:00
e46c070d95 Add test scene 2020-03-11 23:09:29 +03:00
09b9983286 Fix CatcherAnimationState is Fail if missing banana shower 2020-03-11 21:14:07 +03:00
03c8140d3c Merge branch 'master' into add-catcher-animation-states 2020-03-11 14:53:14 +09:00
73b225ad62 Make catcher's trail reflect the current animation frame rather than play the full animation 2020-03-11 14:28:13 +09:00
1bad2ff879 Load all catcher states ahead-of-time to avoid blocking loads 2020-03-11 13:45:55 +09:00
eab544b49f Add afterimage glow when entering hyperdash 2020-03-10 16:41:08 +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
2aa649e073 Fix catcher dropping juice streams due to it considering ignored judgements 2020-02-26 19:31:49 +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
a55b2b8918 Add explosion effect when catching fruit 2020-02-21 18:09:50 +09:00
a7e3e8ace9 Merge branch 'master' into catch-drawable-namespace 2020-02-21 10:31:31 +09:00
8f5d3896f6 Remove unnecessary cast by changing method siganture 2020-02-20 15:45:47 +09:00
ea0bbd2926 Rename drawable namespace to avoid clashes with framework class 2020-02-19 18:01:59 +09:00
e1140d7c91 Fix caught fruit radius being incorrect due to moved scale 2020-02-19 17:28:40 +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
c51e5a8c1d Fix osu!catch fruit exploding multiple timed is skin is changed during explode animation 2020-02-18 12:11:30 +09:00
a3e0f84fcc Update catcher test to use SkinnableTestScene 2020-02-17 17:19:46 +09:00
d8ce1fd86c Fix osu!catch not handling all vertical space 2020-01-30 13:23:39 +09:00