1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:53:21 +08:00
Commit Graph

1312 Commits

Author SHA1 Message Date
ekrctb
175d666906 Use getters of OriginalX and XOffset 2021-07-06 15:32:32 +09:00
ekrctb
ae1b1cbec9 Allow serialization of catch hit objects 2021-07-06 15:32:32 +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
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
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
Dean Herbert
ee6cf4396a
Merge pull request #13648 from ekrctb/dropped-object-container
Use DI to resolve "dropped object target" container in `Catcher`
2021-06-25 18:23:39 +09:00
ekrctb
c0c1b8d620 Fix catcher hyper-dash afterimage is not always displayed 2021-06-24 16:12:43 +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
smoogipoo
6215f2d42b Remove unnecessary string interpolation 2021-06-23 17:40:11 +09:00
smoogipoo
7767e2e77f Add to tooltip 2021-06-23 17:34:30 +09:00
ekrctb
ad60b9d5a0 Allow catch difficulty adjust to enable hard rock offsets 2021-06-23 14:52:41 +09:00
ekrctb
a0fd7f72ac Use IApplicableToBeatmapProcessor in CatchModHardRock 2021-06-23 14:47:32 +09:00
Dean Herbert
f62b4f2d24
Merge pull request #13617 from ekrctb/catch-editor
Add "placeholder" (pre-MVP) implementation of osu!catch editor
2021-06-23 14:00:34 +09:00
ekrctb
125e143401 Fix banana shower placement outline initial opacity 2021-06-23 10:27:40 +09:00
ekrctb
5a5cb39c9f Add some comments about logic 2021-06-23 10:27:40 +09:00
ekrctb
69c8865a04 Use more consistent method names 2021-06-23 10:19:25 +09:00
ekrctb
a9b8736f70 Order field and properties consistently 2021-06-23 10:18:44 +09:00
ekrctb
e96814bb86 Remove comment about using skin for blueprint
As the current game-wise direction is not using skin elements in blueprints.
The design of the blueprint could be improved somehow, though.
2021-06-23 09:37:30 +09:00
ekrctb
1a7bfafc69 Add icon for composition tools 2021-06-23 09:34:11 +09:00
Dean Herbert
4cb9c6a842
Merge pull request #13423 from frenzibyte/transformers-per-skin
Refactor ruleset skin transforming logic to be per-`ISkin` rather than one `ISkinSource`
2021-06-22 21:24:56 +09:00
ekrctb
21331d3a13 Disable caught object stacking in editor 2021-06-22 17:20:13 +09:00
ekrctb
e8907b53a8 Add basic banana shower placement tool 2021-06-22 17:20:13 +09:00
ekrctb
4d7a877795 Add basic fruit placement tool 2021-06-22 17:20:13 +09:00
ekrctb
0078d7dc18 Add outline to selected fruit 2021-06-22 17:20:13 +09:00
ekrctb
c28cd5dd75 Add basic juice stream selection blueprint 2021-06-22 17:20:13 +09:00
ekrctb
b8ccfe6ea7 Add basic selection blueprint movement logic 2021-06-22 17:20:13 +09:00
ekrctb
fbe44dac34 Add empty catch hit object composer 2021-06-22 17:20:13 +09:00
Dean Herbert
1b0aadcc6f Merge branch 'master' into transformers-per-skin 2021-06-22 16:03:15 +09:00
ekrctb
b54e82eb99 Remove unused argument from CatchPlayfield 2021-06-22 15:23:50 +09:00
Dean Herbert
4b45d8318e
Merge branch 'master' into transformers-per-skin 2021-06-16 16:37:28 +09:00
ekrctb
b087c95581 Use a frozen clock for catcher trails 2021-06-16 16:17:32 +09:00
ekrctb
1632450918 Add comments 2021-06-16 16:17:32 +09:00
ekrctb
73e443a0d9 Add comments 2021-06-16 14:01:12 +09:00
ekrctb
df16d4bacc Remove CurrentTexture from catcher 2021-06-14 20:26:33 +09:00
ekrctb
38a56d64d3 Rename CatcherTrailSprite -> CatcherTrail 2021-06-14 19:47:18 +09:00
ekrctb
c094914023 Simplify catcher trail creation 2021-06-14 19:46:48 +09:00
ekrctb
9b6ab4360e Use common skinnable catcher in catcher trails 2021-06-14 19:45:58 +09:00
ekrctb
ca061c4b93 Factor out SkinnableDrawable component of the catcher to SkinnableCatcher 2021-06-14 19:41:51 +09:00
Salman Ahmed
fbb856d84b Call base when overriding lookup methods
Rather than arbitrarily accessing `Skin` here and there.
2021-06-11 12:44:44 +03:00
ekrctb
7f7c2c73e0 Move catcher movement logic of Catcher to CatcherArea 2021-06-11 15:39:06 +09:00
Salman Ahmed
26cdcc8d78 Remove stale access to Source from master merge 2021-06-10 13:07:32 +03:00
Dan Balasescu
35d5632355
Merge pull request #13378 from Syriiin/diffcalc/refactor/auto-properties
Refactor DifficultyAttributes to use auto properties over public fields
2021-06-10 18:42:11 +09:00
Salman Ahmed
dde84e5cbd Merge branch 'master' into transformers-per-skin 2021-06-10 11:58:52 +03:00
Dan Balasescu
a44fd887ee
Merge branch 'master' into no-unranked-display 2021-06-10 17:09:46 +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
Dean Herbert
865c5c0676 Use [Resolved] to simplify bindable resolution 2021-06-10 15:47:03 +09:00
Dean Herbert
6995945360 Use With to simplify drawable construction 2021-06-10 15:45:49 +09:00