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 background-blur

Browse Source
This commit is contained in:
Dean Herbert
2018-01-09 21:20:05 +09:00
committed by GitHub
parent df62ca14b7 96226e1f27
commit c2fadcfc1f
964 changed files with 4731 additions and 2663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Configuration;

2
osu.Game/Configuration/RandomSelectAlgorithm.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.ComponentModel;

4
osu.Game/Configuration/RankingType.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.ComponentModel;
@ -15,4 +15,4 @@ namespace osu.Game.Configuration
Friends,
Country
}
}
}

4
osu.Game/Configuration/ReleaseStream.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
namespace osu.Game.Configuration
@ -10,4 +10,4 @@ namespace osu.Game.Configuration
//Beta40,
//Stable
}
}
}

4
osu.Game/Configuration/ScoreMeterType.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
namespace osu.Game.Configuration
@ -9,4 +9,4 @@ namespace osu.Game.Configuration
Colour,
Error
}
}
}

4
osu.Game/Configuration/ScreenshotFormat.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.ComponentModel;
@ -13,4 +13,4 @@ namespace osu.Game.Configuration
[Description("PNG (lossless)")]
Png = 2
}
}
}