Commit Graph

34520 Commits

Author SHA1 Message Date
55c8aa5d5f Move menu cursor size to UI section 2020-11-30 16:14:15 +09:00
e14db45374 Reorder settings to (probably) feel more correct 2020-11-30 16:09:38 +09: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
3e5a6981b9 Merge pull request #10984 from peppy/fix-editor-unnecessary-object-updates
Avoid updating hitobjects unnecessarily for start time changes
2020-11-29 22:06:26 +01:00
4057ca0a57 Merge branch 'master' into fix-editor-unnecessary-object-updates 2020-11-29 21:34:17 +01:00
57c504d729 Merge pull request #10985 from peppy/fix-editor-disappearing-objects
Remove unnecessary schedule logic from Apply's local updateState call
2020-11-29 21:33:27 +01:00
065acd1997 Merge branch 'master' into fix-editor-disappearing-objects 2020-11-29 20:53:46 +01:00
ffa02ced69 Merge pull request #10982 from peppy/reduce-slider-ball-opacity
Reduce the opacity of the default skin slider ball
2020-11-29 20:52:41 +01:00
d1ed612362 Merge branch 'master' into reduce-slider-ball-opacity 2020-11-29 20:18:06 +01: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
c0c197501e Merge pull request #10981 from peppy/update-framework
Update framework
2020-11-27 15:50:36 +09:00
1246c8ba5f Reduce the opacity of the default skin slider ball
Previous value was [hitting pure white on some brighter combo
colours](https://github.com/ppy/osu/issues/10910#issuecomment-734354812).
2020-11-27 15:22:29 +09:00
b9b8857988 Update framework 2020-11-27 15:11:07 +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
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
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
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
19367ae22c Merge pull request #10966 from ekrctb/catch-relax-test
Workaround TestSceneCatchModRelax flaky failure
2020-11-26 13:53:56 +09:00
9131546876 Workaround TestSceneCatchModRelax failure 2020-11-26 13:04:19 +09:00
c99d34d140 Merge branch 'master' into palpable-catch-hit-object 2020-11-26 12:24:57 +09:00
c744db1b57 Rewind pooled DHOs into better states 2020-11-26 00:42:25 +09:00
740b9fb3a0 Update test to cover non-ordered selection 2020-11-25 17:33:21 +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
323533d945 Add hiding Palpable HitObject property 2020-11-25 08:07:59 +09:00
6e55eb2090 Fix and add comments 2020-11-25 08:00:11 +09:00
3c3229ac4b Remove redundant StaysOnPlate 2020-11-25 07:59:45 +09:00
ab7251d742 Move members to PalpableCatchHitObject 2020-11-24 19:57:37 +09:00
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
4f7aa7e541 Move Palpable* to separate files 2020-11-24 19:48:13 +09:00
916a313f19 Rename PalpableDrawable -> DrawablePalpable 2020-11-24 19:48:13 +09:00