Commit Graph

22376 Commits

Author SHA1 Message Date
fbbc26d7d8 Merge branch 'master' into fix-carousel-centering-on-window-resize 2021-01-05 21:30:39 +01:00
847d2d8deb Merge branch 'master' into fix-transform-mutation-from-disposal-thread 2021-01-05 19:52:10 +01:00
4b539b01c1 Match code between updateSelectedBeatmap/Ruleset 2021-01-05 20:38:58 +09:00
3b98782964 Merge pull request #11420 from kyekiller/master
Fix to toolbar tooltips
2021-01-05 17:43:32 +09:00
60fc60fa00 Merge pull request #11415 from frenzibyte/fix-ready-button-crash
Fix multiplayer ready button crashing when deleting selected beatmap set
2021-01-05 15:58:09 +09:00
ed6ffe2ef1 Remove hacky code 2021-01-05 14:54:59 +09:00
77e660e426 Should pass all checks again now. 2021-01-04 22:11:52 +00:00
1234d0fa04 Applied all tooltips to the right 2021-01-04 22:01:12 +00:00
254698d9a2 Merge branch 'master' into master 2021-01-04 21:07:12 +00:00
0e42d415c1 Hit another oopie 2021-01-04 21:05:28 +00:00
3468df840b Moved tooltip to the left to stop the overflow 2021-01-04 21:04:30 +00:00
73f5e5aaf9 Moved "ToolbarSocialButton" back 2021-01-04 21:03:51 +00:00
2e2b3ab5d4 Should remove codeFactor error 2021-01-04 17:26:42 +00:00
2d1b52be0d Moved "ToolbarSocialButton"
This will remove it from coming off the screen.
2021-01-04 17:21:31 +00:00
3b08faa0ea Fix RemoveBlockingOverlay causing transform mutation from disposal threads 2021-01-04 17:49:11 +09:00
485a57776b Fix hasBeatmap potentially checking on outdated DeletePending value 2021-01-04 10:28:41 +03:00
ea38b00b29 Schedule all calls to updateBeatmapState() 2021-01-04 10:27:08 +03:00
9e0c490141 Remove unused using 2021-01-04 15:40:22 +09:00
20d04d6933 Fix Storyboard's FirstEventTime not finding the true earliest event 2021-01-04 15:16:01 +09:00
445a4bd01c Re-query beatmap info on database changes 2021-01-04 09:00:16 +03:00
ca5f2bcd4c Revert database-side changes 2021-01-04 08:50:30 +03:00
1463ff2886 Remove unnecessary using directive 2021-01-04 08:12:31 +03:00
738c94d193 Update soft-deletion logic to use model store's consumable items instead 2021-01-04 07:47:08 +03:00
53e6a349bb Fix incorrect initial conditional
Turns out this wasn't actually required.
2021-01-03 22:44:32 +09:00
efb71713ef Fix null condition inhibiting deselection events 2021-01-03 22:43:02 +09:00
9e4a925ab1 Clarify & cleanup comments some 2021-01-03 13:44:29 +01:00
a3e29b9154 Rename parameters for readability 2021-01-03 13:25:44 +01:00
2501707d7d Copy values using Bind to also copy defaults 2021-01-03 20:45:03 +09:00
6ad1b7767e Update osu.Game/Online/API/APIMod.cs
Co-authored-by: Salman Ahmed <slmanarendo1950@gmail.com>
2021-01-03 17:04:16 +09:00
99fa0e25dc Switch back to FirstOrDefault to allow for weird testing logic to pass 2021-01-03 16:46:24 +09:00
29dbb1cc0d Add internal pathway for ensuring correct application of bindable mods 2021-01-03 15:48:28 +09:00
23e216fa0b Simplify some default value checks (we are sure the return is an IBindable) 2021-01-03 15:47:15 +09:00
1a44338124 Use SingleOrDefault for added safety when looking up mod acronyms 2021-01-03 15:38:30 +09:00
a6d4992997 Ensure SelectionChanged events are only sent once when selection is null 2021-01-03 12:53:25 +09:00
caa5109e3a Add precautionary null checks to update methods in SongSelect 2021-01-03 12:18:35 +09:00
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
e2de5bb8f9 Fix the beatmap carousel not returning to centre correctly after resizing window 2021-01-02 22:05:41 +09:00
9ab1091281 Merge branch 'master' into fix-signalr-reconnect 2021-01-02 13:18:02 +01:00
72a6ca7755 Allow signalr to retry connecting when connection is closed without an exception 2021-01-02 16:47:00 +09:00
30cebe7579 Merge branch 'dependabot/nuget/Microsoft.AspNetCore.SignalR.Client-3.1.10' into dependency-updates 2021-01-01 21:25:10 +01:00
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
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
1e02f450a6 Merge branch 'master' into move-health-meter 2020-12-31 13:59:37 +01:00
17abe90c27 move SkinnableHealthDisplay
Similar components are in osu.Game.Screens.Play.HUD while this is not
2020-12-31 20:23:13 +08:00
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
1b1447eb35 Merge branch 'master' into fix-perform-from-menu-nullref 2020-12-31 10:33:05 +01:00
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
f9196ae976 Fix PerformFromMenuRunner failing if CurrentScreen is null 2020-12-31 16:36:20 +09:00
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
497d644a19 Move thread safety / locking logic from MultiplayerRoom 2020-12-30 20:24:50 +09:00