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

39719 Commits

Author SHA1 Message Date
smoogipoo
7c59fb37f1 Move check into callback 2021-05-21 16:00:58 +09:00
smoogipoo
36aa186c6e Merge branch 'thread-safe-spectator-client' 2021-05-21 16:00:24 +09:00
smoogipoo
7f712a4d04 Fix EndPlaying potentially doing cross-thread mutation 2021-05-21 15:57:39 +09:00
smoogipoo
2fdf8aa1aa Add update thread assertions 2021-05-21 15:57:31 +09:00
Dean Herbert
a37520d5ba
Merge pull request #12892 from smoogipoo/force-end-playing
Forcefully trigger EndPlaying() to fix test failures
2021-05-21 14:50:42 +09:00
smoogipoo
895eb14c5a Forcefully end playing to fix test failures 2021-05-21 14:09:30 +09:00
Dean Herbert
7ad6a1d5ff
Merge branch 'master' into thread-safe-spectator-client 2021-05-21 11:47:58 +09:00
Bartłomiej Dach
07221c55b2
Merge pull request #12890 from gagahpangeran/breadcrumb-item-colour 2021-05-20 21:31:05 +02:00
Bartłomiej Dach
f35a07fee7 Rename method for better comprehension 2021-05-20 20:47:50 +02:00
Bartłomiej Dach
b521405ec8 Trim redundant string interpolation 2021-05-20 20:46:18 +02:00
Gagah Pangeran Rosfatiputra
236124496d
add missing accent colour in control tab item 2021-05-21 01:21:32 +07:00
Gagah Pangeran Rosfatiputra
092d0f9b76
add breadcrumb header test scene 2021-05-21 01:21:31 +07:00
Dan Balasescu
7845d07dd5
Merge pull request #12886 from peppy/fix-skin-editor-context-menu-sticking
Fix skin editor context menus not dismissing when clicking away
2021-05-20 21:03:35 +09:00
Dan Balasescu
527847596e
Merge pull request #12884 from peppy/ternary-menu-item-refactor
Create base implementations of the two most common `TernaryStateMenuItem`s
2021-05-20 21:02:15 +09:00
Dean Herbert
0f4b502fdf Add missing xmldoc 2021-05-20 20:09:22 +09:00
Dean Herbert
09b1d58f82
Merge branch 'master' into thread-safe-spectator-client 2021-05-20 19:54:11 +09:00
Dean Herbert
46f5498935
Merge pull request #12881 from smoogipoo/restructure-spectator-client
Restructure and rename spectator client classes
2021-05-20 19:53:57 +09:00
Dean Herbert
1848bd902d Fix skin editor context menus not dismissing when clicking away 2021-05-20 19:51:07 +09:00
smoogipoo
06c99e8c7c Fix race due to StopWatchingUser() being called asynchronously 2021-05-20 19:45:31 +09:00
smoogipoo
5a8b8782d3 Fix WatchUser being called asynchronously in BDL 2021-05-20 19:44:43 +09:00
Dean Herbert
df5970fab4 Create base implementations of the two most common TernaryStateMenuItems 2021-05-20 19:34:53 +09:00
smoogipoo
2896da499d Merge branch 'restructure-spectator-client' into thread-safe-spectator-client 2021-05-20 18:53:54 +09:00
smoogipoo
a74405d0ed Merge branch 'master' into restructure-spectator-client 2021-05-20 18:53:42 +09:00
smoogipoo
f74dbb9e1f Remove locking from SpectatorScreen 2021-05-20 18:52:20 +09:00
smoogipoo
10597f7e6a Remove locking from SpectatorClient 2021-05-20 18:37:27 +09:00
Dean Herbert
b5ef4b608b
Merge pull request #12879 from smoogipoo/rename-multiplayer-client
Rename multiplayer client classes
2021-05-20 17:59:48 +09:00
smoogipoo
6eff8d513e Annotate nullables 2021-05-20 17:51:09 +09:00
smoogipoo
9d07749959 Improve implementation of TestSpectatorClient
There was a lot of weirdness here, such as storing the playing users,
clearing the playing users from test scenes (!!), and storing the users
being wathed.
This was all a thing because the previous implementation overrode the
base method implementations, which is no longer a thing.
2021-05-20 17:41:46 +09:00
smoogipoo
750a5c3ea9 Fix test compilation error 2021-05-20 17:20:30 +09:00
smoogipoo
df80531a0a Split online connectivity into OnlineSpectatorClient 2021-05-20 16:30:56 +09:00
smoogipoo
6beeb7f7c4 Rename SpectatorStreamingClient -> SpectatorClient 2021-05-20 15:55:07 +09:00
smoogipoo
d197a7f6f5 Rename multiplayer client classes 2021-05-20 15:39:45 +09:00
Dean Herbert
80a714a9c4
Merge pull request #12857 from Joehuu/dev-register-no-warning
Don't show warning screen when registering on dev server
2021-05-20 14:05:53 +09:00
Dean Herbert
3c201fb8e7 Standardise canBeNull specification 2021-05-20 13:20:35 +09:00
Dean Herbert
f1fd40dcca Fix test not working for various reasons 2021-05-20 13:19:00 +09:00
Joseph Madamba
3da2cdfd05 Fix nullref in test 2021-05-19 14:06:21 -07:00
Joseph Madamba
85a3027f1b Add failing test 2021-05-19 13:58:41 -07:00
Bartłomiej Dach
b8c1ffdef3
Merge pull request #12872 from peppy/disable-skin-editor-border 2021-05-19 22:42:38 +02:00
Bartłomiej Dach
788f1fcf48
Merge branch 'master' into disable-skin-editor-border 2021-05-19 21:52:29 +02:00
Bartłomiej Dach
d8a2b85acb
Merge pull request #12863 from peppy/fix-editor-blueprint-wrong-beatmap 2021-05-19 21:52:00 +02:00
Bartłomiej Dach
5df7d3bfd0 Merge branch 'master' into fix-editor-blueprint-wrong-beatmap 2021-05-19 20:48:10 +02:00
Bartłomiej Dach
e9cab29134 Cache editor beatmap in placement blueprint test scene 2021-05-19 20:48:06 +02:00
Bartłomiej Dach
73234b8b27
Merge pull request #12845 from peppy/hit-error-skinnable 2021-05-19 19:55:27 +02:00
Bartłomiej Dach
1d9a4b7bba
Merge branch 'master' into fix-editor-blueprint-wrong-beatmap 2021-05-19 19:30:11 +02:00
Dean Herbert
eb5db8ff03 Disable border display on skin editor to avoid crashes
This wasn't being displayed correctly anyway, so rather than fixing
let's just remove it for now.

Closes #12868.
2021-05-20 02:01:46 +09:00
Dean Herbert
22337e0fc7 Add comment explaining why origin is flipped 2021-05-20 01:59:30 +09:00
Dean Herbert
00ed699340 Fix origin specifications using incorrect flags 2021-05-20 01:53:24 +09:00
Dean Herbert
363aec8179 Merge branch 'master' into hit-error-skinnable 2021-05-20 01:51:45 +09:00
Dean Herbert
db6d980623
Merge pull request #12784 from smoogipoo/mania-pooling
Implement pooling for osu!mania
2021-05-19 18:36:03 +09:00
Dean Herbert
6c4709e7b4 Fix PlacementBlueprint using the wrong beatmap when applying defaults
Closes #12855.
2021-05-19 18:34:07 +09:00