Commit Graph

35966 Commits

Author SHA1 Message Date
73990a6674 Fix osu!catch combo counter not showing after 1 combo 2020-11-30 15:20:52 +09:00
8528b2687f Fix possible null reference. 2020-11-30 14:24:50 +09:00
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
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
4228977c86 Store a DHO in FruitPiece to animate itself. 2020-11-30 13:46:02 +09:00
5a276f8577 Merge branch 'master' into fix-editor-reapply-same-state-change 2020-11-30 13:34:03 +09:00
6bea78619a Update comment
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-11-30 13:33:29 +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
5e0e4e9db7 Use private access modifier for Border field. 2020-11-30 13:07:55 +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
09b7ba41d6 Consistently use readonly field for bindables. 2020-11-30 13:00:01 +09:00
7986d7802d Use ApplyDefaults in TestSceneFruitObjects. 2020-11-30 12:58:14 +09:00
5d3a5081a0 Remove use of HitObject in DHO constructors. 2020-11-30 12:52:58 +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
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
aea964965d Merge branch 'master' into fix-taiko-barlines-selectable 2020-11-29 23:17:24 +01: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
a3afd88387 Use Interpolation.Lerp 2020-11-28 20:35:03 +01:00
9bf70e4e97 Add slider test step for visual inspection purposes 2020-11-28 20:32:08 +01:00
8e0f525588 Rewrite existing test scene somewhat 2020-11-28 20:29:35 +01:00
8ad4cf73f5 Scale stars from 0.4 to 1 2020-11-28 17:09:43 +02:00
579e61eab9 Allow null 2020-11-28 16:31:24 +08:00
5bc76cac58 Remove unused using statement 2020-11-27 17:01:07 +09:00
7e34c5e239 Fix state application always checking newest state for early abort, rather than current 2020-11-27 16:57:11 +09:00
a9c59eed02 Add test coverage of fail scenario 2020-11-27 16:56:26 +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
c0c197501e Merge pull request #10981 from peppy/update-framework
Update framework
2020-11-27 15:50:36 +09:00
a7194e1bc3 add stateless RNG 2020-11-27 15:43:44 +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
bcc197f9fe Merge branch 'master' into improve-dho-time-offsets 2020-11-27 15:03:56 +09:00
f29aa9c4fc Move taiko barlines to their own ScrollingHitObjectContainer to avoid being considered as a selectable object 2020-11-27 14:35:12 +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
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