1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 14:19:34 +08:00
Commit Graph

34717 Commits

Author SHA1 Message Date
Dean Herbert
f8db7a9902 Remove ScrollableContent container from carousel
This was causing multiple issues with masking and sizing and really
didn't need to exist in the first place. Also not sure why the pool was
nested inside the scroll container, but it isn't any more. Probably for
the best.
2020-11-26 18:28:54 +09:00
Dean Herbert
02d5b1352b Expose generic version of OsuScrollContainer 2020-11-26 18:25:56 +09:00
Dan Balasescu
e53f4c6589
Merge pull request #10954 from peppy/editor-multiple-object-positional-snap
Make all objects in selection candidates for spatial snapping
2020-11-26 18:16:31 +09:00
smoogipoo
e53f849aa0 Completely separate combo colours from DHOs 2020-11-26 18:14:25 +09:00
ekrctb
f3f5ec7665 Fix Column not calling base.Add 2020-11-26 18:08:40 +09:00
smoogipoo
f562854feb Fix timeline objects sometimes not receiving combo colours 2020-11-26 17:22:22 +09:00
Dan Balasescu
aad6cf4ad3
Merge branch 'master' into editor-multiple-object-positional-snap 2020-11-26 17:06:47 +09:00
Dan Balasescu
857417c6e9
Merge pull request #10970 from ekrctb/refactor-fruit-pieces
Refactor common code of border piece of fruits
2020-11-26 16:02:04 +09:00
Dan Balasescu
a0e47ae13f
Merge pull request #10960 from peppy/fix-editor-volume-adjust
Fix volume not being adjustable in the editor using alt-scroll
2020-11-26 15:37:57 +09:00
ekrctb
cafe8cf7fa Refactor border of fruits to classes 2020-11-26 15:24:32 +09:00
ekrctb
8a73b335f3 Move catch piece files 2020-11-26 15:24:32 +09:00
ekrctb
5889b74eba
Merge pull request #10956 from ekrctb/palpable-catch-hit-object
Move some members from `CatchHitObject` to `PalpableCatchHitObject` to make it more specific
2020-11-26 15:18:05 +09:00
ekrctb
047a02b863
Merge branch 'master' into palpable-catch-hit-object 2020-11-26 14:35:27 +09:00
ekrctb
eae33fe74a Fix format 2020-11-26 14:16:33 +09:00
ekrctb
e43f928588 Use DHO.HitObjectApplied to invalidate computation 2020-11-26 14:07:40 +09:00
ekrctb
f6faf95e33 Revert changes to HitObjectUsageBegan, not use it. 2020-11-26 14:01:46 +09:00
Dan Balasescu
19367ae22c
Merge pull request #10966 from ekrctb/catch-relax-test
Workaround TestSceneCatchModRelax flaky failure
2020-11-26 13:53:56 +09:00
ekrctb
1a6e5bdaba Merge branch 'master' into pool-scrolling 2020-11-26 13:52:52 +09:00
ekrctb
9131546876 Workaround TestSceneCatchModRelax failure 2020-11-26 13:04:19 +09:00
ekrctb
0817dae86c Add failing test to check non-pooled lifetime 2020-11-26 12:35:49 +09:00
ekrctb
c99d34d140
Merge branch 'master' into palpable-catch-hit-object 2020-11-26 12:24:57 +09:00
Bartłomiej Dach
8ff1688c4b
Merge branch 'master' into fix-drawable-judgement-animation-loss 2020-11-25 20:11:09 +01:00
smoogipoo
0414e5c550 Add MaximumJudgementOffset to DrawableHitObject, use in more places 2020-11-26 01:12:42 +09:00
smoogipoo
c744db1b57 Rewind pooled DHOs into better states 2020-11-26 00:42:25 +09:00
Dean Herbert
740b9fb3a0 Update test to cover non-ordered selection 2020-11-25 17:33:21 +09:00
Dean Herbert
0ddeff648d Fix incorrect index lookup on non-ordered selections 2020-11-25 17:25:54 +09:00
Dean Herbert
d4c6d6275e Fix volume not being adjustable in the editor using alt-scroll
We do this in other places so I think it's fine to handle like this for
now (until we come up with a better global solution).

Closes #10958.
2020-11-25 16:46:22 +09:00
Dean Herbert
c46d655832 Uncomment incorrectly commented lines 2020-11-25 12:11:44 +09:00
ekrctb
323533d945 Add hiding Palpable HitObject property 2020-11-25 08:07:59 +09:00
ekrctb
6e55eb2090 Fix and add comments 2020-11-25 08:00:11 +09:00
ekrctb
3c3229ac4b Remove redundant StaysOnPlate 2020-11-25 07:59:45 +09:00
ekrctb
ab7251d742 Move members to PalpableCatchHitObject 2020-11-24 19:57:37 +09:00
Dan Balasescu
dcfd9517b7
Merge pull request #10924 from ekrctb/on-drawable-hitobject-added
Add method of initialising a `DrawableHitObject` from `Playfield` regardless of pooling
2020-11-24 19:50:32 +09:00
ekrctb
4f7aa7e541 Move Palpable* to separate files 2020-11-24 19:48:13 +09:00
ekrctb
916a313f19 Rename PalpableDrawable -> DrawablePalpable 2020-11-24 19:48:13 +09:00
ekrctb
b8a5cd94f7 Invoke HitObjectUsageFinished before removal 2020-11-24 19:46:57 +09:00
Dan Balasescu
4311526c0a
Merge branch 'master' into on-drawable-hitobject-added 2020-11-24 19:23:54 +09:00
Dan Balasescu
7bf4ff7557
Merge pull request #10953 from ekrctb/remove-tobject-catch
Remove type parameter from DrawableCatchHitObject
2020-11-24 19:23:42 +09:00
ekrctb
e34a205104 Rewrite hit object management, take three 2020-11-24 18:56:05 +09:00
ekrctb
7f6e4d5b21 Delay lifetime computation until loaded 2020-11-24 18:56:05 +09:00
ekrctb
d5f082e5fb Comment about lifetime assumption 2020-11-24 18:56:05 +09:00
ekrctb
ce57e8ddfb Separate Lifetime computation and layout update 2020-11-24 18:56:05 +09:00
ekrctb
ec92545d7a fix indent 2020-11-24 18:56:05 +09:00
ekrctb
cabc8aa63b Revert "Simplify ScrollingHitObjectContainer logic"
This reverts commit b4cc39149c117e6a0e95ee917a67cec8ba723d06.
2020-11-24 18:56:05 +09:00
ekrctb
8f39b54e58 Simplify ScrollingHitObjectContainer logic 2020-11-24 18:56:05 +09:00
ekrctb
5c743adbae Support hit object pooling scrolling playfield 2020-11-24 18:56:05 +09:00
ekrctb
df3844cdbb Add failing tests for pooling scrolling playfield 2020-11-24 18:56:05 +09:00
Dean Herbert
d5a4d46c6d
Merge pull request #10842 from EVAST9919/profile-overlay-graph-new
Implement history charts for Profile Overlay
2020-11-24 18:05:17 +09:00
Dean Herbert
4eef6c0d40 Add test coverage 2020-11-24 17:59:18 +09:00
Dean Herbert
09f2a85d71 Fix potential test failure due to precision check missing 2020-11-24 17:40:00 +09:00