1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:53:21 +08:00
Commit Graph

35780 Commits

Author SHA1 Message Date
Dean Herbert
a3e4e2f6c3 Switch ResultsScreen and SongSelect inheritance and remove local implementation 2021-01-05 15:22:50 +09:00
Dean Herbert
cd7a5ca23a
Merge pull request #11413 from peppy/fix-mod-settings-transfer-issues
Fix difficulty adjust settings not being transferred correctly in multiplayer/playlists
2021-01-03 22:38:41 +09:00
Bartłomiej Dach
9e4a925ab1 Clarify & cleanup comments some 2021-01-03 13:44:29 +01:00
Bartłomiej Dach
a3e29b9154 Rename parameters for readability 2021-01-03 13:25:44 +01:00
Dean Herbert
2501707d7d Copy values using Bind to also copy defaults 2021-01-03 20:45:03 +09:00
Dean Herbert
6ad1b7767e
Update osu.Game/Online/API/APIMod.cs
Co-authored-by: Salman Ahmed <slmanarendo1950@gmail.com>
2021-01-03 17:04:16 +09:00
Dean Herbert
99fa0e25dc Switch back to FirstOrDefault to allow for weird testing logic to pass 2021-01-03 16:46:24 +09:00
Dean Herbert
29dbb1cc0d Add internal pathway for ensuring correct application of bindable mods 2021-01-03 15:48:28 +09:00
Dean Herbert
23e216fa0b Simplify some default value checks (we are sure the return is an IBindable) 2021-01-03 15:47:15 +09:00
Dean Herbert
1a44338124 Use SingleOrDefault for added safety when looking up mod acronyms 2021-01-03 15:38:30 +09:00
Dean Herbert
8511112e28
Merge pull request #11380 from bdach/unobserved-exceptions-pt-2
Catch multiplayer client-related unobserved exceptions better
2021-01-02 23:36:49 +09:00
Dean Herbert
f8fe22df8f
Merge pull request #11344 from Susko3/master
Fix file and share associations on Android
2021-01-02 22:44:12 +09:00
Dean Herbert
33d8d60717
Merge pull request #11401 from peppy/fix-signalr-reconnect
Allow signalr to retry connecting when connection is closed without an exception
2021-01-02 21:50:29 +09:00
Bartłomiej Dach
9ab1091281
Merge branch 'master' into fix-signalr-reconnect 2021-01-02 13:18:02 +01:00
Bartłomiej Dach
8d8e6d7bba
Merge pull request #11404 from bdach/bump-inspectcode 2021-01-02 13:17:34 +01:00
Bartłomiej Dach
924af58f5b Replace using static with explicit nested reference
This seems to be an inspectcode bug, as the code is correct and
compiles, but let's just work around it for now.
2021-01-02 12:25:59 +01:00
Bartłomiej Dach
18ac97ca56 Disable "merge sequential patterns" suggestions
As they were considered to be detrimental to code readability.
2021-01-02 12:21:53 +01:00
Bartłomiej Dach
66bd847b45 Bump InspectCode tool to 2020.3.2 2021-01-02 11:53:06 +01:00
Dean Herbert
72a6ca7755 Allow signalr to retry connecting when connection is closed without an exception 2021-01-02 16:47:00 +09:00
Dean Herbert
a96478e799
Merge pull request #11399 from bdach/dependency-updates
Update dependencies
2021-01-02 14:27:52 +09:00
Bartłomiej Dach
fa73d0172e Keep SignalR at last working version on iOS 2021-01-02 00:11:24 +01:00
Bartłomiej Dach
cecb05f83e Merge branch 'dependabot/nuget/Microsoft.CodeAnalysis.BannedApiAnalyzers-3.3.2' into dependency-updates 2021-01-02 00:10:52 +01:00
Bartłomiej Dach
30cebe7579 Merge branch 'dependabot/nuget/Microsoft.AspNetCore.SignalR.Client-3.1.10' into dependency-updates 2021-01-01 21:25:10 +01:00
Bartłomiej Dach
c3b59a84bc Merge branch 'dependabot/nuget/Microsoft.NET.Test.Sdk-16.8.3' into dependency-updates 2021-01-01 21:23:38 +01:00
Bartłomiej Dach
22264f2ffe Merge branch 'dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson-3.1.10' into dependency-updates 2021-01-01 21:22:38 +01:00
dependabot-preview[bot]
6cd838fd4b
Bump Microsoft.CodeAnalysis.BannedApiAnalyzers from 3.3.1 to 3.3.2
Bumps [Microsoft.CodeAnalysis.BannedApiAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.3.1 to 3.3.2.
- [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.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-01 17:55:04 +00:00
dependabot-preview[bot]
652b0ccd8f
Bump Microsoft.AspNetCore.SignalR.Client from 3.1.9 to 3.1.10
Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/aspnet/AspNetCore) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/aspnet/AspNetCore/releases)
- [Commits](https://github.com/aspnet/AspNetCore/compare/v3.1.9...v3.1.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-01 17:54:11 +00:00
dependabot-preview[bot]
0fd2e368c1
Bump Microsoft.NET.Test.Sdk from 16.8.0 to 16.8.3
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.0 to 16.8.3.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-01 17:53:41 +00:00
dependabot-preview[bot]
7441cfd94e
Bump Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/aspnet/AspNetCore) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/aspnet/AspNetCore/releases)
- [Commits](https://github.com/aspnet/AspNetCore/compare/v3.1.9...v3.1.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-01 17:53:29 +00:00
Dean Herbert
faed776112
Merge pull request #11382 from mcendu/move-health-meter 2020-12-31 22:39:49 +09:00
Susko3
79755e1826
Merge branch 'master' into master 2020-12-31 14:36:16 +01:00
Bartłomiej Dach
1e02f450a6
Merge branch 'master' into move-health-meter 2020-12-31 13:59:37 +01:00
mcendu
17abe90c27 move SkinnableHealthDisplay
Similar components are in osu.Game.Screens.Play.HUD while this is not
2020-12-31 20:23:13 +08:00
Bartłomiej Dach
2d279350ad Catch multiplayer client-related unobserved exceptions better
Silencing an exception from a task continuation requires accessing
`task.Exception` in any way, which was not done previously if
`logOnError` was false.

To resolve without having to worry whether the compiler will optimise
away a useless access or now, just always log, but switch the logging
level. The unimportant errors will be logged as debug and therefore
essentially silenced on release builds (but could still be potentially
useful in debugging).
2020-12-31 11:39:42 +01:00
Dean Herbert
ec75efe124
Merge pull request #11379 from peppy/fix-perform-from-menu-nullref
Fix PerformFromMenuRunner failing if CurrentScreen is null
2020-12-31 19:10:21 +09:00
Bartłomiej Dach
1b1447eb35 Merge branch 'master' into fix-perform-from-menu-nullref 2020-12-31 10:33:05 +01:00
Bartłomiej Dach
00c6703c51 Inline complete method as well
For better guarantees that `finalAction` is actually called on the same
screen that `checkCanComplete()` was (uses result of one
`getCurrentScreen()` call throughout instead of calling multiple times).
2020-12-31 10:27:42 +01:00
Dean Herbert
f9196ae976 Fix PerformFromMenuRunner failing if CurrentScreen is null 2020-12-31 16:36:20 +09:00
Dean Herbert
6ebb267c66
Merge pull request #11346 from bdach/fix-changelog-regression
Fix changelog header staying dimmed after build show
2020-12-31 16:15:25 +09:00
Susko3
8e7877a2a7
Merge branch 'master' into master 2020-12-30 23:36:39 +01:00
Susko3
9b40334830
Merge pull request #1 from Susko3/fix-android-file-associations
Remove duplicate application/octet-stream
2020-12-30 23:35:36 +01:00
Susko3
eb64e6bf4d
Remove duplicate application/octet-stream 2020-12-30 23:35:07 +01:00
Dean Herbert
a45f9b63b9
Merge pull request #11373 from peppy/move-out-thread-safety
Move thread safety / locking logic from MultiplayerRoom
2020-12-30 23:27:36 +09:00
Dean Herbert
497d644a19 Move thread safety / locking logic from MultiplayerRoom 2020-12-30 20:24:50 +09:00
Dean Herbert
6596e3c5e8
Merge branch 'master' into fix-changelog-regression 2020-12-30 01:34:18 +09:00
Dean Herbert
575a00dd7d
Merge pull request #11359 from peppy/fix-error-spam-on-disconnection 2020-12-30 01:33:02 +09:00
Dean Herbert
3920dac8af Merge branch 'master' into fix-error-spam-on-disconnection 2020-12-30 00:55:37 +09:00
Dean Herbert
3552034ffe Update framework 2020-12-30 00:55:27 +09:00
Bartłomiej Dach
4561911150
Merge pull request #11358 from peppy/remove-multiplayer-selection-poller 2020-12-29 13:27:33 +01:00
Bartłomiej Dach
05f212eb3c Merge branch 'master' into remove-multiplayer-selection-poller 2020-12-29 12:51:33 +01:00