h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-20 05:36:05 +08:00
Code Issues Releases Wiki Activity

Re-namespace all files in OnlinePlay directory

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-12-25 16:50:00 +01:00
parent e797e5ce7a
commit 83fb7c7a1a
109 changed files with 176 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Allocation;
using osu.Game.Beatmaps;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets;
using osu.Game.Screens.Multi;
using osu.Game.Screens.OnlinePlay;
using osu.Game.Users;
namespace osu.Game.Tests.Visual.Multiplayer

2
osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
View File

@ -4,7 +4,7 @@
using System;
using osu.Framework.Bindables;
using osu.Game.Online.Rooms;
using osu.Game.Screens.Multi;
using osu.Game.Screens.OnlinePlay;
namespace osu.Game.Tests.Visual.Multiplayer
{

2
osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
View File

@ -18,7 +18,7 @@ using osu.Game.Overlays;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Screens.Multi;
using osu.Game.Screens.OnlinePlay;
using osu.Game.Tests.Beatmaps;
using osuTK;
using osuTK.Input;

2
osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
View File

@ -5,7 +5,7 @@ using System;
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Game.Online.Rooms.RoomStatuses;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
using osu.Game.Users;
namespace osu.Game.Tests.Visual.Multiplayer

2
osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
View File

@ -9,7 +9,7 @@ using osu.Game.Graphics;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Catch;
using osu.Game.Rulesets.Osu;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
using osuTK.Graphics;
using osuTK.Input;

2
osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
View File

@ -9,7 +9,7 @@ using osu.Game.Online.Rooms;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Tests.Beatmaps;
using osuTK;

2
osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
View File

@ -6,7 +6,7 @@ using osu.Game.Beatmaps;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.OnlinePlay.Match.Components;
using osu.Game.Users;
namespace osu.Game.Tests.Visual.Multiplayer

2
osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
View File

@ -7,7 +7,7 @@ using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Online.API;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.OnlinePlay.Match.Components;
using osu.Game.Users;
using osuTK;

2
osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
View File

@ -18,7 +18,7 @@ using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Screens.Select;
namespace osu.Game.Tests.Visual.Multiplayer

2
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
View File

@ -5,7 +5,7 @@ using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Screens;
using osu.Game.Screens;
using osu.Game.Screens.Multi;
using osu.Game.Screens.OnlinePlay;
namespace osu.Game.Tests.Visual.Multiplayer
{

4
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Users;
namespace osu.Game.Tests.Visual.Multiplayer
@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddAssert("room has 1 user", () => Client.Room?.Users.Count == 1);
}
private class TestMultiplayer : Screens.Multi.Multiplayer.Multiplayer
private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer
{
protected override RoomManager CreateRoomManager() => new TestMultiplayerRoomManager();
}

4
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
View File

@ -7,8 +7,8 @@ using osu.Framework.Screens;
using osu.Framework.Testing;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Osu;
using osu.Game.Screens.Multi.Multiplayer;
using osu.Game.Screens.Multi.Multiplayer.Match;
using osu.Game.Screens.OnlinePlay.Multiplayer;
using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
using osu.Game.Tests.Beatmaps;
using osuTK.Input;

2
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Testing;
using osu.Framework.Utils;
using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi.Multiplayer.Participants;
using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
using osu.Game.Users;
using osuTK;

2
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
View File

@ -12,7 +12,7 @@ using osu.Game.Beatmaps;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets;
using osu.Game.Screens.Multi.Multiplayer.Match;
using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
using osu.Game.Tests.Resources;
using osu.Game.Users;
using osuTK;

2
osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Online.Rooms;
using osu.Game.Online.Rooms.RoomStatuses;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
namespace osu.Game.Tests.Visual.Multiplayer
{

4
osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
View File

@ -107,14 +107,14 @@ namespace osu.Game.Tests.Visual.Navigation
[Test]
public void TestExitMultiWithEscape()
{
PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
PushAndConfirm(() => new Screens.OnlinePlay.Playlists.Playlists());
exitViaEscapeAndConfirm();
}
[Test]
public void TestExitMultiWithBackButton()
{
PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
PushAndConfirm(() => new Screens.OnlinePlay.Playlists.Playlists());
exitViaBackButtonAndConfirm();
}

2
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
namespace osu.Game.Tests.Visual.Playlists
{

6
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
View File

@ -8,9 +8,9 @@ using osu.Framework.Graphics;
using osu.Framework.Screens;
using osu.Framework.Testing;
using osu.Game.Graphics.Containers;
using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.Playlists;
using osu.Game.Screens.OnlinePlay.Lounge;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Playlists;
using osu.Game.Tests.Visual.Multiplayer;
namespace osu.Game.Tests.Visual.Playlists

4
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
View File

@ -10,8 +10,8 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Rooms;
using osu.Game.Screens.Multi;
using osu.Game.Screens.Multi.Playlists;
using osu.Game.Screens.OnlinePlay;
using osu.Game.Screens.OnlinePlay.Playlists;
namespace osu.Game.Tests.Visual.Playlists
{

2
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
View File

@ -3,7 +3,7 @@
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Users;
namespace osu.Game.Tests.Visual.Playlists

2
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
View File

@ -19,7 +19,7 @@ using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Scoring;
using osu.Game.Scoring;
using osu.Game.Screens.Multi.Playlists;
using osu.Game.Screens.OnlinePlay.Playlists;
using osu.Game.Screens.Ranking;
using osu.Game.Tests.Beatmaps;
using osu.Game.Users;

6
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
View File

@ -15,9 +15,9 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Osu;
using osu.Game.Screens.Multi;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.Multi.Playlists;
using osu.Game.Screens.OnlinePlay;
using osu.Game.Screens.OnlinePlay.Match.Components;
using osu.Game.Screens.OnlinePlay.Playlists;
using osu.Game.Tests.Beatmaps;
using osu.Game.Users;
using osuTK.Input;

2
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.Playlists
public TestScenePlaylistsScreen()
{
var multi = new Screens.Multi.Playlists.Playlists();
var multi = new Screens.OnlinePlay.Playlists.Playlists();
AddStep("show", () => LoadScreen(multi));
AddUntilStep("wait for loaded", () => multi.IsLoaded);

2
osu.Game/Online/Rooms/GetRoomsRequest.cs
View File

@ -5,7 +5,7 @@ using System.Collections.Generic;
using Humanizer;
using osu.Framework.IO.Network;
using osu.Game.Online.API;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
namespace osu.Game.Online.Rooms
{

2
osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
View File

@ -11,7 +11,7 @@ using osu.Framework.Screens;
using osu.Game.Database;
using osu.Game.Online.API;
using osu.Game.Online.Spectator;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.OnlinePlay.Match.Components;
using osu.Game.Screens.Play;
using osu.Game.Users;
using osuTK;

4
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -17,8 +17,8 @@ using osu.Game.Online.API;
using osu.Game.Overlays;
using osu.Game.Screens.Backgrounds;
using osu.Game.Screens.Edit;
using osu.Game.Screens.Multi.Multiplayer;
using osu.Game.Screens.Multi.Playlists;
using osu.Game.Screens.OnlinePlay.Multiplayer;
using osu.Game.Screens.OnlinePlay.Playlists;
using osu.Game.Screens.Select;
namespace osu.Game.Screens.Menu

2
osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
View File

@ -3,7 +3,7 @@
using osu.Game.Screens.Select;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class BeatmapDetailAreaPlaylistTabItem : BeatmapDetailAreaTabItem
{

2
osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
View File

@ -10,7 +10,7 @@ using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class BeatmapTitle : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
View File

@ -9,7 +9,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osuTK;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class BeatmapTypeInfo : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
View File

@ -5,7 +5,7 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public abstract class DisableableTabControl<T> : TabControl<T>
{

2
osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class DrawableGameType : CircularContainer, IHasTooltip
{

4
osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
View File

@ -5,9 +5,9 @@ using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.Online.Rooms;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
/// <summary>
/// A <see cref="RoomPollingComponent"/> that polls for the lounge listing.

2
osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
View File

@ -12,7 +12,7 @@ using osu.Game.Online.Rooms;
using osu.Game.Screens.Select;
using osuTK;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class MatchBeatmapDetailArea : BeatmapDetailArea
{

2
osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps.Drawables;
using osuTK;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class ModeTypeInfo : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Beatmaps.Drawables;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class MultiplayerBackgroundSprite : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
View File

@ -10,7 +10,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osuTK;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
/// <summary>
/// A header used in the multiplayer interface which shows text / details beneath a line.

2
osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
View File

@ -3,7 +3,7 @@
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class OverlinedPlaylistHeader : OverlinedHeader
{

2
osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
View File

@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class ParticipantCountDisplay : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class ParticipantsDisplay : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
View File

@ -12,7 +12,7 @@ using osu.Game.Users;
using osu.Game.Users.Drawables;
using osuTK;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class ParticipantsList : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public abstract class ReadyButton : TriangleButton
{

2
osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
View File

@ -15,7 +15,7 @@ using osu.Game.Online.API;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public abstract class RoomManager : CompositeDrawable, IRoomManager
{

2
osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
View File

@ -8,7 +8,7 @@ using osu.Game.Online;
using osu.Game.Online.API;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public abstract class RoomPollingComponent : PollingComponent
{

2
osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Graphics;
using osu.Game.Online.Rooms;
using osu.Game.Online.Rooms.RoomStatuses;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class RoomStatusInfo : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
View File

@ -7,7 +7,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
/// <summary>
/// A <see cref="RoomPollingComponent"/> that polls for the currently-selected room.

2
osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.Multi.Components
namespace osu.Game.Screens.OnlinePlay.Components
{
public class StatusColouredContainer : Container
{

2
osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
View File

@ -10,7 +10,7 @@ using osu.Game.Graphics.Containers;
using osu.Game.Online.Rooms;
using osuTK;
namespace osu.Game.Screens.Multi
namespace osu.Game.Screens.OnlinePlay
{
public class DrawableRoomPlaylist : OsuRearrangeableListContainer<PlaylistItem>
{

2
osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
View File

@ -29,7 +29,7 @@ using osu.Game.Screens.Play.HUD;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi
namespace osu.Game.Screens.OnlinePlay
{
public class DrawableRoomPlaylistItem : OsuRearrangeableListItem<PlaylistItem>
{

2
osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
View File

@ -13,7 +13,7 @@ using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.Multi
namespace osu.Game.Screens.OnlinePlay
{
public class DrawableRoomPlaylistWithResults : DrawableRoomPlaylist
{

4
osu.Game/Screens/OnlinePlay/Header.cs
View File

@ -10,13 +10,13 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Screens;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi
namespace osu.Game.Screens.OnlinePlay
{
public class Header : Container
{

2
osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
namespace osu.Game.Screens.Multi
namespace osu.Game.Screens.OnlinePlay
{
public interface IMultiplayerSubScreen : IOsuScreen
{

2
osu.Game/Screens/OnlinePlay/IRoomManager.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.Multi
namespace osu.Game.Screens.OnlinePlay
{
[Cached(typeof(IRoomManager))]
public interface IRoomManager

10
osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
View File

@ -9,22 +9,22 @@ using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Multi.Components;
using osu.Game.Online.Rooms;
using osu.Game.Screens.OnlinePlay.Components;
using osuTK;
using osuTK.Graphics;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.Multi.Lounge.Components
namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
public class DrawableRoom : OsuClickableContainer, IStateful<SelectionState>, IFilterable, IHasContextMenu
{

2
osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
View File

@ -12,7 +12,7 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Lounge.Components
namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
public abstract class FilterControl : CompositeDrawable
{

2
osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
View File

@ -3,7 +3,7 @@
using osu.Game.Rulesets;
namespace osu.Game.Screens.Multi.Lounge.Components
namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
public class FilterCriteria
{

2
osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Users.Drawables;
using osuTK;
namespace osu.Game.Screens.Multi.Lounge.Components
namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
public class ParticipantInfo : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
View File

@ -5,7 +5,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Multi.Lounge.Components
namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
public class PlaylistsFilterControl : FilterControl
{

4
osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
View File

@ -6,10 +6,10 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.OnlinePlay.Components;
using osuTK;
namespace osu.Game.Screens.Multi.Lounge.Components
namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
public class RoomInfo : MultiplayerComposite
{

4
osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
View File

@ -7,10 +7,10 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.OnlinePlay.Components;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Lounge.Components
namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
public class RoomInspector : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
View File

@ -3,7 +3,7 @@
using System.ComponentModel;
namespace osu.Game.Screens.Multi.Lounge.Components
namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
public enum RoomStatusFilter
{

6
osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
View File

@ -13,13 +13,13 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Bindings;
using osu.Framework.Threading;
using osu.Game.Extensions;
using osu.Game.Graphics.Cursor;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input.Bindings;
using osuTK;
using osu.Game.Graphics.Cursor;
using osu.Game.Online.Rooms;
using osuTK;
namespace osu.Game.Screens.Multi.Lounge.Components
namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
public class RoomsContainer : CompositeDrawable, IKeyBindingHandler<GlobalAction>
{

6
osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
View File

@ -12,11 +12,11 @@ using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Rooms;
using osu.Game.Overlays;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.Match;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Match;
using osu.Game.Users;
namespace osu.Game.Screens.Multi.Lounge
namespace osu.Game.Screens.OnlinePlay.Lounge
{
[Cached]
public abstract class LoungeSubScreen : MultiplayerSubScreen

4
osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
View File

@ -10,10 +10,10 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Online.Rooms;
using osu.Game.Screens.Multi.Playlists;
using osu.Game.Screens.OnlinePlay.Playlists;
using osuTK;
namespace osu.Game.Screens.Multi.Match.Components
namespace osu.Game.Screens.OnlinePlay.Match.Components
{
public class Footer : CompositeDrawable
{

4
osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
View File

@ -10,10 +10,10 @@ using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Online.Rooms;
using osu.Game.Online.Rooms.GameTypes;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.OnlinePlay.Components;
using osuTK;
namespace osu.Game.Screens.Multi.Match.Components
namespace osu.Game.Screens.OnlinePlay.Match.Components
{
public class GameTypePicker : DisableableTabControl<GameType>
{

2
osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
View File

@ -10,7 +10,7 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Users.Drawables;
using osuTK;
namespace osu.Game.Screens.Multi.Match.Components
namespace osu.Game.Screens.OnlinePlay.Match.Components
{
public class Header : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Bindables;
using osu.Game.Online.Chat;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.Multi.Match.Components
namespace osu.Game.Screens.OnlinePlay.Match.Components
{
public class MatchChatDisplay : StandAloneChatDisplay
{

2
osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
View File

@ -10,7 +10,7 @@ using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Leaderboards;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.Multi.Match.Components
namespace osu.Game.Screens.OnlinePlay.Match.Components
{
public class MatchLeaderboard : Leaderboard<MatchLeaderboardScope, APIUserScoreAggregate>
{

2
osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
View File

@ -8,7 +8,7 @@ using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Leaderboards;
using osu.Game.Scoring;
namespace osu.Game.Screens.Multi.Match.Components
namespace osu.Game.Screens.OnlinePlay.Match.Components
{
public class MatchLeaderboardScore : LeaderboardScore
{

2
osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
View File

@ -10,7 +10,7 @@ using osu.Game.Graphics.UserInterface;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Match.Components
namespace osu.Game.Screens.OnlinePlay.Match.Components
{
public abstract class MatchSettingsOverlay : FocusedOverlayContainer
{

2
osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
View File

@ -5,7 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Multi.Match.Components
namespace osu.Game.Screens.OnlinePlay.Match.Components
{
public class PurpleTriangleButton : TriangleButton
{

4
osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
View File

@ -11,11 +11,11 @@ using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Rooms;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.OnlinePlay.Components;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Match.Components
namespace osu.Game.Screens.OnlinePlay.Match.Components
{
public class RoomAvailabilityPicker : DisableableTabControl<RoomAvailability>
{

2
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -15,7 +15,7 @@ using osu.Game.Overlays;
using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Play;
namespace osu.Game.Screens.Multi.Match
namespace osu.Game.Screens.OnlinePlay.Match
{
[Cached(typeof(IPreviewTrackOwner))]
public abstract class RoomSubScreen : MultiplayerSubScreen, IPreviewTrackOwner

4
osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
View File

@ -4,9 +4,9 @@
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.OnlinePlay.Match.Components;
namespace osu.Game.Screens.Multi.Multiplayer
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
public class CreateMultiplayerMatchButton : PurpleTriangleButton
{

4
osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
View File

@ -9,9 +9,9 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Screens;
using osu.Game.Online.API;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.OnlinePlay.Match.Components;
namespace osu.Game.Screens.Multi.Multiplayer.Match
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
{
public class BeatmapSelectionControl : MultiplayerComposite
{

2
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Graphics;
using osu.Game.Online.Rooms;
using osuTK;
namespace osu.Game.Screens.Multi.Multiplayer.Match
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
{
public class MultiplayerMatchFooter : CompositeDrawable
{

4
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
View File

@ -10,14 +10,14 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.API;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.OnlinePlay.Match.Components;
using osu.Game.Users.Drawables;
using osuTK;
using FontWeight = osu.Game.Graphics.FontWeight;
using OsuColour = osu.Game.Graphics.OsuColour;
using OsuFont = osu.Game.Graphics.OsuFont;
namespace osu.Game.Screens.Multi.Multiplayer.Match
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
{
public class MultiplayerMatchHeader : MultiplayerComposite
{

4
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
View File

@ -18,10 +18,10 @@ using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
using osu.Game.Overlays;
using osu.Game.Rulesets;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.OnlinePlay.Match.Components;
using osuTK;
namespace osu.Game.Screens.Multi.Multiplayer.Match
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
{
public class MultiplayerMatchSettingsOverlay : MatchSettingsOverlay
{

4
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
View File

@ -15,10 +15,10 @@ using osu.Game.Graphics.Backgrounds;
using osu.Game.Online.API;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.OnlinePlay.Components;
using osuTK;
namespace osu.Game.Screens.Multi.Multiplayer.Match
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
{
public class MultiplayerReadyButton : MultiplayerRoomComposite
{

6
osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
View File

@ -8,10 +8,10 @@ using osu.Game.Extensions;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Screens.OnlinePlay.Lounge;
namespace osu.Game.Screens.Multi.Multiplayer
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
public class Multiplayer : MultiplayerScreen
{

4
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
View File

@ -1,9 +1,9 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
namespace osu.Game.Screens.Multi.Multiplayer
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
public class MultiplayerFilterControl : FilterControl
{

8
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
View File

@ -5,11 +5,11 @@ using osu.Framework.Allocation;
using osu.Framework.Logging;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.Match;
using osu.Game.Screens.OnlinePlay.Lounge;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Match;
namespace osu.Game.Screens.Multi.Multiplayer
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
public class MultiplayerLoungeSubScreen : LoungeSubScreen
{

2
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
View File

@ -13,7 +13,7 @@ using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
using osu.Game.Screens.Select;
namespace osu.Game.Screens.Multi.Multiplayer
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
public class MultiplayerMatchSongSelect : SongSelect, IMultiplayerSubScreen
{

14
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
View File

@ -11,15 +11,15 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Screens;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.Multi.Match;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.Multi.Multiplayer.Match;
using osu.Game.Screens.Multi.Multiplayer.Participants;
using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Screens.OnlinePlay.Match;
using osu.Game.Screens.OnlinePlay.Match.Components;
using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
using osu.Game.Users;
using ParticipantsList = osu.Game.Screens.Multi.Multiplayer.Participants.ParticipantsList;
using ParticipantsList = osu.Game.Screens.OnlinePlay.Multiplayer.Participants.ParticipantsList;
namespace osu.Game.Screens.Multi.Multiplayer
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
[Cached]
public class MultiplayerMatchSubScreen : RoomSubScreen

4
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
View File

@ -11,13 +11,13 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
using osu.Game.Scoring;
using osu.Game.Screens.Multi.Playlists;
using osu.Game.Screens.OnlinePlay.Playlists;
using osu.Game.Screens.Play;
using osu.Game.Screens.Play.HUD;
using osu.Game.Screens.Ranking;
using osuTK;
namespace osu.Game.Screens.Multi.Multiplayer
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
// Todo: The "room" part of PlaylistsPlayer should be split out into an abstract player class to be inherited instead.
public class MultiplayerPlayer : PlaylistsPlayer

4
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
View File

@ -3,9 +3,9 @@
using osu.Game.Online.Rooms;
using osu.Game.Scoring;
using osu.Game.Screens.Multi.Playlists;
using osu.Game.Screens.OnlinePlay.Playlists;
namespace osu.Game.Screens.Multi.Multiplayer
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
public class MultiplayerResultsScreen : PlaylistsResultsScreen
{

2
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
View File

@ -5,7 +5,7 @@ using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Game.Online.Multiplayer;
namespace osu.Game.Screens.Multi.Multiplayer
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
public abstract class MultiplayerRoomComposite : MultiplayerComposite
{

4
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
View File

@ -13,9 +13,9 @@ using osu.Game.Extensions;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
using osu.Game.Online.Rooms.RoomStatuses;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.OnlinePlay.Components;
namespace osu.Game.Screens.Multi.Multiplayer
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
public class MultiplayerRoomManager : RoomManager
{

2
osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
View File

@ -22,7 +22,7 @@ using osu.Game.Users.Drawables;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Multiplayer.Participants
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
{
public class ParticipantPanel : MultiplayerRoomComposite, IHasContextMenu
{

2
osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
View File

@ -9,7 +9,7 @@ using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Cursor;
using osuTK;
namespace osu.Game.Screens.Multi.Multiplayer.Participants
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
{
public class ParticipantsList : MultiplayerRoomComposite
{

4
osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
View File

@ -3,9 +3,9 @@
using osu.Framework.Allocation;
using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.OnlinePlay.Components;
namespace osu.Game.Screens.Multi.Multiplayer.Participants
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
{
public class ParticipantsListHeader : OverlinedHeader
{

2
osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Online.Multiplayer;
using osuTK;
namespace osu.Game.Screens.Multi.Multiplayer.Participants
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
{
public class StateDisplay : CompositeDrawable
{

2
osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Online.Rooms;
using osu.Game.Users;
namespace osu.Game.Screens.Multi
namespace osu.Game.Screens.OnlinePlay
{
public class MultiplayerComposite : CompositeDrawable
{

10
osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
View File

@ -17,14 +17,14 @@ using osu.Game.Online.API;
using osu.Game.Online.Rooms;
using osu.Game.Overlays;
using osu.Game.Screens.Menu;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.Match;
using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Screens.OnlinePlay.Lounge;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Match;
using osu.Game.Users;
using osuTK;
namespace osu.Game.Screens.Multi
namespace osu.Game.Screens.OnlinePlay
{
[Cached]
public abstract class MultiplayerScreen : OsuScreen

2
osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
View File

@ -5,7 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Screens;
namespace osu.Game.Screens.Multi
namespace osu.Game.Screens.OnlinePlay
{
public abstract class MultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen
{

2
osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
View File

@ -3,7 +3,7 @@
using osu.Framework.Screens;
namespace osu.Game.Screens.Multi
namespace osu.Game.Screens.OnlinePlay
{
public class MultiplayerSubScreenStack : OsuScreenStack
{

4
osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
View File

@ -2,9 +2,9 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.OnlinePlay.Match.Components;
namespace osu.Game.Screens.Multi.Playlists
namespace osu.Game.Screens.OnlinePlay.Playlists
{
public class CreatePlaylistsRoomButton : PurpleTriangleButton
{

8
osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
View File

@ -5,11 +5,11 @@ using osu.Framework.Logging;
using osu.Framework.Screens;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Rooms;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.Multi.Match;
using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Screens.OnlinePlay.Lounge;
using osu.Game.Screens.OnlinePlay.Match;
namespace osu.Game.Screens.Multi.Playlists
namespace osu.Game.Screens.OnlinePlay.Playlists
{
public class Playlists : MultiplayerScreen
{

8
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
View File

@ -2,11 +2,11 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Game.Online.Rooms;
using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.Match;
using osu.Game.Screens.OnlinePlay.Lounge;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Match;
namespace osu.Game.Screens.Multi.Playlists
namespace osu.Game.Screens.OnlinePlay.Playlists
{
public class PlaylistsLoungeSubScreen : LoungeSubScreen
{

4
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
View File

@ -16,10 +16,10 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Rooms;
using osu.Game.Overlays;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.OnlinePlay.Match.Components;
using osuTK;
namespace osu.Game.Screens.Multi.Playlists
namespace osu.Game.Screens.OnlinePlay.Playlists
{
public class PlaylistsMatchSettingsOverlay : MatchSettingsOverlay
{

2
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
View File

@ -17,7 +17,7 @@ using osu.Game.Scoring;
using osu.Game.Screens.Play;
using osu.Game.Screens.Ranking;
namespace osu.Game.Screens.Multi.Playlists
namespace osu.Game.Screens.OnlinePlay.Playlists
{
public class PlaylistsPlayer : Player
{

Some files were not shown because too many files have changed in this diff Show More