Commit Graph

35 Commits

Author SHA1 Message Date
d247b8042e Fix default skin catcher not flipping catcher plate
When legacy beatmap skin is present but catcher is not provided, it was using the legacy setting (always false).
2021-07-05 20:05:08 +09:00
83c80291d4 Don't flip catcher plate contents in legacy skin 2021-07-02 23:23:21 +09:00
1b0aadcc6f Merge branch 'master' into transformers-per-skin 2021-06-22 16:03:15 +09:00
df16d4bacc Remove CurrentTexture from catcher 2021-06-14 20:26:33 +09:00
fbb856d84b Call base when overriding lookup methods
Rather than arbitrarily accessing `Skin` here and there.
2021-06-11 12:44:44 +03:00
26cdcc8d78 Remove stale access to Source from master merge 2021-06-10 13:07:32 +03:00
dde84e5cbd Merge branch 'master' into transformers-per-skin 2021-06-10 11:58:52 +03:00
865c5c0676 Use [Resolved] to simplify bindable resolution 2021-06-10 15:47:03 +09:00
6995945360 Use With to simplify drawable construction 2021-06-10 15:45:49 +09:00
cf40282f1f Convert LegacySkinTransformers to accept raw ISkins rather than a full ISkinSource 2021-06-09 22:49:31 +03:00
e5deecf459 Check skin version for legacy catcher sprite 2021-06-09 15:47:23 +09:00
7df971a970 ICatcherPiece -> ICatcherSprite 2021-06-08 22:10:13 +09:00
109a366722 Use separate classes for old and new catcher legacy skin element
- Fix catcher texture animation is reset for legacy old catcher skin
2021-06-08 21:59:09 +09:00
0192549d6c Refactor catcher sprite to use skinned piece pattern 2021-06-08 21:29:41 +09:00
1b93234c76 Merge branch 'master' into fruit-representation 2021-06-07 16:05:00 +09:00
bb02c35f2d Move all osu!catch legacy skin piece files to the correct location 2021-06-07 15:10:47 +09:00
ac5c55bd2c Remove "fruit visual representation" state from DrawableFruit
Instead, skin pieces compute visual representation from `IndexInBeatmap`.
2021-06-07 14:49:37 +09:00
166e4565be Move FruitVisualRepresentation namespace 2021-06-07 13:59:17 +09:00
4e186b0cf5 ContentVisible -> HiddenByRulesetImplementation 2021-05-31 09:24:26 +03:00
60b781701f Rewrite catch combo counter hide logic 2021-05-30 14:22:11 +03:00
fb81e5133f Merge branch 'master' into catch-hide-combo-workaround 2021-05-30 14:16:46 +03:00
50d71faf56 Restructure lookup code to avoid repeating the base call 2021-05-30 17:55:10 +09:00
fbc316ea1d Fix legacy skin transformers potentially ignoring source implementations 2021-05-29 21:23:22 +03:00
a4d52a7f52 Use switch—case instead 2021-05-19 23:37:22 +03:00
ff419af512 Hide the combo counter content rather than full death 2021-05-18 09:10:15 +03:00
df248ea41b Improve code readability 2021-05-17 11:41:53 +03:00
102842bcf1 Expire legacy combo counters on catch ruleset 2021-05-15 16:55:15 +03:00
004798d61d Update Legacy components to not require skin in ctor 2021-05-11 18:39:14 +09:00
43c1e1d217 Update existing usages
Resolve post-conflict issues
2021-03-13 06:09:07 +03:00
a32dac00dd Introduce IHasCatchObjectState implemented by DHO and CaughtObject 2020-12-08 21:29:26 +09:00
c301223d8c Make object on the catcher plate separate CaughtObject class 2020-12-08 21:11:40 +09:00
17d48c82f6 Use switch statement instead of an array 2020-12-08 16:59:06 +09:00
b2e5658d23 Merge branch 'master' into fruit-piece-in-place 2020-12-07 18:57:42 +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