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

Merge branch 'master' into audio-device-selection

Browse Source 
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
This commit is contained in:
Dean Herbert
2017-02-09 16:21:28 +09:00
parent 6add77c30b 1ace39254d
commit d05b544d0d
281 changed files with 2139 additions and 1872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/osu.Game.csproj
View File

@ -69,6 +69,7 @@
<Compile Include="Graphics\Sprites\OsuSpriteText.cs" />
<Compile Include="Graphics\UserInterface\BackButton.cs" />
<Compile Include="Graphics\UserInterface\Nub.cs" />
<Compile Include="Graphics\UserInterface\OsuPasswordTextBox.cs" />
<Compile Include="Graphics\UserInterface\OsuSliderBar.cs" />
<Compile Include="Graphics\UserInterface\OsuTextBox.cs" />
<Compile Include="Graphics\UserInterface\TwoLayerButton.cs" />
@ -188,6 +189,7 @@
<Compile Include="Overlays\Toolbar\ToolbarModeSelector.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Screens\Select\BeatmapInfoWedge.cs" />
<Compile Include="Screens\Select\WedgeBackground.cs" />
<Compile Include="Users\User.cs" />
<Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />
<Compile Include="Database\BeatmapDatabase.cs" />