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

Merge remote-tracking branch 'upstream/master' into profile

Browse Source 
# Conflicts:
#	osu.Game/Graphics/Containers/SectionsContainer.cs
This commit is contained in:
Dean Herbert
2017-07-13 13:44:21 +09:00
parent 752f625a62 80f88cf5bb
commit 3a4150c6c3
59 changed files with 590 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/OsuGame.cs
View File

@ -143,7 +143,7 @@ namespace osu.Game
{
base.LoadComplete();
Add(new Drawable[] {
AddRange(new Drawable[] {
new VolumeControlReceptor
{
RelativeSizeAxes = Axes.Both,