1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 06:47:24 +08:00
Commit Graph

2991 Commits

Author SHA1 Message Date
Andrei Zavatski
b04a4b5c8a Implement SpotlightsLayout 2020-02-11 01:44:56 +03:00
Andrei Zavatski
ed6a35cb9f Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-spotlights 2020-02-11 00:18:11 +03:00
dependabot-preview[bot]
48781e5685 Bump Microsoft.NET.Test.Sdk from 16.4.0 to 16.5.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.4.0 to 16.5.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.4.0...v16.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 08:24:12 +00:00
Bartłomiej Dach
7e28f2fe6a Rename test to better reflect its purpose 2020-02-09 14:41:02 +01:00
Bartłomiej Dach
404cb61342 Open mod select in a more reliable way 2020-02-09 14:39:27 +01:00
ProTheory8
590429b43b Now TestAutoOpenOnModSelect checks if customisation closes after deselecting mod 2020-02-09 14:15:32 +05:00
Dan Balasescu
7c715937ca
Merge branch 'master' into skin-animation-frame-rate 2020-02-07 23:52:45 +09:00
Andrei Zavatski
dc8dd24405 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-spotlights 2020-02-07 11:49:31 +03:00
Dan Balasescu
5d6e007929
Merge branch 'master' into overlapping-scroll-origin 2020-02-07 16:44:34 +09:00
Dean Herbert
7460018cd3 Move combo colours to GlobalSkinColours 2020-02-07 14:58:07 +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
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
Dean Herbert
0c30e802c0 Merge remote-tracking branch 'upstream/master' into rearrangeable-playlist 2020-02-06 17:40:28 +09:00
Dan Balasescu
edf20e2c3e
Merge branch 'master' into lounge-ruleset-filtering 2020-02-06 15:35:26 +09:00
Dan Balasescu
108de6ac56
Merge branch 'master' into editor-slider-repeat 2020-02-06 14:48:45 +09:00
Dean Herbert
d00b61de99 Merge branch 'master' into lounge-ruleset-filtering 2020-02-06 13:38:27 +09:00
Dean Herbert
94b6564b98 Merge branch 'master' into editor-slider-repeat 2020-02-06 13:16:39 +09:00
Dean Herbert
75eb9ca040
Merge pull request #7739 from peppy/fix-rooms-test-scene
Fix rooms test scene not displaying anything
2020-02-06 13:12:10 +09:00
Dean Herbert
49ec1d4a99 Fix braces style 2020-02-06 13:04:29 +09:00
Dean Herbert
43b22e3b63 Add a ruleset filtering test 2020-02-06 13:03:15 +09:00
Dean Herbert
d32bb79e5a Add simple filtering test 2020-02-06 13:03:04 +09:00
Dan Balasescu
38bf14a06c
Merge branch 'master' into editor-beatmap-component 2020-02-06 12:25:33 +09:00
Dean Herbert
7f0a134bc8 Bring test scene structure up-to-date 2020-02-06 12:17:05 +09:00
Andrei Zavatski
00e010a061 Add visibility test for SpotlightSelector 2020-02-05 13:11:02 +03:00
Dean Herbert
09273d1da9 Fix test scene not correctly building a playable beatmap 2020-02-05 18:35:31 +09:00
Dean Herbert
dffc58c5fa Add blueprint type to timeline test 2020-02-05 17:52:51 +09:00
Dean Herbert
96986bf5fc Remove beat divisor from ctor and use DI instead 2020-02-05 17:48:21 +09:00
Andrei Zavatski
a3fd952f74 Use new SpotlightSelector in RankingsHeader 2020-02-05 11:21:23 +03:00
Andrei Zavatski
9347c3f535 Add trigger user change test 2020-02-05 11:13:32 +03:00
Andrei Zavatski
f8ad9476ef Adjust test step name 2020-02-04 21:03:17 +03:00
Andrei Zavatski
f889f2435b Add test step to TestSceneRankingsTable 2020-02-04 16:20:15 +03:00
Andrei Zavatski
5f63ef3bc1 Fix crashing test 2020-02-04 14:52:26 +03:00
Andrei Zavatski
524a8ba6c6 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-update 2020-02-04 11:19:13 +03:00
smoogipoo
e4e0a26b62 Merge remote-tracking branch 'origin/master' into rearrangeable-playlist 2020-02-04 16:55:55 +09:00
Dan Balasescu
b4a90dc4ea
Merge branch 'master' into fix-key-counter-visible-on-reshowing-hud 2020-02-04 14:43:33 +09:00
Dan Balasescu
0e3c1ed0f7
Merge branch 'master' into fix-key-counter-visible-on-reshowing-hud 2020-02-04 14:06:23 +09:00
Dan Balasescu
75f5cb4871
Merge branch 'master' into rankings-overlay-update 2020-02-04 13:52:57 +09:00
Dan Balasescu
2b471be340
Merge branch 'master' into spotlights_api 2020-02-04 13:48:02 +09:00
Dan Balasescu
634364863d
Merge branch 'master' into beatmap-overlay-header 2020-02-04 13:13:57 +09:00
Dan Balasescu
3600b0daf0
Merge branch 'master' into fix-mod-select-overflowing 2020-02-04 11:57:54 +09:00
Salman Ahmed
0ccbffde8d Use ChildrenOfType instead 2020-02-03 23:43:04 +03:00
Salman Ahmed
26a9d60437 Avoid exposing whenever possible 2020-02-03 23:17:10 +03:00
Andrei Zavatski
ad7f7343d7 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-header 2020-02-03 21:37:18 +03:00
Andrei Zavatski
824ee8a888 Recolour rankings tables 2020-02-03 21:22:37 +03:00
Andrei Zavatski
2a802307e7 Delete unused components 2020-02-03 20:59:08 +03:00
Andrei Zavatski
3b6ed3fb27 Use new header in the RankingsOverlay 2020-02-03 20:53:30 +03:00
Andrei Zavatski
588a77484b Add ContryFilter to new header 2020-02-03 20:32:20 +03:00