Commit Graph

3648 Commits

Author SHA1 Message Date
3207983a1c Fix current room being set to null when parted 2019-02-06 15:12:40 +09:00
a9aa22c97b Remove ShadowModel requirement 2019-02-06 13:52:48 +09:00
594dffba41 Fix a few cases of missed instant invocation 2019-02-05 19:11:20 +09:00
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
be51ee4ed5 Implement MultiplayerComposite, replaces RoomBindings 2019-02-05 16:14:37 +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
065b0c9076 Fix background not being faded correctly 2019-02-04 17:04:52 +09:00
e01f342ab0 wip 2019-02-02 17:11:25 +09:00
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
3da851d93e Merge branch 'master' into fix-replay-multiplier-text 2019-01-31 21:17:40 +09:00
f85518b175 Don't expose padding 2019-01-31 18:16:28 +09:00
b48bb5b792 Move parallax logic out of BackgroundScreenStack 2019-01-31 18:10:33 +09:00
bdaff27575 Fix nullref due to screens now being removed from parent 2019-01-31 15:02:07 +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
beab367e6d Add null checks/allowances 2019-01-31 11:00:33 +09:00
d34aa50613 Merge branch 'master' into iscreen 2019-01-31 01:08:06 +09:00
ac0bc53c4b Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"
This reverts commit cc8793a45e, reversing
changes made to 94276c8abb.
2019-01-31 00:02:05 +09:00
5e78f51e24 Fix multiplayer crashing when exiting from lounge 2019-01-30 23:56:03 +09:00
82dc7f39a3 Update licenses 2019-01-29 21:48:35 +09:00
b5d187c4af Fix post-merge errors 2019-01-29 21:27:32 +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
8118b649d8 Merge branch 'master' into show-mods-on-loader 2019-01-28 14:11:54 +09:00
47f35c423b Merge branch 'master' into carousel-wedge-level 2019-01-28 13:49:12 +09:00
a1ce7e9a95 add ModDisplay on PlayerLoader 2019-01-26 17:14:45 +08:00
117703374e Fix logo animations 2019-01-25 21:02:35 +09:00
60cc2314ef Fix ruleset + beatmap being changeable in match 2019-01-25 21:02:30 +09:00
5c70be07ab Display carousel over beatmap info wedge 2019-01-25 22:58:55 +11:00
b3403c78da Fix a few potential crashes 2019-01-25 20:47:37 +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
e1e7759e0f Re-implement MultiplayerSubScreen 2019-01-25 19:32:37 +09:00
260034a80e Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
da135346b2 Fix screen titles 2019-01-25 18:38:48 +09:00
15100632f1 Remove MultiplayerSubScreen and fix multiplayer crashes 2019-01-25 18:26:04 +09:00
f0e0088f43 Create a custom background stack to fix various background issues 2019-01-25 15:36:22 +09:00
7ed215c521 Make InternalPadding a bit simpler 2019-01-25 14:46:45 +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
593e0b36f5 Add overflow padding in other multiplayer screen components
Added padding to Room Creation and Beatmap Selection in Multiplayer.
2019-01-24 19:42:35 +08:00
50a384e19c Fix game not exiting 2019-01-24 20:13:19 +09:00
28f5c950ec Fix player never completing load 2019-01-24 19:55:42 +09: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
1730ad143f Merge branch 'master' into fix-key-counter 2019-01-23 18:22:08 +09:00