1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:28:00 +08:00
osu-lazer/osu.Game.Rulesets.Taiko
smoogipooo 579698f0a9 Merge remote-tracking branch 'origin/master' into taiko-fixes
# Conflicts:
#	osu.Game.Rulesets.Taiko/UI/TaikoHitRenderer.cs
2017-04-18 17:12:23 +09:00
..
Beatmaps Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Judgements Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Mods Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Objects Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Properties Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Replays Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Scoring Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
UI Merge remote-tracking branch 'origin/master' into taiko-fixes 2017-04-18 17:12:23 +09:00
OpenTK.dll.config Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
osu.Game.Rulesets.Taiko.csproj Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
packages.config Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
TaikoDifficultyCalculator.cs Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
TaikoRuleset.cs Mode -> Ruleset. 2017-04-18 16:05:58 +09:00