ekrctb
|
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 |
|
Dean Herbert
|
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 |
|
ekrctb
|
83c80291d4
|
Don't flip catcher plate contents in legacy skin
|
2021-07-02 23:23:21 +09:00 |
|
ekrctb
|
fbba32647e
|
Decouple direction of catcher from its scale
|
2021-07-02 23:22:39 +09:00 |
|
ekrctb
|
170513568b
|
Move caught object stack vertical offset logic
|
2021-07-02 20:43:47 +09:00 |
|
ekrctb
|
ae09c23e4e
|
Resolve DroppedObjectContainer via DI
|
2021-06-24 16:09:13 +09:00 |
|
ekrctb
|
16d5893535
|
Add DroppedObjectContainer class
|
2021-06-24 15:51:54 +09:00 |
|
ekrctb
|
df16d4bacc
|
Remove CurrentTexture from catcher
|
2021-06-14 20:26:33 +09:00 |
|
ekrctb
|
ca061c4b93
|
Factor out SkinnableDrawable component of the catcher to SkinnableCatcher
|
2021-06-14 19:41:51 +09:00 |
|
ekrctb
|
7f7c2c73e0
|
Move catcher movement logic of Catcher to CatcherArea
|
2021-06-11 15:39:06 +09:00 |
|
Dean Herbert
|
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 |
|
ekrctb
|
7df971a970
|
ICatcherPiece -> ICatcherSprite
|
2021-06-08 22:10:13 +09:00 |
|
ekrctb
|
194c78f67a
|
Make current state bindable protected
|
2021-06-08 22:08:54 +09:00 |
|
ekrctb
|
0192549d6c
|
Refactor catcher sprite to use skinned piece pattern
|
2021-06-08 21:29:41 +09:00 |
|
Dean Herbert
|
6017ef3825
|
Merge branch 'master' into fix-skin-sample-lookup
|
2021-06-08 17:37:36 +09:00 |
|
ekrctb
|
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 |
|
ekrctb
|
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 |
|
Dean Herbert
|
70a844ac10
|
Remove allowFallback parameters completely
|
2021-05-27 14:50:42 +09:00 |
|
Dean Herbert
|
dc2bc462b8
|
Expose internal catcher width calculation methods
|
2021-04-22 17:27:23 +09:00 |
|
Dean Herbert
|
84a7138223
|
Update tests to better support stack regeneration cases
|
2021-04-22 17:13:19 +09:00 |
|
Dean Herbert
|
3e1002fbf3
|
Improve osu!catch caught fruit placement algorithm
|
2021-04-22 17:06:28 +09:00 |
|
Dean Herbert
|
ddf1b560f3
|
Remove catcher fade during hyperdash
Closes https://github.com/ppy/osu/issues/12472.
|
2021-04-20 18:18:51 +09:00 |
|
Dean Herbert
|
89bea2868a
|
Move bool one level down
|
2021-03-30 14:33:55 +09:00 |
|
Dean Herbert
|
013ddc734c
|
Fix osu!catch fruit showing on plate when hidden mod is enabled
Closes https://github.com/ppy/osu/issues/12065.
|
2021-03-25 17:04:37 +09:00 |
|
ekrctb
|
96f3e0dad8
|
Replace CatchHitObject.X usage to EffectiveX and OriginalX
|
2020-12-14 11:03:14 +09:00 |
|
ekrctb
|
2634c6b8d9
|
Combine DisplayRadius and Scale to DisplaySize
|
2020-12-10 20:43:01 +09:00 |
|
ekrctb
|
a8e2f35b62
|
Remove unneeded check of caught object removal
The logic was public but now it is private
so the condition is ensured by the caller
|
2020-12-09 10:50:35 +09:00 |
|
ekrctb
|
b52e279702
|
Reword exception message
|
2020-12-09 10:38:11 +09:00 |
|
ekrctb
|
86445e7c23
|
Remove unnecessary copy
|
2020-12-09 10:36:54 +09:00 |
|
ekrctb
|
c8b0934573
|
Rename caughtFruitContainer -> caughtObjectContainer
|
2020-12-09 10:35:36 +09:00 |
|
ekrctb
|
ccca7e0b25
|
more specific type droppedObjectContainer
|
2020-12-09 10:35:01 +09:00 |
|
ekrctb
|
b80204642e
|
Revert rename error
|
2020-12-09 10:25:35 +09:00 |
|
ekrctb
|
1212ffd24f
|
Rename to CopyStateFrom, and add comment
|
2020-12-08 23:35:24 +09:00 |
|
ekrctb
|
1f36bbecd1
|
Fix dropped objects not removed on revert result
|
2020-12-08 23:07:30 +09:00 |
|
ekrctb
|
749d5380ca
|
Pool caught objects and dropped objects
|
2020-12-08 22:38:10 +09:00 |
|
ekrctb
|
a32dac00dd
|
Introduce IHasCatchObjectState implemented by DHO and CaughtObject
|
2020-12-08 21:29:26 +09:00 |
|
ekrctb
|
c301223d8c
|
Make object on the catcher plate separate CaughtObject class
|
2020-12-08 21:11:40 +09:00 |
|
ekrctb
|
94a59ac3b2
|
Make catch hit lighting logic not dependent on caught object
|
2020-12-08 20:41:26 +09:00 |
|
ekrctb
|
56721a6fa9
|
Compute object position in stack via a pure function
|
2020-12-08 20:36:59 +09:00 |
|
ekrctb
|
02571ec7ae
|
Remove hit explosion on revert result
|
2020-12-08 15:43:17 +09:00 |
|
ekrctb
|
1a66d8f2bc
|
Remove caught objects on revert result
|
2020-12-08 15:24:39 +09:00 |
|
ekrctb
|
100b365c98
|
Restore hyper dash state on revert judgement result
|
2020-12-08 15:21:47 +09:00 |
|
ekrctb
|
cb76a2d7b5
|
Restore catcher state on revert judgement result
|
2020-12-08 15:03:03 +09:00 |
|
ekrctb
|
0213f77b4b
|
Move catcher state changing logic to OnNewResult method
|
2020-12-08 14:28:30 +09:00 |
|
Dean Herbert
|
d3a17b65d5
|
Move public methods upwards
|
2020-12-04 14:36:40 +09:00 |
|
Dean Herbert
|
8988023407
|
Tidy up code formatting and remove unnecessarily publicly exposed methods
|
2020-12-04 14:35:56 +09:00 |
|
ekrctb
|
23af70dd32
|
Invert if
|
2020-12-04 10:24:25 +09:00 |
|
ekrctb
|
7e66714c2f
|
Use ApplyCustomUpdateState for dropping transformation
We cannot just apply the transforms because DHO clears transforms when state is updated
|
2020-12-03 18:46:58 +09:00 |
|
ekrctb
|
be456f9c6b
|
Make DroppedObjectAnimation private
|
2020-12-03 18:46:58 +09:00 |
|
ekrctb
|
5a5c956ced
|
Move more logic to Catcher from CatcherArea
|
2020-12-03 16:44:36 +09:00 |
|