Commit Graph

141 Commits

Author SHA1 Message Date
bb1ed387ef fixed missed bit and comments 2023-04-22 10:54:50 +02:00
847b63066b fix 2023-04-21 22:44:31 +02:00
836c884aae Fix circle-size based scale being applied twice to caught fruit
Closes #22968.
2023-03-29 18:03:22 +09:00
812a4b412a Move judgement result revert logic to Playfield
Previously, some judgement results were not reverted
when the source DHO is not alive (e.g. frames skipped in editor).
Now, all results are reverted in the exact reverse order.
2023-01-19 19:57:13 +09:00
b88091262d Remove #nullable disable from Catch.UI 2023-01-15 17:29:35 +09:00
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
a215d009fe Update Remove/RemoveRange/RemoveAll calls in line with framework changes 2022-08-29 15:57:40 +09:00
31a447fda0 Update parameter discards 2022-06-24 21:26:19 +09:00
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
38edeac710 Moved the logic to the bottom as placeCaughtObject is otherwise not called yet 2021-11-18 20:24:40 +01:00
95891bc655 Moved clear plate logic to Catcher class 2021-11-18 20:03:41 +01:00
cab254dc81 Merge branch 'master' into var-inspections-update 2021-10-27 14:02:49 +09:00
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
e5050b90a5 Don't assume catcher dash speed is 2x the walk speed 2021-10-26 20:09:48 +09:00
a92d499d7a Convert usages of BeatmapDifficulty to IBeatmapDifficultyInfo 2021-10-01 16:55:50 +09:00
e79150d4da Reorder constructor arguments for HitExplosionEntry 2021-08-12 21:48:08 +02:00
8c8a64fe6e Add legacy hit lighting implementation 2021-08-11 21:23:33 +02:00
95a58ca366 Store judgement directly in hit explosion entry 2021-08-11 21:23:33 +02:00
a960a28d06 Replace "end glow" terminology with "hyper-dash after-image"
Because the is "end glow" is when a hyper-dash is *started*, the name was confusing.
The "after-image" was already used in the code as a synonym of "end glow" inconsistently.
2021-07-28 19:11:22 +09:00
2b107d624a Merge pull request #14024 from ekrctb/trail-generation
Move catcher trail generation logic to `CatcherArea` to remove mutual dependency of `Catcher` and `CatcherTrailDisplay`
2021-07-28 19:06:44 +09:00
da69867fd4 Move catcher trail generation logic to CatcherArea 2021-07-27 19:07:37 +09:00
de68fd12b3 Move catcher trail colouring logic to CatcherTrailDisplay 2021-07-27 19:07:37 +09:00
8045534fa5 Remove outdated comment and simplify code 2021-07-26 18:18:24 +09:00
4282442278 Make Catcher.body private as it is no longer needed by CatcherTrailDisplay 2021-07-26 17:58:34 +09:00
c08130398c Add some comments 2021-07-26 17:58:34 +09:00
bb046fa3b8 Move catcher trail generation logic to Catcher
It resolves mutual dependency of `Catcher` and `CatcherTrailDisplay`.
Trail generation logic is moved to `Catcher`.
The generation logic no longer uses delayed scheduling because the hidden state is hard to manage.
Instead, the last time a trail is generated is calculated and used.
The new logic has a different behavior when the dash key is pressed in succession under 50ms, but it is not noticeable for normal plays.
2021-07-26 17:51:59 +09:00
d9f9ad35be Move catcher base size constant to Catcher. 2021-07-21 16:43:24 +09:00
41169fbdaf Add [NotNull] 2021-07-19 20:20:10 +09:00
b88ee3c1a1 Pass DroppedObjectContainer via constructor instead of DI
It is now just one level deep, so it is not beneficial to use DI here.
This effectively reverts ae09c23e.
2021-07-19 20:11:49 +09:00
01961fe4f9 Merge pull request #13747 from ekrctb/catcher-flip
Don't flip catcher plate contents when catcher changes direction
2021-07-06 00:02:23 +09:00
83c80291d4 Don't flip catcher plate contents in legacy skin 2021-07-02 23:23:21 +09:00
fbba32647e Decouple direction of catcher from its scale 2021-07-02 23:22:39 +09:00
170513568b Move caught object stack vertical offset logic 2021-07-02 20:43:47 +09:00
ae09c23e4e Resolve DroppedObjectContainer via DI 2021-06-24 16:09:13 +09:00
16d5893535 Add DroppedObjectContainer class 2021-06-24 15:51:54 +09:00
df16d4bacc Remove CurrentTexture from catcher 2021-06-14 20:26:33 +09:00
ca061c4b93 Factor out SkinnableDrawable component of the catcher to SkinnableCatcher 2021-06-14 19:41:51 +09:00
7f7c2c73e0 Move catcher movement logic of Catcher to CatcherArea 2021-06-11 15:39:06 +09:00
05b46b4743 Merge pull request #13379 from ekrctb/catcher-sprite
Refactor osu!catch catcher sprite to factor out skinning logic
2021-06-10 16:52:17 +09:00
7df971a970 ICatcherPiece -> ICatcherSprite 2021-06-08 22:10:13 +09:00
194c78f67a Make current state bindable protected 2021-06-08 22:08:54 +09:00
0192549d6c Refactor catcher sprite to use skinned piece pattern 2021-06-08 21:29:41 +09:00
6017ef3825 Merge branch 'master' into fix-skin-sample-lookup 2021-06-08 17:37:36 +09:00
8e20f90ed5 Use seeded RNG for catch explosion animation
The animation is always the same when a replay is rewound or a beatmap is played multiple times.
2021-06-04 19:54:46 +09:00
181f1da3d3 Maintain catch hit explosion by lifetime entries
- Fix hit explosion not showing when a replay is rewound to a time after a hit object is caught
2021-06-04 19:46:50 +09:00
70a844ac10 Remove allowFallback parameters completely 2021-05-27 14:50:42 +09:00
dc2bc462b8 Expose internal catcher width calculation methods 2021-04-22 17:27:23 +09:00
84a7138223 Update tests to better support stack regeneration cases 2021-04-22 17:13:19 +09:00
3e1002fbf3 Improve osu!catch caught fruit placement algorithm 2021-04-22 17:06:28 +09:00
ddf1b560f3 Remove catcher fade during hyperdash
Closes https://github.com/ppy/osu/issues/12472.
2021-04-20 18:18:51 +09:00