1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 12:33:01 +08:00
Commit Graph

34539 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Dan Balasescu
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
ekrctb
fe85b7d482 Remove unused import 2020-11-27 10:18:00 +09:00
ekrctb
57454bbb1c Remove hitObject argument from OnApply and OnFree 2020-11-27 10:13:05 +09:00
Dean Herbert
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
Dean Herbert
94dc61150b
Merge branch 'master' into fix-drawable-judgement-animation-loss 2020-11-27 00:43:47 +09:00
Dean Herbert
b1864670a2
Merge pull request #10961 from smoogipoo/better-dho-rewind
Rewind pooled DHOs into better states
2020-11-27 00:42:58 +09:00
Dan Balasescu
220657c2cc
Merge branch 'master' into replay-pausing-support 2020-11-27 00:09:40 +09:00
Dan Balasescu
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
smoogipoo
aa4da2a5f8 Add xmldoc on State 2020-11-26 23:42:05 +09:00
Dean Herbert
1e79cb498b Standardise binding description case to sentence casing 2020-11-26 20:07:16 +09:00
Dean Herbert
3346c06aca Rename variable/text to be more verbose as to toggle purpose 2020-11-26 20:04:44 +09:00
Dean Herbert
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
Dan Balasescu
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
smoogipoo
e53f849aa0 Completely separate combo colours from DHOs 2020-11-26 18:14:25 +09:00
smoogipoo
f562854feb Fix timeline objects sometimes not receiving combo colours 2020-11-26 17:22:22 +09:00
Dan Balasescu
aad6cf4ad3
Merge branch 'master' into editor-multiple-object-positional-snap 2020-11-26 17:06:47 +09:00
Dan Balasescu
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
Dan Balasescu
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
ekrctb
cafe8cf7fa Refactor border of fruits to classes 2020-11-26 15:24:32 +09:00
ekrctb
8a73b335f3 Move catch piece files 2020-11-26 15:24:32 +09:00
ekrctb
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