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

33780 Commits

Author SHA1 Message Date
Dean Herbert
414f65c1ef Merge branch 'master' into spectator-listing 2020-11-02 15:48:21 +09:00
Dean Herbert
8adf146f53
Merge pull request #10640 from bdach/fix-music-paused-on-multi-exit 2020-11-02 15:46:19 +09:00
Dean Herbert
ab9e0aac58
Merge pull request #10258 from Game4all/results-dynamic-pp-calc 2020-11-02 15:40:55 +09:00
Dan Balasescu
2c51c24913
Merge pull request #10605 from peppy/spectator-replay-watcher
Add screen hierarchy for spectating another player
2020-11-02 15:29:59 +09:00
Dan Balasescu
c1a9a9082a
Merge pull request #10654 from peppy/fix-taiko-editor-crash
Fix taiko drum not correct handling sample / group point changes
2020-11-02 15:26:09 +09:00
Dean Herbert
8f2cd0e8c5 Add matching requestedByUser parameter to Play method 2020-11-02 15:01:30 +09:00
Dean Herbert
d2f6303988 Change default value of requestedByUser to false 2020-11-02 14:56:50 +09:00
Dean Herbert
ecad85b5f5 Merge branch 'master' into fix-music-paused-on-multi-exit 2020-11-02 14:55:15 +09:00
Dan Balasescu
04178e9458
Merge branch 'master' into spectator-replay-watcher 2020-11-02 14:54:51 +09:00
Dean Herbert
7b320a991f Add note about missing expiration logic 2020-11-02 14:53:32 +09:00
Dean Herbert
d46f7535c9 Add xmldoc for new component 2020-11-02 14:50:44 +09:00
Dean Herbert
fb105a1e9c Remove unnecessary field storage 2020-11-02 14:49:25 +09:00
Dean Herbert
73b290aca3 Merge branch 'master' into results-dynamic-pp-calc 2020-11-02 14:47:33 +09:00
Dean Herbert
3adf451e82 Handle changes via SamplePoints list for simplicity 2020-11-02 14:40:40 +09:00
Dean Herbert
bfa6ae1b66 Fix taiko drum not correct handling sample / group point changes
Closes https://github.com/ppy/osu/issues/10642
2020-11-02 14:40:40 +09:00
Dan Balasescu
8d11b09efe
Merge pull request #10615 from peppy/results-screen-applause
Add applause effect to results screen
2020-11-02 14:26:33 +09:00
smoogipoo
bd7c3d0d9f Merge branch 'master' into results-screen-applause 2020-11-02 13:38:19 +09:00
Dan Balasescu
db7f8a7322
Merge pull request #10619 from peppy/sample-lookup-improvements
Change sample lookup structure to allow specifications outside of "Gameplay" prefix
2020-11-02 13:36:07 +09:00
Dan Balasescu
1b53e6c782
Merge branch 'master' into sample-lookup-improvements 2020-11-02 13:04:35 +09:00
Dan Balasescu
8a768669ad
Merge pull request #10606 from FamousPig/fix-timeline-drag-select-weirdness
Fix timeline zoom during drag-select causing unexpected behaviour
2020-11-02 13:04:26 +09:00
Dean Herbert
6cfaee0f0b
Merge pull request #10631 from bdach/shift-delete-all-selected 2020-11-02 12:04:58 +09:00
Dean Herbert
6e2d722b8a
Merge pull request #10649 from ppy/dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.3.1 2020-11-02 11:52:38 +09:00
Dan Balasescu
5ae3da9399
Merge branch 'master' into fix-timeline-drag-select-weirdness 2020-11-02 11:18:37 +09:00
Dan Balasescu
836c3d3401
Merge pull request #10653 from Joehuu/fix-resume-beatmap-options-edit
Fix edit beatmap options button not resuming back to song select
2020-11-02 11:18:15 +09:00
Dean Herbert
61c9bb3245
Merge branch 'master' into dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.3.1 2020-11-02 10:56:09 +09:00
Dean Herbert
b048fbead4
Merge pull request #10652 from ppy/dependabot/nuget/Microsoft.CodeAnalysis.BannedApiAnalyzers-3.3.1
Bump Microsoft.CodeAnalysis.BannedApiAnalyzers from 3.3.0 to 3.3.1
2020-11-02 10:56:01 +09:00
Dean Herbert
0d199616c3
Merge pull request #10651 from ppy/dependabot/nuget/Microsoft.Build.Traversal-2.2.3
Bump Microsoft.Build.Traversal from 2.1.1 to 2.2.3
2020-11-02 10:55:51 +09:00
Dan Balasescu
b1b52f9073
Merge branch 'master' into fix-resume-beatmap-options-edit 2020-11-02 10:46:31 +09:00
Dan Balasescu
ba726c6291
Merge pull request #10623 from cadon0/fix-beatmap-details-metadata-bounce
Fix "bounce" when metadata container text is empty in song select
2020-11-02 10:45:14 +09:00
Joehu
71d55f16f3 Fix edit beatmap options button not resuming back to song select 2020-11-01 13:50:38 -08:00
Bartłomiej Dach
432282e8de Use alternative solution to avoid storing last zoom 2020-11-01 21:25:05 +01:00
Bartłomiej Dach
164370bc7d Resolve more CA1805 inspections 2020-11-01 20:51:23 +01:00
Bartłomiej Dach
3090b6ccb5 Resolve CA2249 inspections
"Use `string.Contains` instead of `string.IndexOf` to improve
readability"
2020-11-01 18:54:44 +01:00
Bartłomiej Dach
89bf7b1bd6 Resolve CA1835 inspection
"Change the `ReadAsync` method call to use the
`Stream.ReadAsync(Memory<byte>, CancellationToken)` overload"
2020-11-01 18:51:39 +01:00
Bartłomiej Dach
ca5de22ca5 Resolve CA1834 inspection
"Use `StringBuilder.Append(char)` instead of
`StringBuilder.Append(string)` when the input is a constant unit string"
2020-11-01 18:50:13 +01:00
Bartłomiej Dach
2b0bea535e Resolve CA1805 inspections
"Member is explicitly initialized to its default value"
2020-11-01 18:47:40 +01:00
dependabot-preview[bot]
79e610d31b
Bump Microsoft.CodeAnalysis.BannedApiAnalyzers from 3.3.0 to 3.3.1
Bumps [Microsoft.CodeAnalysis.BannedApiAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.3.0...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-01 17:15:23 +00:00
dependabot-preview[bot]
6e9ed76251
Bump Microsoft.Build.Traversal from 2.1.1 to 2.2.3
Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.1.1 to 2.2.3.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.1.1...Microsoft.Build.Traversal.2.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-01 17:14:57 +00:00
dependabot-preview[bot]
6ff13e399a
Bump Microsoft.CodeAnalysis.FxCopAnalyzers from 3.0.0 to 3.3.1
Bumps [Microsoft.CodeAnalysis.FxCopAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.0.0 to 3.3.1.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.0.0...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-01 17:14:13 +00:00
Bartłomiej Dach
716458344f Ensure spectator player is unsubscribed to prevent leak 2020-11-01 16:13:19 +01:00
Bartłomiej Dach
23d9fa4dfa Merge branch 'master' into spectator-replay-watcher 2020-11-01 15:53:37 +01:00
Dean Herbert
106bac1c6c
Merge pull request #10647 from bdach/beatmap-import-ensure-correct
Ensure LoadOszIntoOsu returns actual imported map
2020-11-01 23:49:34 +09:00
Bartłomiej Dach
b7696c85ad Add more xmldocs 2020-11-01 15:23:03 +01:00
Dean Herbert
1f8d627af4
Merge branch 'master' into shift-delete-all-selected 2020-11-01 23:03:01 +09:00
Dean Herbert
e1b8875553
Merge pull request #10634 from bdach/fix-leftover-selection-box-tooltip
Fix selection box action tooltips still being visible after object deletion
2020-11-01 23:02:29 +09:00
Bartłomiej Dach
5903c3be90 Fix inaccurate xmldoc 2020-11-01 14:39:10 +01:00
Bartłomiej Dach
8a54fdd4e6 Ensure LoadOszIntoOsu returns actual imported map 2020-11-01 14:25:33 +01:00
Lucas A
6bfff43634 Extract StatisticCounter to a separate class and use it instead. 2020-11-01 13:25:36 +01:00
Bartłomiej Dach
f3e0480e77
Merge branch 'master' into fix-beatmap-details-metadata-bounce 2020-10-31 17:36:40 +01:00
Bartłomiej Dach
7d090e0d2e
Merge pull request #10637 from peppy/fix-seasonal-backgrounds-nullref
Fix potential null reference when loading background
2020-10-31 17:36:16 +01:00