sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into user-beatmap-downloading-states

Browse Source
This commit is contained in:
Salman Ahmed
2021-01-13 22:31:31 +03:00
committed by GitHub
parent 0d5fbb15ac 398f8762b1
commit 560b1e970c
144 changed files with 1943 additions and 1364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[Cached]
public Bindable<FilterCriteria> Filter { get; }
[Cached]
public OngoingOperationTracker OngoingOperationTracker { get; }
protected override Container<Drawable> Content => content;
private readonly TestMultiplayerRoomContainer content;
@ -36,6 +39,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
Client = content.Client;
RoomManager = content.RoomManager;
Filter = content.Filter;
OngoingOperationTracker = content.OngoingOperationTracker;
}
[SetUp]

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

@ -25,6 +25,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[Cached]
public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
[Cached]
public readonly OngoingOperationTracker OngoingOperationTracker;
public TestMultiplayerRoomContainer()
{
RelativeSizeAxes = Axes.Both;
@ -33,6 +36,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
{
Client = new TestMultiplayerClient(),
RoomManager = new TestMultiplayerRoomManager(),
OngoingOperationTracker = new OngoingOperationTracker(),
content = new Container { RelativeSizeAxes = Axes.Both }
});
}