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

35638 Commits

Author SHA1 Message Date
smoogipoo
04af072da7 Merge branch 'fix-category-serialisation' into realtime-multiplayer-2 2020-12-21 16:57:22 +09:00
smoogipoo
e23d81bfc6 Use enum property 2020-12-21 16:56:45 +09:00
smoogipoo
a021aaf546 Fix room category being serialised as ints 2020-12-21 16:42:21 +09:00
Dean Herbert
d096f2f8f6 Fix potential cross-thread operation during chat channel load
The callbacks are scheduled to the API thread, but hooked up in BDL
load. This causes a potential case of cross-thread collection
enumeration.

I've tested and it seems like the schedule logic should be fine for
short term. Longer term, we probably want to re-think how this works so
background operations aren't performed on the `DrawableChannel` in the
first place (chat shouldn't have an overhead like this when not
visible).

Closes #11231.
2020-12-21 16:39:50 +09:00
smoogipoo
5d73359bd7 Make participant count non-nullable 2020-12-21 16:35:19 +09:00
Dean Herbert
e135c324d4
Merge branch 'master' into taiko-dho-pooling 2020-12-21 16:24:40 +09:00
smoogipoo
64a32723f3 One more case 2020-12-21 16:23:42 +09:00
Dean Herbert
06d4b323d1
Merge pull request #11221 from bdach/taiko-hitobject-application
Add support for hitobject application to taiko DHOs
2020-12-21 16:23:40 +09:00
smoogipoo
6d483ff0e6 Merge branch 'fix-non-abstract-test' into realtime-multiplayer-2 2020-12-21 16:22:18 +09:00
smoogipoo
14ea49a14d Merge branch 'nullable-endsat' into realtime-multiplayer-2 2020-12-21 16:22:16 +09:00
smoogipoo
dbffe735de Merge branch 'master' into realtime-multiplayer-2 2020-12-21 16:22:14 +09:00
smoogipoo
c3d1eaf36d Make RealtimeMultiplayerTestScene abstract 2020-12-21 16:21:05 +09:00
smoogipoo
a59124dd93 Make room duration/endsat nullable 2020-12-21 16:18:39 +09:00
Dean Herbert
0c9b1c3a73
Merge pull request #11227 from smoogipoo/fix-incorrect-room-null-check
Fix incorrect joinedroom null checks
2020-12-21 16:14:42 +09:00
smoogipoo
82cf58353c Fix incorrect joinedroom null checks 2020-12-21 15:38:20 +09:00
Dean Herbert
a5bcf1dc20 Expose resources to skin via interface (and share common pieces with beatmap) 2020-12-21 15:18:52 +09:00
Dean Herbert
0ffbe12fcc Expose resources to beatmaps in a saner way 2020-12-21 14:22:34 +09:00
Dean Herbert
7c804be4d3 Rename textureStore to make its purpose more clear 2020-12-21 14:06:33 +09:00
Dean Herbert
bc212b2538
Merge branch 'master' into fix-texture-loader-usages 2020-12-21 13:51:55 +09:00
Dean Herbert
a8569fe15c Fix a couple of simple cases of incorrect TextureLoaderStore initialisation 2020-12-21 13:35:46 +09:00
Dean Herbert
c37840b37c
Merge pull request #11208 from smoogipoo/realtime-ready-button
Implement the realtime multiplayer ready button
2020-12-21 11:57:30 +09:00
Dean Herbert
27623822c4
Merge branch 'master' into realtime-ready-button 2020-12-21 11:19:03 +09:00
Dean Herbert
2274902446
Merge pull request #11207 from smoogipoo/realtime-participants-list
Implement the realtime multiplayer participants list
2020-12-21 11:18:32 +09:00
Bartłomiej Dach
6e21806873 Adjust sample test to pass with pooling 2020-12-20 18:44:47 +01:00
Bartłomiej Dach
b24fc1922e Enable pooling for taiko DHOs 2020-12-20 18:44:47 +01:00
Bartłomiej Dach
5d575d2a9b Accept proxied content via OnNewDrawableHitObject
In the non-pooled case, `OnNewDrawableHitObject()` will be called
automatically on each new DHO via `Playfield.Add(DrawableHitObject)`.

In the pooled case, it will be called via `Playfield`'s implementation
of `GetPooledDrawableRepresentation(HitObject, DrawableHitObject)`.
2020-12-20 18:26:45 +01:00
Bartłomiej Dach
62da4eff37 Route new result callback via playfield
Follows route taken by osu! and catch (and required for proper pooling
support).
2020-12-20 18:26:45 +01:00
Bartłomiej Dach
bcd140b8df
Merge branch 'master' into realtime-ready-button 2020-12-20 18:20:57 +01:00
Bartłomiej Dach
b76ec79a70
Merge branch 'master' into realtime-participants-list 2020-12-20 18:20:22 +01:00
Bartłomiej Dach
6cca0bc6ea
Merge pull request #11206 from smoogipoo/realtime-room-composite 2020-12-20 18:19:30 +01:00
Bartłomiej Dach
370f56eadb Make strong hit DHOs public for pool registration 2020-12-20 18:02:34 +01:00
Bartłomiej Dach
0c5333bd58 Adjust top-level hitobjects to support nested pooling 2020-12-20 17:57:19 +01:00
Bartłomiej Dach
4e8e4f0343
Merge branch 'master' into realtime-room-composite 2020-12-20 17:46:10 +01:00
Dean Herbert
afabc4712e
Merge pull request #11205 from smoogipoo/stateful-multiplayer-client
Implement a stateful multiplayer client + test realtime room manager
2020-12-21 01:36:18 +09:00
smoogipoo
b31f4e9e85 Merge branch 'stateful-multiplayer-client' into realtime-multiplayer-2 2020-12-21 00:41:42 +09:00
smoogipoo
a893360c0e Reword comment 2020-12-21 00:41:14 +09:00
smoogipoo
d127494c2d Fix thread-unsafe room removal 2020-12-21 00:39:31 +09:00
smoogipoo
3af702453f Implement realtime match song select 2020-12-21 00:37:13 +09:00
Bartłomiej Dach
ae6dedacaf Implement nested strong hit application 2020-12-20 16:26:39 +01:00
Bartłomiej Dach
d823c77a63 Implement swell tick application 2020-12-20 16:26:39 +01:00
Bartłomiej Dach
3bd4279589 Implement drum roll tick application 2020-12-20 16:26:39 +01:00
Bartłomiej Dach
e3b6eaa390 Implement swell application
Also removes a weird sizing application that seems to have no effect
(introduced in 27e63eb; compare removals for other taiko DHO types in
9d00e5b and 58bf288).
2020-12-20 16:26:39 +01:00
Bartłomiej Dach
8b6bc09b8f Implement drum roll application 2020-12-20 16:26:16 +01:00
Bartłomiej Dach
e32b1c34ca Implement hit application 2020-12-20 16:26:16 +01:00
smoogipoo
275efd12b8 Fix room manager reference 2020-12-21 00:21:48 +09:00
smoogipoo
959959dbed Add multiplayer client to OsuGameBase 2020-12-21 00:21:41 +09:00
smoogipoo
15480c006b Create the correct room subscreen 2020-12-21 00:21:30 +09:00
smoogipoo
5b4197a9ef Disable watching replays from realtime results screen 2020-12-21 00:14:54 +09:00
smoogipoo
07077b8f4e Add realtime player 2020-12-21 00:13:05 +09:00
smoogipoo
945ba59c8e Make timeshift player able to not allow pause 2020-12-21 00:06:44 +09:00