1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 00:02:54 +08:00
Commit Graph

3455 Commits

Author SHA1 Message Date
Dean Herbert
f52cac966b Fix multiple blank lines 2019-02-08 18:45:32 +09:00
Dean Herbert
6c4d289901 Pass item rather than ID 2019-02-08 18:33:49 +09:00
smoogipoo
febcd7d7c0 Remove currentRoom from RoomManager 2019-02-08 15:46:16 +09:00
smoogipoo
fdd37dbc4b Merge remote-tracking branch 'origin/master' into cmc-rooms 2019-02-08 15:44:33 +09:00
smoogipoo
5643dc2e99 Remove redundant qualifiers 2019-02-08 15:44:05 +09:00
smoogipoo
6fe1f57236 Fix crash when start button is repeatedly pressed 2019-02-08 15:39:11 +09:00
smoogipoo
99a7ccc01a Slight cleanup in multiplayer 2019-02-08 15:38:05 +09:00
smoogipoo
43240ea85e Fix playlist issues with room creation 2019-02-08 15:23:03 +09:00
smoogipoo
42cd55e0d7 Move current room to multiplayer 2019-02-08 14:57:51 +09:00
smoogipoo
7f13e3c5f7 Directly resolve the filter bindable 2019-02-08 13:02:17 +09:00
smoogipoo
990bd44ca2 Combine roommanager and roompollingcomponent 2019-02-08 13:01:10 +09:00
smoogipoo
17fdfc15d9 Fix room title in the breadcrumbs 2019-02-07 20:09:49 +09:00
smoogipoo
1c2450a95a Fix up room inspector status 2019-02-07 17:59:14 +09:00
smoogipoo
1e0135af6f Move StatusColouredContainer into a more public location 2019-02-07 17:52:40 +09:00
smoogipoo
2d61548251 Fix room name being coloured 2019-02-07 16:45:36 +09:00
smoogipoo
4f86fe92ea Fix match settings not showing 2019-02-06 18:50:43 +09:00
ProgrammaticNajel
9f8e724a76 Fix background being cut off at the top of the screen (#4207)
Fix background being cut off at the top of the screen
2019-02-06 18:14:33 +09:00
smoogipoo
3207983a1c Fix current room being set to null when parted 2019-02-06 15:12:40 +09:00
smoogipoo
a9aa22c97b Remove ShadowModel requirement 2019-02-06 13:52:48 +09:00
smoogipoo
594dffba41 Fix a few cases of missed instant invocation 2019-02-05 19:11:20 +09:00
smoogipoo
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
smoogipoo
be51ee4ed5 Implement MultiplayerComposite, replaces RoomBindings 2019-02-05 16:14:37 +09:00
smoogipoo
d9537017c8 Use CMC in the Multiplayer screen 2019-02-05 16:03:05 +09:00
smoogipoo
37c1f5a824 Split polling logic from RoomManager, now a container 2019-02-05 15:38:19 +09:00
smoogipoo
065b0c9076 Fix background not being faded correctly 2019-02-04 17:04:52 +09:00
Dean Herbert
3da851d93e
Merge branch 'master' into fix-replay-multiplier-text 2019-01-31 21:17:40 +09:00
Dean Herbert
f85518b175 Don't expose padding 2019-01-31 18:16:28 +09:00
Dean Herbert
b48bb5b792 Move parallax logic out of BackgroundScreenStack 2019-01-31 18:10:33 +09:00
smoogipoo
bdaff27575 Fix nullref due to screens now being removed from parent 2019-01-31 15:02:07 +09:00
smoogipoo
255b4a30e0 Allow logo to be null 2019-01-31 13:50:37 +09:00
smoogipoo
58d744e5dc Remove manual overlay/toolbar logic from multiplayer 2019-01-31 13:38:21 +09:00
Dean Herbert
beab367e6d Add null checks/allowances 2019-01-31 11:00:33 +09:00
Dean Herbert
d34aa50613
Merge branch 'master' into iscreen 2019-01-31 01:08:06 +09:00
smoogipoo
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
smoogipoo
5e78f51e24 Fix multiplayer crashing when exiting from lounge 2019-01-30 23:56:03 +09:00
smoogipoo
82dc7f39a3 Update licenses 2019-01-29 21:48:35 +09:00
smoogipoo
b5d187c4af Fix post-merge errors 2019-01-29 21:27:32 +09:00
smoogipoo
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
smoogipoo
7b1c1f3728 Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
Dan Balasescu
47f35c423b
Merge branch 'master' into carousel-wedge-level 2019-01-28 13:49:12 +09:00
smoogipoo
117703374e Fix logo animations 2019-01-25 21:02:35 +09:00
smoogipoo
60cc2314ef Fix ruleset + beatmap being changeable in match 2019-01-25 21:02:30 +09:00
phosphene47
5c70be07ab Display carousel over beatmap info wedge 2019-01-25 22:58:55 +11:00
smoogipoo
b3403c78da Fix a few potential crashes 2019-01-25 20:47:37 +09:00
smoogipoo
e2891ab1e9 Fix anchors + origins 2019-01-25 20:47:31 +09:00
smoogipoo
95e6785968 Make Multiplayer not an OsuScreen 2019-01-25 20:25:55 +09:00
smoogipoo
e1e7759e0f Re-implement MultiplayerSubScreen 2019-01-25 19:32:37 +09:00
Dean Herbert
260034a80e Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
smoogipoo
da135346b2 Fix screen titles 2019-01-25 18:38:48 +09:00
smoogipoo
15100632f1 Remove MultiplayerSubScreen and fix multiplayer crashes 2019-01-25 18:26:04 +09:00