Commit Graph

21575 Commits

Author SHA1 Message Date
6b78045ff1 fix codefactor empty line complaint 2020-12-14 06:57:43 +06:00
c83c3e92fc apply a private setter in a protected property 2020-12-14 01:53:20 +06:00
3741c2339a simplify implementation and adjust the default values 2020-12-13 22:43:36 +06:00
2108844319 apply ScorePosition to the judgement container 2020-12-13 22:01:08 +06:00
f14e49c72e fetch ScorePosition from the skin 2020-12-13 21:59:04 +06:00
b3d8347315 add support for ScorePosition into LegacyManiaSkin 2020-12-10 20:11:08 +06:00
69c2a18220 Merge branch 'master' into fix-drawable-judgement-animation-loss 2020-11-30 14:05:03 +09:00
5a276f8577 Merge branch 'master' into fix-editor-reapply-same-state-change 2020-11-30 13:34:03 +09: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
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
b9b8857988 Update framework 2020-11-27 15:11:07 +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
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
8ff1688c4b Merge branch 'master' into fix-drawable-judgement-animation-loss 2020-11-25 20:11:09 +01: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
4311526c0a Merge branch 'master' into on-drawable-hitobject-added 2020-11-24 19:23:54 +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
1fd4b04767 Just set music shortcut text locally 2020-11-23 20:43:46 -08:00
e36b1051c1 Add spacing between inline comments 2020-11-24 13:15:59 +09:00
82640418ba Invert hide logic for readability 2020-11-24 13:12:04 +09:00
44ca67c534 Simplify fill logic and add xmldoc 2020-11-24 13:10:11 +09:00