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

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

Browse Source 
# Conflicts:
#	osu-framework
#	osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
#	osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
This commit is contained in:
smoogipoo
2018-06-21 12:15:25 +09:00
parent 4784538d73 bf9b210a44
commit c9581a2d56
324 changed files with 7427 additions and 4456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Mods;