smoogipoo
4bbeb9ebd4
Merge branch 'master' into hit-sample-pooling
2020-11-30 18:31:58 +09:00
Dan Balasescu
3ddba8e5b3
Merge pull request #10973 from peppy/song-select-track-selected-better-2
...
Improve scroll tracking of selected item
2020-11-30 17:59:42 +09:00
Dan Balasescu
b0637cebd1
Merge branch 'master' into song-select-track-selected-better-2
2020-11-30 17:26:15 +09:00
Dan Balasescu
52cb30dff2
Merge pull request #10999 from bdach/user-interface-settings-section
...
Create "User Interface" settings section
2020-11-30 17:25:04 +09:00
Dan Balasescu
8b5733c9aa
Merge pull request #10979 from ekrctb/fruit-bindables
...
Add bindables for osu!catch hit object states
2020-11-30 17:24:56 +09:00
Dan Balasescu
11d1450c76
Merge branch 'master' into fruit-bindables
2020-11-30 16:48:22 +09:00
Dan Balasescu
d9edd4e7de
Merge pull request #10951 from peppy/fix-drawable-judgement-animation-loss
...
Fix DrawableJudgement not always animating correctly on skin change
2020-11-30 16:36:09 +09:00
Dan Balasescu
27471e5219
Merge pull request #11006 from peppy/fix-catch-combo-counter
...
Fix osu!catch combo counter not showing after 1 combo
2020-11-30 16:31:47 +09:00
Dean Herbert
4e1e45f3e7
Move hold-to-confirm back to UI section
2020-11-30 16:15:35 +09:00
Dean Herbert
55c8aa5d5f
Move menu cursor size to UI section
2020-11-30 16:14:15 +09:00
Dean Herbert
e14db45374
Reorder settings to (probably) feel more correct
2020-11-30 16:09:38 +09:00
Dean Herbert
9fbfb1aa9f
Add comment explaining requirement
2020-11-30 15:22:55 +09:00
Dean Herbert
73990a6674
Fix osu!catch combo counter not showing after 1 combo
2020-11-30 15:20:52 +09:00
ekrctb
8528b2687f
Fix possible null reference.
2020-11-30 14:24:50 +09:00
Dan Balasescu
69c2a18220
Merge branch 'master' into fix-drawable-judgement-animation-loss
2020-11-30 14:05:03 +09:00
Dan Balasescu
5053a7baf9
Merge pull request #10986 from peppy/fix-editor-reapply-same-state-change
...
Fix state application always checking newest state for early abort, rather than current
2020-11-30 14:04:44 +09:00
ekrctb
4228977c86
Store a DHO in FruitPiece to animate itself.
2020-11-30 13:46:02 +09:00
Dan Balasescu
5a276f8577
Merge branch 'master' into fix-editor-reapply-same-state-change
2020-11-30 13:34:03 +09:00
Dan Balasescu
6bea78619a
Update comment
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-11-30 13:33:29 +09:00
ekrctb
5e0e4e9db7
Use private access modifier for Border field.
2020-11-30 13:07:55 +09:00
Dan Balasescu
30dc0bc019
Merge pull request #10993 from LittleEndu/star-scale
...
Scale stars from 0.4 to 1
2020-11-30 13:05:44 +09:00
ekrctb
09b7ba41d6
Consistently use readonly field for bindables.
2020-11-30 13:00:01 +09:00
ekrctb
7986d7802d
Use ApplyDefaults in TestSceneFruitObjects.
2020-11-30 12:58:14 +09:00
ekrctb
5d3a5081a0
Remove use of HitObject in DHO constructors.
2020-11-30 12:52:58 +09:00
Dan Balasescu
2bbb387208
Merge pull request #10980 from peppy/fix-taiko-barlines-selectable
...
Move taiko barlines to their own ScrollingHitObjectContainer to avoid being considered as a selectable object
2020-11-30 10:40:47 +09:00
Bartłomiej Dach
aea964965d
Merge branch 'master' into fix-taiko-barlines-selectable
2020-11-29 23:17:24 +01:00
Bartłomiej Dach
e0a84ff1dc
Move hold-to-confirm setting back to gameplay section
2020-11-29 22:07:34 +01:00
Bartłomiej Dach
a5c4a8d2e9
Create "User Interface" settings section
2020-11-29 22:07:33 +01:00
Bartłomiej Dach
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
Bartłomiej Dach
4057ca0a57
Merge branch 'master' into fix-editor-unnecessary-object-updates
2020-11-29 21:34:17 +01:00
Bartłomiej Dach
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
Bartłomiej Dach
065acd1997
Merge branch 'master' into fix-editor-disappearing-objects
2020-11-29 20:53:46 +01:00
Bartłomiej Dach
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
Bartłomiej Dach
d1ed612362
Merge branch 'master' into reduce-slider-ball-opacity
2020-11-29 20:18:06 +01:00
Bartłomiej Dach
a3afd88387
Use Interpolation.Lerp
2020-11-28 20:35:03 +01:00
Bartłomiej Dach
9bf70e4e97
Add slider test step for visual inspection purposes
2020-11-28 20:32:08 +01:00
Bartłomiej Dach
8e0f525588
Rewrite existing test scene somewhat
2020-11-28 20:29:35 +01:00
Endrik Tombak
8ad4cf73f5
Scale stars from 0.4 to 1
2020-11-28 17:09:43 +02:00
Dean Herbert
7e34c5e239
Fix state application always checking newest state for early abort, rather than current
2020-11-27 16:57:11 +09:00
Dean Herbert
a9c59eed02
Add test coverage of fail scenario
2020-11-27 16:56:26 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
c0c197501e
Merge pull request #10981 from peppy/update-framework
...
Update framework
2020-11-27 15:50:36 +09:00
Dean Herbert
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
Dean Herbert
b9b8857988
Update framework
2020-11-27 15:11:07 +09:00
Dean Herbert
f29aa9c4fc
Move taiko barlines to their own ScrollingHitObjectContainer to avoid being considered as a selectable object
2020-11-27 14:35:12 +09:00
Dean Herbert
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
Dean Herbert
018957c244
Merge branch 'master' into song-select-track-selected-better-2
2020-11-27 12:54:40 +09:00
ekrctb
7ce752391d
Make TestSceneFruitObjects show correct color
2020-11-27 12:02:07 +09:00
ekrctb
35cd6674f6
Fix tiny droplet scale factor
2020-11-27 11:56:57 +09:00
