Commit Graph

26201 Commits

Author SHA1 Message Date
e2e6e67f79 Merge branch 'master' into difficultyadjust-order 2020-02-13 14:07:47 +09:00
53b62816f8 Add index constants for cross-class safety 2020-02-13 14:07:37 +09:00
6a2b3c5c02 Merge pull request #7733 from EVAST9919/rankings-overlay-spotlights
Add spotlight selector to RankingsOverlay
2020-02-13 13:14:02 +09:00
a8eb9ba45c Update xmldoc 2020-02-12 15:55:16 -08:00
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
9a9349a13a Merge branch 'master' into adjust-beatmap-overlay 2020-02-12 16:52:42 +09:00
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
866b6bb058 Merge branch 'master' into fix-song-select-weirdness 2020-02-12 15:01:15 +09:00
e9b5137147 Remove >-1 limitation by using a separate constructor 2020-02-11 21:52:22 -08:00
c080ebcc50 Merge pull request #7792 from recapitalverb/info-column-min-width
Fix InfoColumn minWidth implementation
2020-02-12 14:06:17 +09:00
e8ea0dcc02 Merge branch 'master' into info-column-min-width 2020-02-12 13:45:16 +09:00
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
b694b0c90c Merge branch 'master' into adjust-beatmap-overlay 2020-02-11 21:07:26 +01:00
2a67246b21 Ensure game is at main menu before performing exit on screen 2020-02-11 22:37:38 +09:00
2be7d1a873 Remove redundant type specification 2020-02-11 18:19:08 +07:00
44568ac9e6 Avoid covariant array conversion 2020-02-11 17:36:10 +07:00
28a39fd8fa Use explicit typing 2020-02-11 17:12:32 +07:00
17791259ed Fix InfoColumn minWidth implementation 2020-02-11 16:21:31 +07:00
333f976580 Fix test finding deleted beatmaps under dotnet-test 2020-02-11 17:47:10 +09:00
3d1183eea0 Merge branch 'master' into difficultyadjust-order 2020-02-10 16:46:24 -08:00
ca237fd987 Simplify ordering by using only numbers, add xmldoc 2020-02-10 16:21:49 -08:00
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
0b6558dc40 Add SpotlightsLayout to RankingsOverlay 2020-02-11 02:35:23 +03:00
b04a4b5c8a Implement SpotlightsLayout 2020-02-11 01:44:56 +03:00
ed6a35cb9f Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-spotlights 2020-02-11 00:18:11 +03:00
e072042d4e Match osu-web font size 2020-02-10 21:11:49 +01:00
35d5237ddd Adjust font sizes 2020-02-10 20:40:39 +01:00
811553cd60 Remove unnecessary coercions
Comparisons to null of nullable numbers are always false.
2020-02-10 20:37:34 +01:00
e2950d7027 Extract method to avoid nested ternaries 2020-02-10 20:27:46 +01:00
68e59410d9 Merge branch 'master' into seek-to-endtime-on-placement 2020-02-10 19:26:54 +09:00
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
926cde9afc Fix potential test failures 2020-02-10 18:17:59 +09:00
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
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
8186f72507 Remove unused using 2020-02-10 17:12:45 +09:00
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
66fb72cd8a Fix song select not showing active beatmap if it is filtered by local criteria 2020-02-10 16:59:54 +09:00
d61516e10c Add failing tests 2020-02-10 16:59:54 +09:00
f3c47dc8c9 Merge branch 'master' into seek-to-endtime-on-placement 2020-02-10 14:53:11 +09:00
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
ea521b466f Switch numerical consts to an enum 2020-02-09 21:37:40 -08:00
bb15153f30 Merge branch 'master' into placement-display-in-timeline 2020-02-10 14:29:01 +09:00
28cf5c7a59 Add accessor 2020-02-10 14:28:43 +09:00
c7ef15f6cf Merge pull request #7768 from turbedi/string_cleanup
Minor cleanups for legacy beatmap decoders
2020-02-10 13:55:43 +09:00
1f3d4e1f72 Merge branch 'master' into string_cleanup 2020-02-10 13:37:17 +09:00
137181017b Naming consistency with osu!web 2020-02-09 20:36:54 -08:00
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
88a56d00bf Allow specifying order to SettingSource 2020-02-09 20:11:37 -08:00
f4657b8ea8 Merge branch 'master' into fix-virtual-track-beatsync 2020-02-10 13:11:06 +09:00
e6111a1888 Merge pull request #7773 from ProTheory8/mod-test-improvements
Improve mod settings tests
2020-02-10 00:47:21 +09:00