Commit Graph

1247 Commits

Author SHA1 Message Date
56721a6fa9 Compute object position in stack via a pure function 2020-12-08 20:36:59 +09:00
0739f09930 Merge pull request #11110 from ekrctb/fruit-piece-in-place
Implement in-place update of catch DrawableHitObject
2020-12-08 18:36:20 +09:00
c3241f163d Merge pull request #11126 from ekrctb/fix-catcher-trail-sprite-pooled
Clear all transforms of catcher trail sprite before returned to pool
2020-12-08 17:59:23 +09:00
1757b9c3e7 Merge branch 'master' into fruit-piece-in-place 2020-12-08 17:42:34 +09:00
22a5df6309 Clear all transforms of catcher trail sprite before returned to pool 2020-12-08 17:31:00 +09:00
4d5c242d35 Use virtual property instead of a field for optional pieces 2020-12-08 17:15:40 +09:00
603cecb2eb Make CatchHitObjectPiece abstract class 2020-12-08 17:02:57 +09:00
17d48c82f6 Use switch statement instead of an array 2020-12-08 16:59:06 +09:00
02571ec7ae Remove hit explosion on revert result 2020-12-08 15:43:17 +09:00
1a66d8f2bc Remove caught objects on revert result 2020-12-08 15:24:39 +09:00
100b365c98 Restore hyper dash state on revert judgement result 2020-12-08 15:21:47 +09:00
cb76a2d7b5 Restore catcher state on revert judgement result 2020-12-08 15:03:03 +09:00
0213f77b4b Move catcher state changing logic to OnNewResult method 2020-12-08 14:28:30 +09:00
4da6717d0e Rename things in PulpFormation 2020-12-08 10:33:18 +09:00
3cbdaf5960 Make resolved properties protected 2020-12-08 10:30:23 +09:00
b2e5658d23 Merge branch 'master' into fruit-piece-in-place 2020-12-07 18:57:42 +09:00
fb599e0746 Merge pull request #11114 from ekrctb/pool-catcher-trail
Pool catcher trail sprite
2020-12-07 18:48:08 +09:00
12c6b3c1fb Pool catcher trail sprite 2020-12-07 18:12:55 +09:00
c1d39b6401 Don't inherit Fruit from Banana 2020-12-07 14:10:17 +09:00
7f1ad1040d Don't inherit DrawableFruit from DrawableBanana
- A banana cannot be hyper
2020-12-07 14:08:50 +09:00
c0f39514b9 Fix legacy droplet scale 2020-12-07 14:00:22 +09:00
b8f1c499a4 Allow PulpFormation to update formation dynamically
Pulps are lazily allocated but never deallocated for a DrawableFruit
2020-12-07 13:56:22 +09:00
0d73bf8488 Refactor catch default piece to allow reuse
But Fruit in-place update is still incomplete,
as child drawables are recreated when reused.
2020-12-07 13:14:00 +09:00
d51d2c5331 Don't recreate pieces when catch DHO is reused 2020-12-07 12:59:03 +09:00
87189452d1 Refactor legacy skin piece to allow texture update 2020-12-07 12:57:24 +09:00
d18397acad Adjust namespace 2020-12-07 12:35:24 +09:00
b4b9312e0f Move piece files of Catch ruleset 2020-12-07 12:34:38 +09:00
d3a17b65d5 Move public methods upwards 2020-12-04 14:36:40 +09:00
8988023407 Tidy up code formatting and remove unnecessarily publicly exposed methods 2020-12-04 14:35:56 +09:00
aa24890aff Merge branch 'master' into caught-object-refactor 2020-12-04 14:12:33 +09:00
0134ac94a7 Merge pull request #11055 from ekrctb/catch-stateless-rng 2020-12-04 13:08:30 +09:00
23af70dd32 Invert if 2020-12-04 10:24:25 +09:00
e82ca66d3e Fix depth of dropped objects 2020-12-04 10:21:54 +09:00
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
be456f9c6b Make DroppedObjectAnimation private 2020-12-03 18:46:58 +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
873f2363c1 Simplify the fruit stacking code
It is now more clear that
the expression of distance checking is probably unintended (a bug)
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
e5c8e06c4b Create children in the constructor 2020-12-03 16:44:36 +09:00
2e8195e059 Use transformation to set fruit rotation 2020-12-03 12:13:14 +09:00
fdcfa81e46 Make RandomSeed a property, not a bindable 2020-12-02 20:53:47 +09:00
08848e49de Set banana combo colour using random seed 2020-12-02 17:12:30 +09:00
8b6161a51c Use deterministic randomness in catch hit object 2020-12-02 16:54:18 +09:00
e7c0e9834f Introduce RandomSeed in catch DHO 2020-12-02 16:53:01 +09:00
946613e803 Fix bananas not playing sounds 2020-12-02 15:22:54 +09:00
71a121389b Merge pull request #11033 from smoogipoo/immutable-hit-samples
Make HitSampleInfo immutable
2020-12-02 14:44:26 +09:00
2e0fdf9bca Merge pull request #11011 from ekrctb/catch-pooling-initial
Initial implementation of hit object pooling in osu!catch ruleset
2020-12-02 13:02:22 +09:00