1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 20:02:54 +08:00
Commit Graph

3177 Commits

Author SHA1 Message Date
Bartłomiej Dach
5a5e3b9410 Merge branch 'master' into align-score-right-content 2020-02-16 06:20:41 +01:00
Bartłomiej Dach
e5a66bdef3 Refactor drawable profile score to match web 2020-02-16 06:16:02 +01:00
voidedWarranties
8c81f1e684 Move CarouselBeatmap access to private, test using indices 2020-02-15 17:51:55 -08:00
Dan Balasescu
268f3333bd
Merge pull request #7841 from peppy/update-inspectcode
Update inspectcode version and fix new issues
2020-02-16 00:53:04 +09:00
smoogipoo
17e3470441 Replace hashcode override with local equality comparer 2020-02-16 00:23:52 +09:00
Bartłomiej Dach
01f9966933 Cover case of incorrect display in test scene 2020-02-15 16:05:15 +01:00
Dean Herbert
19d61c1255 Merge branch 'master' into match-subscreen-redesign 2020-02-15 15:29:33 +09:00
Dean Herbert
da68ae5461 Merge branch 'master' into match-songselect-playlist-logic 2020-02-15 12:27:51 +09:00
Dean Herbert
bb541f5ae4 Update inspectcode version and fix new issues 2020-02-15 11:54:29 +09:00
Dean Herbert
a4215106ff Merge branch 'master' into match-detail-area 2020-02-15 11:46:29 +09:00
Dean Herbert
af8eda2d24
Merge pull request #7829 from smoogipoo/match-playlist
Implement a rearrangeable beatmap playlist control
2020-02-15 11:42:26 +09:00
Dean Herbert
0b90e732a9
Merge branch 'master' into match-playlist 2020-02-15 11:09:17 +09:00
voidedWarranties
8e1ecddb1d Add testing 2020-02-14 17:23:24 -08:00
Andrei Zavatski
7cb11be810 Merge remote-tracking branch 'refs/remotes/ppy/master' into subcomments-alter-new 2020-02-14 20:55:51 +03:00
smoogipoo
61d539dc67 Fix first playlist item not getting selected 2020-02-14 23:39:39 +09:00
smoogipoo
b92f1ad68d Implement match subscreen re-design 2020-02-14 20:48:09 +09:00
smoogipoo
b762e5e8a5 Implement overlined components 2020-02-14 20:42:14 +09:00
smoogipoo
929eb4f035 Add match footer 2020-02-14 20:35:52 +09:00
smoogipoo
d5496321e2 Implement leaderboard chat display 2020-02-14 20:31:55 +09:00
smoogipoo
c75a774297 Extract participants list from the room inspector 2020-02-14 20:27:37 +09:00
smoogipoo
c0dba63278 Remove match info 2020-02-14 20:14:25 +09:00
Dean Herbert
73621e41fd Forcefully hide mute notification for navigation tests 2020-02-14 20:12:23 +09:00
smoogipoo
b0793b06ed Re-implement the match header 2020-02-14 20:10:36 +09:00
smoogipoo
1e80facfe8 Add subscreen test scene 2020-02-14 20:03:37 +09:00
smoogipoo
b5f048ce96 Merge branch 'match-songselect-playlist-logic' into match-subscreen-redesign 2020-02-14 19:59:15 +09:00
smoogipoo
0b86825d71 Merge branch 'match-playlist' into match-songselect-playlist-logic 2020-02-14 19:57:35 +09:00
smoogipoo
f31220c1ee Fix exception when adding duplicate items 2020-02-14 19:56:43 +09:00
Dean Herbert
14f632b532 Merge branch 'master' into match-detail-area 2020-02-14 19:54:17 +09:00
Dean Herbert
e6676ffa51 Merge branch 'match-playlist' into match-detail-area 2020-02-14 19:53:46 +09:00
Dean Herbert
05c48cd929 Fix volume mute tests regressing 2020-02-14 19:27:32 +09:00
Dean Herbert
47325601f4 Add failing test 2020-02-14 19:16:08 +09:00
smoogipoo
fbc5ffbadb Remove now unused members 2020-02-14 17:59:47 +09:00
smoogipoo
de646649de Use test beatmap instead of beatmap manager 2020-02-14 17:59:14 +09:00
smoogipoo
32fd713a9d Use test beatmap instead of beatmap manager 2020-02-14 17:57:25 +09:00
smoogipoo
f0f739707f Add playlist support to match song select 2020-02-14 17:51:42 +09:00
smoogipoo
5ec9f454d5 Implement the match beatmap detail area 2020-02-14 17:20:38 +09:00
smoogipoo
aceba8791c Clean up selection handling 2020-02-14 16:56:44 +09:00
smoogipoo
6a466ea2f5 Improve test cases 2020-02-14 16:48:30 +09:00
smoogipoo
d6768bba62 Make test playlist items unique 2020-02-14 16:09:30 +09:00
smoogipoo
5e871f9838 Make room playlist use the common rearrangeable design 2020-02-14 15:36:47 +09:00
Dean Herbert
b86b5e9adb Move nested class to bottom of file 2020-02-14 15:27:39 +09:00
Dean Herbert
c34f1f40ea Fix test text not being centered 2020-02-14 15:27:09 +09:00
Dean Herbert
aa7efe6141 Fix tests potentially failing due to timing issues 2020-02-14 15:26:55 +09:00
Dean Herbert
76cfe1f42c Merge branch 'master' into online-container 2020-02-14 15:18:27 +09:00
smoogipoo
eb14dbcd77 Initial implementation of rearrangeable playlist 2020-02-14 15:01:45 +09:00
Lucas A
049b0d93d1 Add back default content fade transitions 2020-02-13 21:40:25 +01:00
Bartłomiej Dach
0f25864fae Textbox -> TextBox rename pass 2020-02-13 21:04:53 +01:00
Bartłomiej Dach
5646083ed9 Adjust code style in test 2020-02-13 21:01:25 +01:00
Bartłomiej Dach
09b2e7beed Encapsulate test editors 2020-02-13 20:56:34 +01:00
Bartłomiej Dach
cc625e3b89 Move initialisation logic to [SetUp] 2020-02-13 20:44:02 +01:00
Lucas A
dac0148c94 Apply review suggestions. 2020-02-13 20:08:14 +01:00
Dean Herbert
4a04b434a9
Merge branch 'master' into remove-current-item 2020-02-13 21:41:23 +09:00
Dean Herbert
b9a296d3f9
Merge branch 'master' into remove-current-item 2020-02-13 19:34:15 +09:00
Dean Herbert
28ca1a5bcc
Merge branch 'master' into participants-bindable 2020-02-13 19:31:50 +09:00
smoogipoo
bce9c8f3f3 Make room participants into a bindable list 2020-02-13 18:59:15 +09:00
Dean Herbert
e022352812
Merge pull request #7784 from smoogipoo/fix-beatmap-disposal
Fix disposal-related errors by making WorkingBeatmap non-disposable
2020-02-13 18:52:47 +09:00
Dean Herbert
49a1725749
Merge pull request #7812 from smoogipoo/playlist-bindables
Make playlist beatmap and ruleset into bindables
2020-02-13 18:51:42 +09:00
smoogipoo
75bef15583 Remove "current" multiplayer room item 2020-02-13 18:48:28 +09:00
smoogipoo
91edadfe9d Make playlist beatmap and ruleset into bindables 2020-02-13 18:12:47 +09:00
smoogipoo
d4f14e552a Improve extensibility of mod display expansion 2020-02-13 18:05:53 +09:00
Dean Herbert
6a2b3c5c02
Merge pull request #7733 from EVAST9919/rankings-overlay-spotlights
Add spotlight selector to RankingsOverlay
2020-02-13 13:14:02 +09:00
Andrei Zavatski
c391a464a5 Add tests 2020-02-13 04:06:34 +03:00
Andrei Zavatski
ec9c01a75f Merge remote-tracking branch 'refs/remotes/ppy/master' into subcomments-alter-new 2020-02-12 23:32:28 +03:00
Andrei Zavatski
760be29015 Merge remote-tracking branch 'refs/remotes/ppy/master' into comment-editor 2020-02-12 13:23:35 +03:00
Dan Balasescu
9a9349a13a
Merge branch 'master' into adjust-beatmap-overlay 2020-02-12 16:52:42 +09:00
Dan Balasescu
866b6bb058
Merge branch 'master' into fix-song-select-weirdness 2020-02-12 15:01:15 +09:00
Andrei Zavatski
9ac6c271ac Naming adjustments 2020-02-12 02:05:45 +03:00
Tree
b694b0c90c
Merge branch 'master' into adjust-beatmap-overlay 2020-02-11 21:07:26 +01:00
Andrei Zavatski
c022cf72b5 Implement CancellableCommentEditor 2020-02-11 20:47:51 +03:00
Lucas A
b9e10cb498 Privatize ViewTarget 2020-02-11 18:10:46 +01:00
Andrei Zavatski
829152c8e8 Implement EditorTextbox 2020-02-11 20:08:24 +03:00
Andrei Zavatski
482f622c94 CommentEditor basic implementation 2020-02-11 18:46:49 +03:00
Dean Herbert
333f976580 Fix test finding deleted beatmaps under dotnet-test 2020-02-11 17:47:10 +09:00
Andrei Zavatski
0b6558dc40 Add SpotlightsLayout to RankingsOverlay 2020-02-11 02:35:23 +03:00
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
Andrei Zavatski
26afe0f31e Add ability to load long comment trees in CommentsContainer 2020-02-10 15:43:11 +03:00
Dean Herbert
926cde9afc Fix potential test failures 2020-02-10 18:17:59 +09: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
smoogipoo
cef682aa03 Make WorkingBeatmap non-disposable 2020-02-10 17:02:01 +09:00
Dean Herbert
d61516e10c Add failing tests 2020-02-10 16:59:54 +09: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
Lucas A
30e0a34e50 Wrap Content into a container for animating visibility. 2020-02-08 17:11:31 +01:00
Lucas A
7ca9f4dc20 Apply review suggestions 2020-02-08 17:11:31 +01:00
Lucas A
d3dc0b63ff Remove string concatenation from ctor 2020-02-08 17:07:26 +01:00
Lucas A
6d51b344ab Display a loading animation when the user is connecting 2020-02-08 17:07:20 +01: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
TheWildTree
ae467538d3 Fix tests 2020-02-04 22:39:51 +01: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
Andrei Zavatski
b284170437 Basic implementation of new RankingsOverlayHeader 2020-02-03 20:20:35 +03:00
Salman Ahmed
4cd4055e7c Rename to AlwaysVisible and add XMLDoc 2020-02-03 20:00:43 +03:00
Salman Ahmed
51ed289c59 Revert namings and behaviour changes 2020-02-03 19:59:58 +03:00
Andrei Zavatski
12574111e5 Use ColourProvider colours 2020-02-03 19:44:10 +03:00
Andrei Zavatski
e531570352 Merge remote-tracking branch 'refs/remotes/ppy/master' into spotlights_api 2020-02-03 19:34:35 +03:00
Dean Herbert
a365082a98 Fix potential nullref in UserDimBackgrounds tests 2020-02-03 22:18:07 +09:00
Salman Ahmed
351cb8ac1a Rename Visible to HasReplayLoaded and change default value
Doesn't make sense to be true by default
2020-02-03 15:47:52 +03:00
Salman Ahmed
443063263e Merge remote-tracking branch 'upstream/master' into fix-key-counter-visible-on-reshowing-hud 2020-02-03 15:18:25 +03:00
Andrei Zavatski
032c2c2afe Refactor BeatmapRulesetSelector 2020-02-03 14:16:26 +03:00
Dan Balasescu
76ba0b833e
Merge pull request #7716 from EVAST9919/overlay-header-ruleset-selector
Add ability to create ruleset selector in OverlayHeader
2020-02-03 19:00:12 +09:00
Dan Balasescu
c6e7603e5e
Merge branch 'master' into safe-screen-lease 2020-02-03 18:18:13 +09:00
Andrei Zavatski
81ab6d43b6 Add ability to create ruleset selector in OverlayHeader 2020-02-03 11:09:46 +03:00
Dan Balasescu
1d1a5b26ab
Merge pull request #7678 from peppy/perform-from-screen
Refactor performFromMenu to work with multiple screen targets
2020-02-03 16:28:01 +09:00
Dan Balasescu
93952d438f
Merge pull request #7677 from peppy/decouple-mod-select-bindable
Decouple ModSelectOverlay from global SelectedMods
2020-02-03 16:27:47 +09:00
Dean Herbert
9183c78319 Fix crash on exiting song select with ctrl-enter autoplay 2020-02-03 16:04:32 +09:00
Dan Balasescu
7676185bb6
Merge branch 'master' into perform-from-screen 2020-02-03 15:55:45 +09:00
Dean Herbert
fae5bf0f18
Merge branch 'master' into overlay-ruleset-selector 2020-02-03 13:48:28 +09:00