Merge branch 'master' into taiko_bash_drawable

Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
This commit is contained in:
smoogipooo
2017-03-20 18:20:32 +09:00
51 changed files with 843 additions and 454 deletions

View File

@ -54,7 +54,6 @@
<Compile Include="Objects\Bash.cs" />
<Compile Include="Objects\Drawable\DrawableBash.cs" />
<Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
<Compile Include="Objects\TaikoHitType.cs" />
<Compile Include="TaikoDifficultyCalculator.cs" />
<Compile Include="Objects\TaikoHitObject.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />