94dc61150b
Merge branch 'master' into fix-drawable-judgement-animation-loss
2020-11-27 00:43:47 +09:00
b1864670a2
Merge pull request #10961 from smoogipoo/better-dho-rewind
...
Rewind pooled DHOs into better states
2020-11-27 00:42:58 +09:00
220657c2cc
Merge branch 'master' into replay-pausing-support
2020-11-27 00:09:40 +09:00
882fcdb13a
Merge pull request #10975 from peppy/standardise-binding-description-case
...
Standardise binding description case to sentence casing
2020-11-26 23:54:13 +09:00
aa4da2a5f8
Add xmldoc on State
2020-11-26 23:42:05 +09:00
1e79cb498b
Standardise binding description case to sentence casing
2020-11-26 20:07:16 +09:00
3346c06aca
Rename variable/text to be more verbose as to toggle purpose
2020-11-26 20:04:44 +09:00
741902f1b3
Merge pull request #10971 from smoogipoo/fix-timeline-combo-colour
...
Fix timeline blueprints sometimes not receiving combo colours
2020-11-26 19:47:21 +09:00
da6bccc812
Apply beat snap if positional snap doesn't give a time result
2020-11-26 19:20:51 +09:00
91592cf32d
Expose EditorClock for consumption
2020-11-26 19:20:39 +09:00
9811c46e35
Rename application method to better describe what it actually does
2020-11-26 19:16:18 +09:00
05e245d445
Allow non-pooled DHO to be reused
2020-11-26 19:07:09 +09:00
0a48dd8f76
Delegate scroll animation to panels themselves
2020-11-26 18:42:51 +09:00
ad258e2e52
Update scroll position before applying any panel animations
...
In the case of automatic scroll requirements (ie. scroll to selected) we
are delegating the animation logic to the panels themselves. In order to
make this work correctly, the scroll operation needs to take effect
before any animation updates are run.
2020-11-26 18:33:41 +09:00
6058c66edb
Move drawable carousel set movement logic into panels themselves
2020-11-26 18:32:43 +09:00
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
02d5b1352b
Expose generic version of OsuScrollContainer
2020-11-26 18:25:56 +09:00
e53f849aa0
Completely separate combo colours from DHOs
2020-11-26 18:14:25 +09:00
f562854feb
Fix timeline objects sometimes not receiving combo colours
2020-11-26 17:22:22 +09:00
aad6cf4ad3
Merge branch 'master' into editor-multiple-object-positional-snap
2020-11-26 17:06:47 +09:00
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
eae33fe74a
Fix format
2020-11-26 14:16:33 +09:00
e43f928588
Use DHO.HitObjectApplied to invalidate computation
2020-11-26 14:07:40 +09:00
f6faf95e33
Revert changes to HitObjectUsageBegan, not use it.
2020-11-26 14:01:46 +09:00
1a6e5bdaba
Merge branch 'master' into pool-scrolling
2020-11-26 13:52:52 +09:00
8ff1688c4b
Merge branch 'master' into fix-drawable-judgement-animation-loss
2020-11-25 20:11:09 +01:00
0414e5c550
Add MaximumJudgementOffset to DrawableHitObject, use in more places
2020-11-26 01:12:42 +09:00
c744db1b57
Rewind pooled DHOs into better states
2020-11-26 00:42:25 +09:00
0ddeff648d
Fix incorrect index lookup on non-ordered selections
2020-11-25 17:25:54 +09:00
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
c46d655832
Uncomment incorrectly commented lines
2020-11-25 12:11:44 +09:00
b8a5cd94f7
Invoke HitObjectUsageFinished before removal
2020-11-24 19:46:57 +09:00
4311526c0a
Merge branch 'master' into on-drawable-hitobject-added
2020-11-24 19:23:54 +09:00
e34a205104
Rewrite hit object management, take three
2020-11-24 18:56:05 +09:00
7f6e4d5b21
Delay lifetime computation until loaded
2020-11-24 18:56:05 +09:00
d5f082e5fb
Comment about lifetime assumption
2020-11-24 18:56:05 +09:00
ce57e8ddfb
Separate Lifetime computation and layout update
2020-11-24 18:56:05 +09:00
cabc8aa63b
Revert "Simplify ScrollingHitObjectContainer logic"
...
This reverts commit b4cc39149c117e6a0e95ee917a67cec8ba723d06.
2020-11-24 18:56:05 +09:00
8f39b54e58
Simplify ScrollingHitObjectContainer logic
2020-11-24 18:56:05 +09:00
5c743adbae
Support hit object pooling scrolling playfield
2020-11-24 18:56:05 +09:00
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
c9a41f9dae
Make all objects in selection candidates for spatial snapping
...
Closes #10898 .
2020-11-24 17:35:54 +09:00
5d65665b42
Merge pull request #10943 from peppy/editor-setup-scroll-to-file-selector
...
Scroll editor setup screen to file selector on display
2020-11-24 16:26:25 +09:00
87ce8a53ff
Merge branch 'master' into on-drawable-hitobject-added
2020-11-24 16:09:57 +09:00
bd1dad5477
Remove null allowance for now
2020-11-24 15:54:27 +09:00
1d82557d9f
Avoid blocking global actions when skip overlay is not actually active
2020-11-24 15:42:14 +09:00
72b8eef36e
Add ability to pause/resume replay playback
2020-11-24 15:41:56 +09:00
1682260677
Remove left over logging line
2020-11-24 15:28:03 +09:00
ee33f62809
Fix DrawableJudgement not always animating correctly on skin change
...
If the skin is changed before gameplay has started (at the loading
screen) it is possible for a sequence of events to occur which results
in the animation not being played:
- `SkinReloadableDrawable` runs its BDL load (and calls `OnSkinChanged`
once)
- User changes skin, triggering `DrawableJudgement`'s skin change
handling (binding directly on the `SkinSource` locally)
- This will call `PrepareDrawables` and reinitialise the
`SkinnableDrawable` child hierarchy, then immediately apply the
animations to it.
- The new `SkinnableDrawable` will then get the `SkinChanged` event and
schedule a handler for it, which will run on its first Update call.
- Any added animations will be lost as a result.
Fixed by binding directly to the `SkinnableDrawable`'s `OnSkinChanged`.
This has the added bonus of not needing to reinitialise the child
hierarchy on skin change (which felt a bit weird in the first place).
2020-11-24 15:23:53 +09:00
57ff150051
Merge pull request #10829 from Joehuu/music-osd-bindings
...
Add music bindings to on screen display
2020-11-24 14:36:34 +09:00
