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

33555 Commits

Author SHA1 Message Date
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
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
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
8a54fdd4e6 Ensure LoadOszIntoOsu returns actual imported map 2020-11-01 14:25:33 +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
Bartłomiej Dach
2065680e9d Simplify test case 2020-10-31 17:01:45 +01:00
Dean Herbert
a9a3489e92 Fix potential null reference when loading background
As seen in
https://discordapp.com/channels/188630481301012481/188630652340404224/772094427342569493.
Caused due to async load of the loader, which means it may not be ready
before Next() is called.
2020-10-31 22:51:35 +09:00
Bartłomiej Dach
007c27d3ff Schedule visibility update once per frame 2020-10-31 14:45:11 +01:00
Bartłomiej Dach
d74c19e2d7 Shorten show/hide code 2020-10-31 13:54:02 +01:00
Bartłomiej Dach
3322b8a7ea Run OnSelectionChanged() on each change 2020-10-31 13:54:02 +01:00
Bartłomiej Dach
003994ab75 Bind UpdateVisibility() directly to source of truth 2020-10-31 13:54:02 +01:00
Bartłomiej Dach
129b1bc6d3 Delete all selected objects if shift-clicked on one 2020-10-31 11:46:25 +01:00
Dean Herbert
6a293dd536 Add missing ctor parameters back 2020-10-31 18:56:30 +09:00
Dean Herbert
979eb1685b
Merge branch 'master' into results-screen-applause 2020-10-31 18:47:49 +09:00
Dean Herbert
ea007af572
Merge pull request #10586 from hbnrmx/seasonal-backgrounds
Add Seasonal backgrounds
2020-10-31 15:28:43 +09:00
Bartłomiej Dach
78842ab95a Improve look & behaviour of background transitions 2020-10-30 22:40:24 +01:00
Bartłomiej Dach
391dd73843 Fix typo in comment 2020-10-30 22:39:34 +01:00
Bartłomiej Dach
38cf90a69b Change background to seasonal right after login 2020-10-30 22:03:26 +01:00
Bartłomiej Dach
29ad099902 Allow to fetch if going online after launch 2020-10-30 21:49:14 +01:00
Bartłomiej Dach
8632f0d77f Add test coverage 2020-10-30 21:48:09 +01:00
Bartłomiej Dach
67a325f47d Move config setting logic to background loader 2020-10-30 21:22:22 +01:00
Bartłomiej Dach
cf0e8e0a62 Document nullability of seasonal backgrounds 2020-10-30 20:00:59 +01:00
Bartłomiej Dach
aeab2be5d1 Add xmldoc to SeasonalBackgroundMode 2020-10-30 19:56:52 +01:00
Bartłomiej Dach
20c27c6943 Rename lookup & field 2020-10-30 19:55:22 +01:00
Bartłomiej Dach
82ef85569b Fix nullref when querying IsInSeason before request completion 2020-10-30 19:35:08 +01:00
Max Hübner
d5dfd1dffe Insert optional parentheses 2020-10-30 18:07:07 +01:00