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

25054 Commits

Author SHA1 Message Date
smoogipoo
e3284b976d Merge branch 'thread-safe-spectator-client' into fix-spectator-playing-state-5 2021-05-20 19:46:26 +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
smoogipoo
ee4bca9ed1 Handle collection changed event 2021-05-20 19:37:43 +09:00
smoogipoo
7ee81669f7 Remove bind helpers from SpectatorClient 2021-05-20 19:27:43 +09:00
smoogipoo
b515fe3cb1 Fix playing user state not removed on stop watching 2021-05-20 19:20:09 +09:00
smoogipoo
89b4f69588 Expose playing user states as bindable dictionary 2021-05-20 19:19:39 +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
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
Joseph Madamba
3da2cdfd05 Fix nullref in test 2021-05-19 14:06:21 -07:00
Bartłomiej Dach
788f1fcf48
Merge branch 'master' into disable-skin-editor-border 2021-05-19 21:52:29 +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
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
6c4709e7b4 Fix PlacementBlueprint using the wrong beatmap when applying defaults
Closes #12855.
2021-05-19 18:34:07 +09:00
Dean Herbert
87833bfb61
Merge pull request #12736 from EVAST9919/news-sidebar-new
Implement NewsSideBar component
2021-05-19 16:29:52 +09:00
Dean Herbert
19a07b0107 IsOpen -> Expanded 2021-05-19 15:49:22 +09:00
Dean Herbert
539e5179fe Tidy up content and bind event code 2021-05-19 15:49:22 +09:00
Dan Balasescu
6717355fbe
Merge pull request #12627 from ekrctb/always-use-lifetime-entry
Always use lifetime entry to manage hit objects in HitObjectContainer
2021-05-19 13:12:01 +09:00
Joseph Madamba
4cc573690e Move OsuGame out of load method 2021-05-18 14:32:56 -07:00
Joseph Madamba
bde7f88eb3 Don't show warning screen when registering on dev server 2021-05-18 14:23:22 -07:00
Andrei Zavatski
d70d37b7f4 Remove convoluted autosize logic in MonthSection 2021-05-18 22:30:36 +03:00
Andrei Zavatski
24af86689f Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-18 22:18:52 +03:00
Dean Herbert
41d8bc291c
Merge pull request #12783 from smoogipoo/hoc-event-queue
Add a HitObjectUsageEventBuffer to handle HOC events appropriately
2021-05-18 22:22:53 +09:00
Dean Herbert
70b36cdc0d
Merge pull request #12850 from smoogipoo/fix-score-duplication
Only ignore online score id for database import
2021-05-18 22:18:42 +09:00
smoogipoo
c6160d5304 Only ignore online score id for database import 2021-05-18 21:17:41 +09:00
smoogipoo
5f94b3bdac Remove legacy playlist item ID handling 2021-05-18 21:03:59 +09:00
Dan Balasescu
ef81bdf63f
Merge branch 'master' into always-use-lifetime-entry 2021-05-18 20:10:12 +09:00
ekrctb
84a1a86c63 Revert "Use entry to calculate lifetime in ScrollingHOC"
This reverts commit 632bb70e
2021-05-18 19:55:31 +09:00
ekrctb
2c65b8fa93 Revert "Fix uninitialized scrollLength value is used"
This reverts commit 73dfb04d
2021-05-18 19:55:25 +09:00
smoogipoo
d93ac7ac98 Change class xmldoc a bit 2021-05-18 19:15:46 +09:00
smoogipoo
ab6a79f84c Simplify 2021-05-18 19:15:46 +09:00
smoogipoo
97f4f7bbd1 Remove Component inheritance 2021-05-18 18:59:45 +09:00
smoogipoo
633f841a0f Rename to HitObjectUsageEventBuffer 2021-05-18 18:57:02 +09:00
smoogipoo
bfc0205e9b Fix (began, finished) event 2021-05-18 18:49:11 +09:00
smoogipoo
a31a6947bb Add test 2021-05-18 18:49:05 +09:00
Dean Herbert
d661e98fa6 Move common functionality out of OsuSelectionHandler and implement flip support 2021-05-18 18:34:06 +09:00