sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into multiplayer-room-settings

Browse Source
This commit is contained in:
smoogipoo
2018-11-26 16:27:22 +09:00
parent e6d5bbd886 e94c5dfabe
commit dcf740e5d3
696 changed files with 10602 additions and 5266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Online/Multiplayer/GameType.cs
View File

@ -1,8 +1,8 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using OpenTK.Graphics;
using osuTK;
using osuTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;

2
osu.Game/Online/Multiplayer/RoomStatus.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK.Graphics;
using osuTK.Graphics;
using osu.Game.Graphics;
namespace osu.Game.Online.Multiplayer