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

Merge remote-tracking branch 'upstream/master' into api-channels-messages

Browse Source 
Conflicts:
	osu.Game/Online/Chat/Message.cs
This commit is contained in:
Dean Herbert
2016-09-29 23:54:33 +09:00
parent 7c98ef1b3d 8470961c2a
commit b4c9dca54b
14 changed files with 91 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/OsuGameBase.cs
View File

@ -4,6 +4,7 @@ using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Textures;
using osu.Framework.IO.Stores;
using osu.Game.Configuration;
using osu.Game.Graphics.Cursor;
using osu.Game.Graphics.Processing;
using osu.Game.Online.API;
@ -44,7 +45,7 @@ namespace osu.Game
{
Children = new Drawable[]
{
new CursorContainer()
new OsuCursorContainer()
}
}
});