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

Merge branch 'master' into replay

Browse Source 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
This commit is contained in:
Dean Herbert
2017-03-05 17:45:03 +09:00
parent 7a6a614358 a7d7abe70e
commit 4e4408cd20
96 changed files with 217 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/Cursor/OsuCursorContainer.cs
View File

@ -5,11 +5,11 @@ using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Input;
using osu.Game.Configuration;