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

Merge branch 'master' into taiko_drumroll_drawable

Browse Source 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
This commit is contained in:
smoogipooo
2017-03-20 18:05:54 +09:00
parent ecd6958eea df17f2c996
commit a3e406af6a
51 changed files with 843 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
View File

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