8f5129323d
Merge branch 'master' into pool-scrolling
2020-11-27 13:12:05 +09:00
018957c244
Merge branch 'master' into song-select-track-selected-better-2
2020-11-27 12:54:40 +09:00
7ce752391d
Make TestSceneFruitObjects show correct color
2020-11-27 12:02:07 +09:00
35cd6674f6
Fix tiny droplet scale factor
2020-11-27 11:56:57 +09:00
de471a7e84
Add test for dynamically changing catch fruits
2020-11-27 11:42:14 +09:00
e36bb7631d
Fix colour not updated when index changes
2020-11-27 11:41:39 +09:00
dbf67f82c0
Use bindable for DrawableDroplet HyperDash state
2020-11-27 11:40:38 +09:00
23109f5bbc
Add bindable to drawable catch hit obejcts
2020-11-27 11:08:32 +09:00
5e36fb322a
Move fruit visual logic from CHO to DrawableFruit
2020-11-27 11:08:32 +09:00
c272fda416
Add bindables to catch hit objects
2020-11-27 11:02:23 +09:00
60b6b56c04
Merge pull request #10977 from ekrctb/on-apply-arg
...
Remove hitObject argument from DHO.OnApply and OnFree
2020-11-27 11:01:23 +09:00
fe85b7d482
Remove unused import
2020-11-27 10:18:00 +09:00
57454bbb1c
Remove hitObject argument from OnApply and OnFree
2020-11-27 10:13:05 +09:00
5a393b153b
Merge pull request #10952 from peppy/replay-pausing-support
...
Add ability to pause/resume replay playback
2020-11-27 02:26:23 +09:00
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
203c36f720
Rename file to match test name
2020-11-26 19:46:54 +09:00
9a08cc8c04
Add test coverage of beat snapping hit circles
2020-11-26 19:40:10 +09:00
ab1ad99c88
Fix failing test scene (was previously not snapped properly)
2020-11-26 19:33:51 +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
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
e53f849aa0
Completely separate combo colours from DHOs
2020-11-26 18:14:25 +09:00
f3f5ec7665
Fix Column not calling base.Add
2020-11-26 18:08:40 +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
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
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
cafe8cf7fa
Refactor border of fruits to classes
2020-11-26 15:24:32 +09:00
8a73b335f3
Move catch piece files
2020-11-26 15:24:32 +09:00
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
047a02b863
Merge branch 'master' into palpable-catch-hit-object
2020-11-26 14:35:27 +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
19367ae22c
Merge pull request #10966 from ekrctb/catch-relax-test
...
Workaround TestSceneCatchModRelax flaky failure
2020-11-26 13:53:56 +09:00
1a6e5bdaba
Merge branch 'master' into pool-scrolling
2020-11-26 13:52:52 +09:00
