Commit Graph

21767 Commits

Author SHA1 Message Date
69c2a18220 Merge branch 'master' into fix-drawable-judgement-animation-loss 2020-11-30 14:05:03 +09:00
0c36a3c263 Merge branch 'master' into pool-scrolling 2020-11-30 14:04:54 +09:00
5a276f8577 Merge branch 'master' into fix-editor-reapply-same-state-change 2020-11-30 13:34:03 +09:00
9145557522 Revert "Revert "forgot to remove something... sorry""
This reverts commit 6478bed431.
2020-11-29 23:15:12 -05:00
6478bed431 Revert "forgot to remove something... sorry"
This reverts commit a780a8bbd8.
2020-11-29 23:14:43 -05:00
30dc0bc019 Merge pull request #10993 from LittleEndu/star-scale
Scale stars from 0.4 to 1
2020-11-30 13:05:44 +09:00
a780a8bbd8 forgot to remove something... sorry 2020-11-29 21:52:58 -05:00
3994cf082d add keybind for in game overlay 2020-11-29 20:59:02 -05:00
e0a84ff1dc Move hold-to-confirm setting back to gameplay section 2020-11-29 22:07:34 +01:00
a5c4a8d2e9 Create "User Interface" settings section 2020-11-29 22:07:33 +01:00
4057ca0a57 Merge branch 'master' into fix-editor-unnecessary-object-updates 2020-11-29 21:34:17 +01:00
a3afd88387 Use Interpolation.Lerp 2020-11-28 20:35:03 +01:00
8ad4cf73f5 Scale stars from 0.4 to 1 2020-11-28 17:09:43 +02:00
7e34c5e239 Fix state application always checking newest state for early abort, rather than current 2020-11-27 16:57:11 +09:00
18bb0cb45b Remove unnecessary schedule logic from Apply's local updateState call
There were cases in the editor where rewinding of transforms would
leave the `DrawableHitObject` in a non-`IsPresent` state, resulting in
this scheduled logic never running.

This would in turn cause ghost hitobjects, which disappear under certain
circumstances.

Reproduction:

- Open editor to empty beatmap
- Place single hitcircle at current point in time
- Drag editor timeline backwards to seek before zero, and wait for
  return to zero
- Select hitcircle in playfield
- Drag hitcircle to right in timeline, triggering a start time change
2020-11-27 16:32:05 +09:00
7edbba58f7 Avoid updating hitobjects unnecessarily for start time changes
This was firing regardless of whether the start time was changed, such
as where beat snap provided the same time the object already has.

The case where a change actually occurs is already handled by
EditorBeatmap (see `startTimeBindables`), so it turns out this local
handling is not required at all.
2020-11-27 16:31:06 +09:00
a7194e1bc3 add stateless RNG 2020-11-27 15:43:44 +09:00
b9b8857988 Update framework 2020-11-27 15:11:07 +09:00
bcc197f9fe Merge branch 'master' into improve-dho-time-offsets 2020-11-27 15:03:56 +09:00
792934f2c4 Allow scroll type to be specified
This brings back the ability for the carousel to scroll in a classic
way. It turns out this is generally what we want for "seek" operations
like "random", else it's quite hard to get the expected animation.

I did experiment with applying the animation after the pooled panels are
retrieved, but in a best-case scenario there is still a gap where no
panels are displayed during the random seek operation.
2020-11-27 13:54:38 +09:00
6e40de58e9 Use new OnAdd and OnRemove to invalidate DHO 2020-11-27 13:36:40 +09:00
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
e36bb7631d Fix colour not updated when index changes 2020-11-27 11:41:39 +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
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