1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 08:22:56 +08:00
osu-lazer/osu.Game/Screens/Multi
Dean Herbert bf9954aede Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs
#	osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
#	osu.Game/Screens/Multi/IRoomManager.cs
#	osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
#	osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
#	osu.Game/Screens/Multi/RoomManager.cs
2018-12-26 21:32:12 +09:00
..
Components Icon and beatmap title visual pass 2018-12-26 18:01:53 +09:00
Lounge Open -> Push 2018-12-26 21:21:26 +09:00
Match Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip 2018-12-26 21:32:12 +09:00
Play Renaming 2018-12-26 20:05:57 +09:00
Ranking Renaming 2018-12-26 20:05:57 +09:00
Header.cs Renaming 2018-12-26 20:05:57 +09:00
IMultiplayerSubScreen.cs Renaming 2018-12-26 20:05:57 +09:00
IRoomManager.cs Add processing overlay to lounge screen 2018-12-26 21:20:53 +09:00
Multiplayer.cs Open -> Push 2018-12-26 20:35:54 +09:00
MultiplayerSubScreen.cs Renaming 2018-12-26 20:05:57 +09:00
RoomBindings.cs Fix enddate not being bound to 2018-12-25 11:31:36 +09:00
RoomManager.cs Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip 2018-12-26 21:32:12 +09:00