1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 03:57:25 +08:00
Commit Graph

39890 Commits

Author SHA1 Message Date
Andrei Zavatski
40ca94cd7b Fix incorrect year being passed on first load 2021-05-20 16:04:51 +03:00
Andrei Zavatski
c48b5eebdd Don't reload the context when clicking selected year button 2021-05-20 15:45:39 +03:00
Andrei Zavatski
bd80cf656a Merge remote-tracking branch 'refs/remotes/ppy/master' into sidebar 2021-05-20 15:41:08 +03: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
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
Dean Herbert
df5970fab4 Create base implementations of the two most common TernaryStateMenuItems 2021-05-20 19:34:53 +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
Dean Herbert
20f1ef4318 Extract common implementation of updating drawable position from screen space pos 2021-05-20 18:35:13 +09:00
Dean Herbert
6f75c59760 Fix flip logic not using the full selection quad 2021-05-20 18:31:51 +09:00
Dean Herbert
95c78b9185 Split out common selection quad logic 2021-05-20 18:24:25 +09:00
Dean Herbert
27e81d6504 Implement proper rotation algorithm for skin editor 2021-05-20 18:21:16 +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
ekrctb
3018a41ab5 Remove redundant string interpolation 2021-05-20 16:00:49 +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
ekrctb
abf96db545 Add regression test for the pattern of using DHO proxy in LifetimeManagementContainer 2021-05-20 15:27:08 +09:00
Dean Herbert
958d51141d Rename FrontPageDisplay to ArticleListing 2021-05-20 15:24:01 +09:00
Dean Herbert
9267d23dc2 Make year nullable rather than defaulting to zero 2021-05-20 15:23:49 +09:00
Dean Herbert
d4530313aa Tidy event parameter naming 2021-05-20 15:15:46 +09:00
Dean Herbert
489caebf59 Move bind LoadComplete code out of constructor 2021-05-20 15:15:19 +09:00
ekrctb
0489ae719d Don't couple PoolableDrawableWithLifetime lifetime with its entry
It turns out the incompatibility with `LifetimeManagementContainer` causes more issues than anticipated.
2021-05-20 14:56:15 +09:00
Dean Herbert
673ca4c2a1 Tidy up content container specification 2021-05-20 14:30:40 +09:00
Dean Herbert
ac8efdeabd Move private methods down 2021-05-20 14:12:34 +09:00
Dean Herbert
713f69ea55 Tidy up load process 2021-05-20 14:11:42 +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
8f5b28d264 Fix "folder missing" message showing incorrectly for beatmaps folder 2021-05-20 13:56:18 +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