Merge remote-tracking branch 'origin/master' into netstandard

7 years ago · 883ff04e79
parent 4cc3e92d55 92ec3d10b1
commit 883ff04e79
31 changed files with 0 additions and 0 deletions
--- a/osu.Game.Resources/Samples/Gameplay/Taiko/normal-hitclap.wav
+++ b/osu.Game.Resources/Samples/Gameplay/Taiko/normal-hitclap.wav
--- a/osu.Game.Resources/Samples/Gameplay/Taiko/normal-hitfinish.wav
+++ b/osu.Game.Resources/Samples/Gameplay/Taiko/normal-hitfinish.wav
--- a/osu.Game.Resources/Samples/Gameplay/Taiko/normal-hitnormal.wav
+++ b/osu.Game.Resources/Samples/Gameplay/Taiko/normal-hitnormal.wav
--- a/osu.Game.Resources/Samples/Gameplay/Taiko/normal-hitwhistle.wav
+++ b/osu.Game.Resources/Samples/Gameplay/Taiko/normal-hitwhistle.wav
--- a/osu.Game.Resources/Samples/Gameplay/Taiko/soft-hitclap.wav
+++ b/osu.Game.Resources/Samples/Gameplay/Taiko/soft-hitclap.wav
--- a/osu.Game.Resources/Samples/Gameplay/Taiko/soft-hitfinish.wav
+++ b/osu.Game.Resources/Samples/Gameplay/Taiko/soft-hitfinish.wav
--- a/osu.Game.Resources/Samples/Gameplay/Taiko/soft-hitnormal.wav
+++ b/osu.Game.Resources/Samples/Gameplay/Taiko/soft-hitnormal.wav
--- a/osu.Game.Resources/Samples/Gameplay/Taiko/soft-hitwhistle.wav
+++ b/osu.Game.Resources/Samples/Gameplay/Taiko/soft-hitwhistle.wav
--- a/osu.Game.Resources/Samples/Gameplay/drum-hitclap.wav
+++ b/osu.Game.Resources/Samples/Gameplay/drum-hitclap.wav
--- a/osu.Game.Resources/Samples/Gameplay/drum-hitfinish.wav
+++ b/osu.Game.Resources/Samples/Gameplay/drum-hitfinish.wav
--- a/osu.Game.Resources/Samples/Gameplay/drum-hitnormal.wav
+++ b/osu.Game.Resources/Samples/Gameplay/drum-hitnormal.wav
--- a/osu.Game.Resources/Samples/Gameplay/drum-hitwhistle.wav
+++ b/osu.Game.Resources/Samples/Gameplay/drum-hitwhistle.wav
--- a/osu.Game.Resources/Samples/Gameplay/drum-sliderslide.wav
+++ b/osu.Game.Resources/Samples/Gameplay/drum-sliderslide.wav
--- a/osu.Game.Resources/Samples/Gameplay/drum-slidertick.wav
+++ b/osu.Game.Resources/Samples/Gameplay/drum-slidertick.wav
--- a/osu.Game.Resources/Samples/Gameplay/drum-sliderwhistle.wav
+++ b/osu.Game.Resources/Samples/Gameplay/drum-sliderwhistle.wav
--- a/osu.Game.Resources/Samples/Gameplay/normal-hitclap.wav
+++ b/osu.Game.Resources/Samples/Gameplay/normal-hitclap.wav
--- a/osu.Game.Resources/Samples/Gameplay/normal-hitfinish.wav
+++ b/osu.Game.Resources/Samples/Gameplay/normal-hitfinish.wav
--- a/osu.Game.Resources/Samples/Gameplay/normal-hitnormal.wav
+++ b/osu.Game.Resources/Samples/Gameplay/normal-hitnormal.wav
--- a/osu.Game.Resources/Samples/Gameplay/normal-hitwhistle.wav
+++ b/osu.Game.Resources/Samples/Gameplay/normal-hitwhistle.wav
--- a/osu.Game.Resources/Samples/Gameplay/normal-sliderslide.wav
+++ b/osu.Game.Resources/Samples/Gameplay/normal-sliderslide.wav
--- a/osu.Game.Resources/Samples/Gameplay/normal-slidertick.wav
+++ b/osu.Game.Resources/Samples/Gameplay/normal-slidertick.wav
--- a/osu.Game.Resources/Samples/Gameplay/normal-sliderwhistle.wav
+++ b/osu.Game.Resources/Samples/Gameplay/normal-sliderwhistle.wav
--- a/osu.Game.Resources/Samples/Gameplay/soft-hitclap.wav
+++ b/osu.Game.Resources/Samples/Gameplay/soft-hitclap.wav
--- a/osu.Game.Resources/Samples/Gameplay/soft-hitfinish.wav
+++ b/osu.Game.Resources/Samples/Gameplay/soft-hitfinish.wav
--- a/osu.Game.Resources/Samples/Gameplay/soft-hitnormal.wav
+++ b/osu.Game.Resources/Samples/Gameplay/soft-hitnormal.wav
--- a/osu.Game.Resources/Samples/Gameplay/soft-hitwhistle.wav
+++ b/osu.Game.Resources/Samples/Gameplay/soft-hitwhistle.wav
--- a/osu.Game.Resources/Samples/Gameplay/soft-sliderslide.wav
+++ b/osu.Game.Resources/Samples/Gameplay/soft-sliderslide.wav
--- a/osu.Game.Resources/Samples/Gameplay/soft-slidertick.wav
+++ b/osu.Game.Resources/Samples/Gameplay/soft-slidertick.wav
--- a/osu.Game.Resources/Samples/Gameplay/soft-sliderwhistle.wav
+++ b/osu.Game.Resources/Samples/Gameplay/soft-sliderwhistle.wav
--- a/osu.Game.Resources/Samples/Gameplay/spinnerbonus.wav
+++ b/osu.Game.Resources/Samples/Gameplay/spinnerbonus.wav
--- a/osu.Game.Resources/Samples/Gameplay/spinnerspin.wav
+++ b/osu.Game.Resources/Samples/Gameplay/spinnerspin.wav