sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 14:17:06 +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

2
osu.Game/Graphics/Containers/ConstrainedIconContainer.cs
View File

@ -4,7 +4,7 @@
using System;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using OpenTK;
using osuTK;
namespace osu.Game.Graphics.Containers
{

2
osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
View File

@ -5,7 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics.Containers;
using OpenTK;
using osuTK;
using osu.Framework.Configuration;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;

2
osu.Game/Graphics/Containers/OsuHoverContainer.cs
View File

@ -2,7 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using OpenTK.Graphics;
using osuTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;

2
osu.Game/Graphics/Containers/OsuScrollContainer.cs
View File

@ -3,7 +3,7 @@
using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Events;
using OpenTK.Input;
using osuTK.Input;
namespace osu.Game.Graphics.Containers
{

2
osu.Game/Graphics/Containers/ParallaxContainer.cs
View File

@ -4,7 +4,7 @@
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics;
using osu.Framework.Input;
using OpenTK;
using osuTK;
using osu.Framework.Allocation;
using osu.Game.Configuration;
using osu.Framework.Configuration;

2
osu.Game/Graphics/Containers/WaveContainer.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using OpenTK.Graphics;
using osuTK.Graphics;
namespace osu.Game.Graphics.Containers
{