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

Merge remote-tracking branch 'upstream/master' into replay

Browse Source 
# Conflicts:
#	osu.Game.Modes.Catch/CatchRuleset.cs
#	osu.Game.Modes.Mania/ManiaRuleset.cs
#	osu.Game.Modes.Taiko/TaikoRuleset.cs
#	osu.Game/Screens/Play/Player.cs
This commit is contained in:
Dean Herbert
2017-03-04 13:17:01 +09:00
parent 4bd85fe5cb 7dce1fbe3a
commit 9e1383fa48
126 changed files with 5024 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Screens/Play/Player.cs
View File

@ -16,7 +16,6 @@ using osu.Framework.Screens;
using osu.Game.Modes.UI;
using osu.Game.Screens.Ranking;
using osu.Game.Configuration;
using osu.Game.Overlays.Pause;
using osu.Framework.Configuration;
using System;
using System.Collections.Generic;