Commit Graph

143 Commits

Author SHA1 Message Date
ccca7e0b25 more specific type droppedObjectContainer 2020-12-09 10:35:01 +09:00
0213f77b4b Move catcher state changing logic to OnNewResult method 2020-12-08 14:28:30 +09:00
e82ca66d3e Fix depth of dropped objects 2020-12-04 10:21:54 +09:00
5a5c956ced Move more logic to Catcher from CatcherArea 2020-12-03 16:44:36 +09:00
2eb2c934cc Refactor fruit dropping code
- The repeated `Remove` call was quadratic complexity.
  Now it is linear time.
2020-12-03 16:44:36 +09:00
8d32cca5d6 Use more specific type for caught object 2020-12-03 16:44:36 +09:00
a231a4aa6d Remove unused method 2020-12-03 16:44:36 +09:00
af45e8d97b Don't delay caught fruit loading
It is not needed anymore because
some code in DCHO is moved from `load` to constructor.
2020-12-03 16:44:36 +09:00
d1076778fd Convert switch expression to switch statement 2020-12-01 09:50:52 +09:00
05aaa377e7 Don't use CreateDrawableRepresentation in CatcherArea 2020-11-30 19:02:49 +09:00
3c3229ac4b Remove redundant StaysOnPlate 2020-11-25 07:59:45 +09:00
ab7251d742 Move members to PalpableCatchHitObject 2020-11-24 19:57:37 +09:00
4ca9a69de2 Use new hit results in catch 2020-09-29 16:33:38 +09:00
fcf3a1d13c Encapsulate combo display better 2020-09-12 22:40:34 +02:00
ba8a4eb6f0 Move osu!catch combo counter display to inside CatcherArea 2020-09-01 20:17:21 +03:00
28534c1599 Reintroduce PalpableCatchHitObject at data level 2020-08-20 19:06:26 +02:00
2624862e32 Fix osu!catch dropping fruit appearing above the plate instead of behind 2020-07-15 20:58:09 +09:00
3278a1d7d8 Standardize osu!catch coordinate system
There were two coordinate systems used:
- 0..512 (used in osu!stable)
- 0..1 (relative coordinate)

This commit replaces the usage of
the relative coordinate system to
the coordinate system of 0..512.
2020-07-02 00:21:45 +09:00
95de2c6f7f Mark Catcher.additiveTarget to never be null
And provide empty containers instead.
2020-04-22 05:04:07 +03:00
ee62739b08 Simplify process of adding catcher trails 2020-04-21 11:44:39 +03:00
19f39fe632 Change AdditiveTarget into a set method 2020-04-04 19:33:52 +03: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
1733519c3a Split out CatcherArea nested classes and reorder methods 2020-03-13 12:59:30 +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
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
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
3864ea6ca3 Move position updating logic back to CatcherArea 2019-11-29 18:24:46 +09:00
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00