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

26182 Commits

Author SHA1 Message Date
Andrei Zavatski
5201c1c87b Use new algorithm for comments tree creation 2020-02-13 02:21:13 +03:00
Andrei Zavatski
e2b3494352 Remove dependency on load state for DrawableComment.AddReplies 2020-02-13 00:19:21 +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
Dan Balasescu
0f1d30c55e
Merge pull request #7730 from TheWildTree/adjust-beatmap-overlay
Adjust minor BeatmapSetOverlay details to better match osu-web
2020-02-12 18:13:45 +09:00
Dan Balasescu
9a9349a13a
Merge branch 'master' into adjust-beatmap-overlay 2020-02-12 16:52:42 +09:00
Dan Balasescu
935aa709b5
Merge pull request #7783 from peppy/fix-song-select-weirdness
Bypass song select filter to show externally changed beatmap temporarily
2020-02-12 15:23:47 +09:00
Dan Balasescu
866b6bb058
Merge branch 'master' into fix-song-select-weirdness 2020-02-12 15:01:15 +09:00
Dan Balasescu
c080ebcc50
Merge pull request #7792 from recapitalverb/info-column-min-width
Fix InfoColumn minWidth implementation
2020-02-12 14:06:17 +09:00
Dan Balasescu
e8ea0dcc02
Merge branch 'master' into info-column-min-width 2020-02-12 13:45:16 +09:00
Dan Balasescu
1d8f7cb4d7
Merge pull request #7793 from peppy/fix-crash-on-exit
Fix potential crash when exiting game while entering song select
2020-02-12 13:35:37 +09:00
Tree
b694b0c90c
Merge branch 'master' into adjust-beatmap-overlay 2020-02-11 21:07:26 +01:00
Dean Herbert
2a67246b21 Ensure game is at main menu before performing exit on screen 2020-02-11 22:37:38 +09:00
recapitalverb
2be7d1a873 Remove redundant type specification 2020-02-11 18:19:08 +07:00
recapitalverb
44568ac9e6 Avoid covariant array conversion 2020-02-11 17:36:10 +07:00
recapitalverb
28a39fd8fa Use explicit typing 2020-02-11 17:12:32 +07:00
recapitalverb
17791259ed Fix InfoColumn minWidth implementation 2020-02-11 16:21:31 +07:00
Dean Herbert
333f976580 Fix test finding deleted beatmaps under dotnet-test 2020-02-11 17:47:10 +09:00
Dean Herbert
804d210250
Merge pull request #7756 from peppy/seek-to-endtime-on-placement
Seek to previous object's end time on successful placement
2020-02-11 08:45:15 +09:00
Andrei Zavatski
15b4e3386f Fix incorrect algorithm for comment tree creation
Can cause one comment to be redrawn multiple times
2020-02-10 23:57:48 +03:00
TheWildTree
e072042d4e Match osu-web font size 2020-02-10 21:11:49 +01:00
Bartłomiej Dach
35d5237ddd Adjust font sizes 2020-02-10 20:40:39 +01:00
Bartłomiej Dach
811553cd60 Remove unnecessary coercions
Comparisons to null of nullable numbers are always false.
2020-02-10 20:37:34 +01:00
Bartłomiej Dach
e2950d7027 Extract method to avoid nested ternaries 2020-02-10 20:27:46 +01:00
Andrei Zavatski
d20a860879 CI fix 2020-02-10 16:08:58 +03:00
Andrei Zavatski
8239f21cad Remove whitespace 2020-02-10 15:52:12 +03:00
Andrei Zavatski
26afe0f31e Add ability to load long comment trees in CommentsContainer 2020-02-10 15:43:11 +03:00
Dan Balasescu
68e59410d9 Merge branch 'master' into seek-to-endtime-on-placement 2020-02-10 19:26:54 +09:00
Dean Herbert
6a38f4d13d Merge pull request #7782 from ppy/dependabot/nuget/Microsoft.NET.Test.Sdk-16.5.0
Bump Microsoft.NET.Test.Sdk from 16.4.0 to 16.5.0
2020-02-10 18:25:37 +09: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
Dean Herbert
10b31e8874 Merge pull request #7781 from ppy/dependabot/nuget/Sentry-2.0.2
Bump Sentry from 2.0.1 to 2.0.2
2020-02-10 17:22:51 +09:00
Dean Herbert
8186f72507 Remove unused using 2020-02-10 17:12:45 +09:00
dependabot-preview[bot]
2252f79084 Bump Sentry from 2.0.1 to 2.0.2
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.0.1...2.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 08:01:14 +00:00
Dean Herbert
66fb72cd8a Fix song select not showing active beatmap if it is filtered by local criteria 2020-02-10 16:59:54 +09:00
Dean Herbert
d61516e10c Add failing tests 2020-02-10 16:59:54 +09:00
Dan Balasescu
f3c47dc8c9 Merge branch 'master' into seek-to-endtime-on-placement 2020-02-10 14:53:11 +09:00
Dan Balasescu
36414e9a53 Merge pull request #7753 from peppy/placement-display-in-timeline
Show current placement blueprint in timeline
2020-02-10 14:47:39 +09:00
Dan Balasescu
bb15153f30 Merge branch 'master' into placement-display-in-timeline 2020-02-10 14:29:01 +09:00
Dan Balasescu
28cf5c7a59 Add accessor 2020-02-10 14:28:43 +09:00
Dean Herbert
c7ef15f6cf Merge pull request #7768 from turbedi/string_cleanup
Minor cleanups for legacy beatmap decoders
2020-02-10 13:55:43 +09:00
Dan Balasescu
1f3d4e1f72 Merge branch 'master' into string_cleanup 2020-02-10 13:37:17 +09:00
Dan Balasescu
3627548389 Merge pull request #7776 from peppy/fix-virtual-track-beatsync
Fix BeatSyncContainer failing at song select
2020-02-10 13:31:29 +09:00
Dan Balasescu
f4657b8ea8 Merge branch 'master' into fix-virtual-track-beatsync 2020-02-10 13:11:06 +09:00
Dean Herbert
e6111a1888
Merge pull request #7773 from ProTheory8/mod-test-improvements
Improve mod settings tests
2020-02-10 00:47:21 +09:00
ProTheory8
f6a346e036 Merge branch 'master' into mod-test-improvements 2020-02-09 19:19:50 +05: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
Dean Herbert
a0c6492ecf Merge pull request #7761 from jorolf/beat-caret
Make the caret blink to the beat
2020-02-09 21:50:17 +09:00
Dean Herbert
96574a98ad Use non-zero length for fallback virtual track (allows tests to work as expected) 2020-02-09 21:34:56 +09:00
Dean Herbert
c1f52ef594 Refactor BeatSyncContainer to handle zero length tracks 2020-02-09 21:25:28 +09:00