Commit Graph

67 Commits

Author SHA1 Message Date
acbcca4462 Merge branch 'master' into multi-background-stack 2019-03-20 19:11:27 +09:00
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
63b9fa58ef Cleanup 2019-03-11 19:52:28 +09:00
6a1e600099 Create new OsuScreenStack for use in Multiplayer 2019-03-11 19:48:07 +09:00
aeae6143c1 Remove unnecessary variable 2019-03-11 17:47:03 +09:00
0b64af5e02 Put multiplayer background inside a parallax container 2019-03-11 16:51:43 +09:00
2df57c3a29 Give Multiplayer its own background stack 2019-03-11 11:08:04 +09:00
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
134840f118 Fix nullref 2019-02-16 11:18:17 +09:00
d5cce850a8 Revert some unnecessary complications in logo logic 2019-02-12 13:29:41 +09:00
272584eb79 Improve file layouts 2019-02-12 13:02:33 +09:00
78b47f9fe3 Fix starting matches not working 2019-02-12 11:19:42 +09:00
88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
e2e615cc5c Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
a30d3739cf Merge remote-tracking branch 'upstream/master' into cmc-rooms 2019-02-08 18:45:39 +09:00
959b1ac845 Fix potential nullref when exiting multiplayer (#4227)
Fixes https://github.com/ppy/osu/issues/3954
2019-02-08 17:28:00 +09:00
6fe1f57236 Fix crash when start button is repeatedly pressed 2019-02-08 15:39:11 +09:00
99a7ccc01a Slight cleanup in multiplayer 2019-02-08 15:38:05 +09:00
42cd55e0d7 Move current room to multiplayer 2019-02-08 14:57:51 +09:00
7f13e3c5f7 Directly resolve the filter bindable 2019-02-08 13:02:17 +09:00
990bd44ca2 Combine roommanager and roompollingcomponent 2019-02-08 13:01:10 +09:00
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
d9537017c8 Use CMC in the Multiplayer screen 2019-02-05 16:03:05 +09:00
37c1f5a824 Split polling logic from RoomManager, now a container 2019-02-05 15:38:19 +09:00
e01f342ab0 wip 2019-02-02 17:11:25 +09:00
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
b48bb5b792 Move parallax logic out of BackgroundScreenStack 2019-01-31 18:10:33 +09:00
255b4a30e0 Allow logo to be null 2019-01-31 13:50:37 +09:00
58d744e5dc Remove manual overlay/toolbar logic from multiplayer 2019-01-31 13:38:21 +09:00
5e78f51e24 Fix multiplayer crashing when exiting from lounge 2019-01-30 23:56:03 +09:00
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
7b1c1f3728 Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
117703374e Fix logo animations 2019-01-25 21:02:35 +09:00
e2891ab1e9 Fix anchors + origins 2019-01-25 20:47:31 +09:00
95e6785968 Make Multiplayer not an OsuScreen 2019-01-25 20:25:55 +09:00
787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
4cae9bae83 Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-24 20:41:10 +08:00
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
9fcefa7d69 Typo fix 2019-01-24 18:18:32 +08:00
e4084b7d5d Add overflow padding in other multiplayer screen components
Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)
2019-01-24 17:40:48 +08:00
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
7ac20c3545 Add overflow padding to account for parallax shifting
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
2019-01-24 16:11:24 +08:00
31baf0086f Optional idle tracker 2018-12-27 20:17:27 +09:00
1ce33cb6da Adjust polling rate based on current screen and idle state 2018-12-27 20:06:07 +09:00
bd0576537e Forcefully exit multiplayer if API loses connectivity 2018-12-27 17:12:58 +09:00
cc1f3d54b0 Fix looping failure 2018-12-26 22:37:09 +09:00
5bd3ab51dd Open -> Push 2018-12-26 20:35:54 +09:00
2353c204ee Renaming 2018-12-26 20:05:57 +09:00