1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 18:47:27 +08:00
Commit Graph

26116 Commits

Author SHA1 Message Date
Dan Balasescu
7c715937ca
Merge branch 'master' into skin-animation-frame-rate 2020-02-07 23:52:45 +09:00
Andrei Zavatski
2d1afb66fb Add history counts to user api 2020-02-07 16:21:47 +03:00
Dean Herbert
6c40f88dbe
Update the windows platform offset to match stable (#7752)
Update the windows platform offset to match stable
2020-02-07 19:53:56 +09:00
Dean Herbert
830afe5209 Make spinner blueprint update values more frequently. Also handle right-click 2020-02-07 19:09:47 +09:00
Dean Herbert
a6531bf73e Don't show distance snap grid for spinners (for now) 2020-02-07 19:09:23 +09:00
Dean Herbert
6297606baa Make sMake spinner's EndTime correct on construction 2020-02-07 19:08:37 +09:00
Dean Herbert
2082948f9a Make editor screens display below timeline 2020-02-07 18:23:59 +09:00
Dan Balasescu
476c86f961
Merge branch 'master' into offset-match-stable 2020-02-07 18:21:50 +09:00
Dan Balasescu
71ba3e459b
Merge pull request #7750 from peppy/fix-editor-test-scene
Fix editor test scene exiting after loading
2020-02-07 18:07:48 +09:00
Dean Herbert
56a091674b Add placement display to timeline 2020-02-07 18:04:10 +09:00
Dean Herbert
e08437c5dc Track placement object in EditorBeatmap 2020-02-07 18:03:14 +09:00
Dean Herbert
e31d69c749 Add commit status to EndPlacement; call BeginPlacement on initial movement 2020-02-07 18:02:48 +09:00
Dan Balasescu
66f5ad4adb
Merge pull request #7751 from peppy/fix-editor-snapping-inaccuracy
Fix duration snapping still being incorrect
2020-02-07 17:56:56 +09:00
Dean Herbert
b7996f91fc Update the windows platform offset to match stable 2020-02-07 17:51:38 +09:00
Dan Balasescu
7b70481a10
Merge branch 'master' into fix-editor-test-scene 2020-02-07 17:20:43 +09:00
Dan Balasescu
a6a285bc09
Merge branch 'master' into fix-editor-snapping-inaccuracy 2020-02-07 17:20:42 +09:00
Dan Balasescu
e6060d5ecc
Merge pull request #7749 from peppy/fix-incorrect-distance-snap-grip
Fix incorrect distance snap grid being displayed when in selection mode
2020-02-07 17:20:28 +09:00
Dan Balasescu
230435b5a3
Merge pull request #7745 from bdach/overlapping-scroll-origin
Fix lifetime calculation in overlapping scroll algorithm
2020-02-07 17:15:35 +09:00
Dan Balasescu
5d6e007929
Merge branch 'master' into overlapping-scroll-origin 2020-02-07 16:44:34 +09:00
Dan Balasescu
efa7eb70af
Merge branch 'master' into fix-incorrect-distance-snap-grip 2020-02-07 16:44:33 +09:00
Dean Herbert
8990152315 Fix duration snapping still being incorrect 2020-02-07 16:43:50 +09:00
Dean Herbert
9997ae17bc Fix editor test scene exiting after loading 2020-02-07 16:42:56 +09:00
Dean Herbert
3aa18abd99
Fix typo in xmldoc
Co-Authored-By: Tree <thewildtree@outlook.com>
2020-02-07 16:22:59 +09:00
Dean Herbert
d557bd95f6
Update framework (#7747)
Update framework
2020-02-07 16:10:24 +09:00
Dean Herbert
f63bf06373 Fix incorrect distance snap grid being displayed when in selection mode 2020-02-07 16:09:54 +09:00
Dean Herbert
c392ba6a7e Update framework 2020-02-07 15:46:10 +09:00
Dean Herbert
9181bb41c6 Remove unused using 2020-02-07 15:11:09 +09:00
Dean Herbert
544685be48 Add support for reading skin frame rate from configuration file 2020-02-07 14:58:29 +09:00
Dean Herbert
7460018cd3 Move combo colours to GlobalSkinColours 2020-02-07 14:58:07 +09:00
Dan Balasescu
819973bba3
Merge branch 'master' into make_screenshot_manager_a_drawable 2020-02-07 14:48:50 +09:00
Dan Balasescu
55a8e88609
Merge pull request #7728 from EVAST9919/logged-out-comments
Allow guest users to see the comments in CommentsContainer
2020-02-07 13:08:05 +09:00
Bartłomiej Dach
5fde4f2c0c Fix lifetime calculation in overlapping algorithm
Changes to lifetime calculation in scrolling rulesets introduced in
#7367, which aimed to account for the distance between hit objects'
origin and its edge entering the scrolling area, fixed some issues with
hitobjects appearing abruptly, but also regressed some other scenarios.

Upon investigation, the regression was localised to the overlapping
scroll algorithm. The reason for this was two-fold:

* The previous code used TimeAt() to calculate the time of travel from
  the hit object's edge to its origin. For other algorithms, that time
  can be accurately reconstructed, because they don't have periods of
  time where there are multiple hit objects scrolling at different
  velocities.

  That invariant does not hold for the overlapping algorithm, therefore
  it is possible for different values to be technically correct for
  TimeAt(). However, the only value that matters for the adjustment
  is the one that's indicated by the control point that applies to the
  hit object origin, which can be uniquely identified.

* Additionally, the offset returned (even if correct) was applied
  externally to the hit object's start time and passed to
  GetDisplayStartTime(). In the overlapping algorithm, the choice of
  control point used in GetDisplayStartTime() is important, since
  the value of the speed multiplier is read within.

  Externally rewinding the hit object's start time meant that in some
  cases the speed multiplier of the *previous* control point is applied,
  which led to hit objects appearing too late if the scrolling rate
  decreased.

Because of the above, modify GetDisplayStartTime() to take the offset
into account in all algorithms, and apply the adjustment correctly
inside of them. The constant and sequential algorithms needed no
adjustment from the previous logic, since:

* the constant algorithm disregarded control points, and
* the sequential algorithm would effectively rewind to time = 0,
  calculate the absolute distance from time = 0 to the hit object start,
  apply the origin offset *to the absolute distance*, and then convert
  back to time, applying all control points in sequence. Due to this
  it was impossible for control points to get mixed up while
  calculating.

As for the overlapping algorithm, the high-level logic is as follows:

* The distance that the origin has to travel is the length of the scroll
  plus the distance from the origin to the object edge.
* The above distance divided by the scroll length gives the relative
  scroll lengths that the object has to travel.
* As one relative scroll length takes one time range, the relative
  travel length multiplied by the time range gives the absolute travel
  time of the object origin.
* Finally, the control point multiplier applicable at origin time is
  applied to the whole travel time.

Correctness of the above is demonstrated by visual tests added before
and headless unit tests of the algorithms themselves. The sequential
scroll algorithm was not covered by unit tests, and remains uncovered
due to floating-point inaccuracies that should be addressed separately.
2020-02-06 23:13:28 +01:00
Bartłomiej Dach
12469469ad Add reproduction test steps for lifetime bug
Modify TestSceneScrollingHitObjects to contain a test case that serves
as a reproduction for a visual bug in which using the overlapping scroll
algorithm results in an incorrect origin adjustment for lifetime.
2020-02-06 23:12:22 +01:00
Bartłomiej Dach
ecde641729 Randomise colours in scrolling test scene
Switch to using randomised colours in TestSceneScrollingHitObjects to
better distinguish individual hit objects.
2020-02-06 22:47:59 +01:00
UselessToucan
4495192c25
Make ScreenshotManager a Component
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2020-02-06 23:22:30 +03:00
Roman Kapustin
83b2b63d2c Make ScreenshotManager a Drawable 2020-02-06 23:02:03 +03:00
Andrei Zavatski
5946ad7d80 Fix possible memory leak and better user change test support 2020-02-06 16:54:02 +03:00
Andrei Zavatski
0840033343 Merge remote-tracking branch 'refs/remotes/ppy/master' into logged-out-comments 2020-02-06 16:38:47 +03:00
Dan Balasescu
b221a44fa9
Merge pull request #7742 from peppy/mod-setting-keyboard-step
Set a sane default keyboard step for mod settings
2020-02-06 21:07:13 +09:00
Dean Herbert
1613198834 Set a sane default keyboard step for mod settings 2020-02-06 19:43:33 +09:00
Dean Herbert
27f2ee9cb4
Merge pull request #7680 from smoogipoo/rearrangeable-playlist
Reimplement music playlist using framework's RearrangeableListContainer
2020-02-06 19:18:07 +09:00
Dean Herbert
48350638a2 Hide drag handles of all playlist items not currently being dragged 2020-02-06 18:38:00 +09:00
Dean Herbert
0c30e802c0 Merge remote-tracking branch 'upstream/master' into rearrangeable-playlist 2020-02-06 17:40:28 +09:00
Dean Herbert
6b67b601e9 Update framework 2020-02-06 17:35:13 +09:00
Dan Balasescu
bb0990d805
Merge pull request #7740 from peppy/lounge-ruleset-filtering
Make multiplayer room listing filter by current ruleset
2020-02-06 15:53:50 +09:00
Dan Balasescu
edf20e2c3e
Merge branch 'master' into lounge-ruleset-filtering 2020-02-06 15:35:26 +09:00
Dan Balasescu
8d12d820f1
Merge pull request #7734 from peppy/editor-slider-repeat
Add the ability to extend hold notes (spinners / sliders etc.) via timeline
2020-02-06 15:35:16 +09:00
Dan Balasescu
db771150ab
Merge pull request #7741 from peppy/simplify-mp-subscreen-disables
Simplify the way multiple subscreens handle their disable states via a custom stack
2020-02-06 15:34:59 +09:00
Dan Balasescu
108de6ac56
Merge branch 'master' into editor-slider-repeat 2020-02-06 14:48:45 +09:00
smoogipoo
6ae0efa40d Fix adjustment not working when dragged before object 2020-02-06 14:47:43 +09:00