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 'taiko_note_circle' into taiko_drawable_drawing

Browse Source 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
This commit is contained in:
smoogipooo
2017-03-24 16:02:49 +09:00
parent 99f1e86a5e d6d3eb99b7
commit 33c160efeb
7 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@
<Compile Include="Objects\Drawable\Pieces\DrumRollCirclePiece.cs" />
<Compile Include="Objects\Drawable\Pieces\FinisherPiece.cs" />
<Compile Include="Objects\Drawable\Pieces\RimHitCirclePiece.cs" />
<Compile Include="Objects\Drawable\Pieces\ScrollingCirclePiece.cs" />
<Compile Include="Objects\Drawable\Pieces\ScrollingPiece.cs" />
<Compile Include="TaikoDifficultyCalculator.cs" />
<Compile Include="Objects\TaikoHitObject.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@ -94,7 +94,6 @@
<Name>osu.Game</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.