Merge branch 'master' into new-samples

master
Dean Herbert 8 years ago committed by GitHub
commit 0ce565dead

Binary file not shown.

Before

Width:  |  Height:  |  Size: 304 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 600 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 537 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 487 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 KiB

@ -88,9 +88,6 @@
<ItemGroup>
<EmbeddedResource Include="Fonts\osuFont_0.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Textures\Menu\background.jpg" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Textures\Backgrounds\bg3.jpg" />
</ItemGroup>
@ -192,6 +189,10 @@
<EmbeddedResource Include="Samples\Gameplay\soft-slidertick.wav" />
<EmbeddedResource Include="Samples\Gameplay\soft-sliderwhistle.wav" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Samples\Gameplay\sectionfail.mp3" />
<EmbeddedResource Include="Samples\Gameplay\sectionpass.mp3" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Textures\Menu\dev-build-footer.png" />
</ItemGroup>
@ -654,6 +655,11 @@
<EmbeddedResource Include="Samples\Menu\select-5.wav" />
<EmbeddedResource Include="Samples\Menu\select-6.wav" />
<EmbeddedResource Include="Samples\Menu\select-7.wav" />
<EmbeddedResource Include="Textures\Menu\menu-background-1.jpg" />
<EmbeddedResource Include="Textures\Menu\menu-background-2.jpg" />
<EmbeddedResource Include="Textures\Menu\menu-background-3.jpg" />
<EmbeddedResource Include="Textures\Menu\menu-background-4.jpg" />
<EmbeddedResource Include="Textures\Menu\menu-background-5.jpg" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Loading…
Cancel
Save