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

Merge remote-tracking branch 'origin/master' into external_link_warning

Browse Source
This commit is contained in:
smoogipoo
2018-11-23 15:19:52 +09:00
parent df004d7a49 4c0c9f0aa7
commit cadfe41f83
476 changed files with 1088 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Chat/ChatLine.cs
View File

@ -3,8 +3,8 @@
using System;
using System.Linq;
using OpenTK;
using OpenTK.Graphics;
using osuTK;
using osuTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;

6
osu.Game/Overlays/Chat/ChatTabControl.cs
View File

@ -12,9 +12,9 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Chat;
using OpenTK;
using OpenTK.Input;
using OpenTK.Graphics;
using osuTK;
using osuTK.Input;
using osuTK.Graphics;
using osu.Framework.Configuration;
using System;
using osu.Framework.Input.Events;

2
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using OpenTK.Graphics;
using osuTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.Containers;

4
osu.Game/Overlays/Chat/Selection/ChannelListItem.cs
View File

@ -3,8 +3,8 @@
using System;
using System.Collections.Generic;
using OpenTK;
using OpenTK.Graphics;
using osuTK;
using osuTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;

2
osu.Game/Overlays/Chat/Selection/ChannelSection.cs
View File

@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenTK;
using osuTK;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.Sprites;

4
osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
View File

@ -3,8 +3,8 @@
using System;
using System.Collections.Generic;
using OpenTK;
using OpenTK.Graphics;
using osuTK;
using osuTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;

6
osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Chat;
using OpenTK;
using osuTK;
using osu.Framework.Configuration;
using System;
using System.Linq;
@ -56,12 +56,10 @@ namespace osu.Game.Overlays.Chat.Tabs
{
switch (value.Type)
{
case ChannelType.Public:
default:
return new ChannelTabItem(value) { OnRequestClose = tabCloseRequested };
case ChannelType.PM:
return new PrivateChannelTabItem(value) { OnRequestClose = tabCloseRequested };
default:
throw new InvalidOperationException("Only TargetType User and Channel are supported.");
}
}

4
osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs
View File

@ -13,8 +13,8 @@ using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
using OpenTK;
using OpenTK.Graphics;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Overlays.Chat.Tabs
{

2
osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
using osu.Game.Users;
using OpenTK;
using osuTK;
namespace osu.Game.Overlays.Chat.Tabs
{

4
osu.Game/Overlays/Chat/Tabs/TabCloseButton.cs
View File

@ -5,8 +5,8 @@ using osu.Framework.Graphics;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using OpenTK;
using OpenTK.Graphics;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Overlays.Chat.Tabs
{