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

8 years ago · c79d917605
parent c3def1cf00 4287ee8043
commit c79d917605
36 changed files with 0 additions and 0 deletions
--- a/osu.Game.Resources/Samples/Menu/button-back-select.wav
+++ b/osu.Game.Resources/Samples/Menu/button-back-select.wav
--- a/osu.Game.Resources/Samples/Menu/button-direct-select.wav
+++ b/osu.Game.Resources/Samples/Menu/button-direct-select.wav
--- a/osu.Game.Resources/Samples/Menu/button-generic-select.wav
+++ b/osu.Game.Resources/Samples/Menu/button-generic-select.wav
--- a/osu.Game.Resources/Samples/Menu/button-hover.wav
+++ b/osu.Game.Resources/Samples/Menu/button-hover.wav
--- a/osu.Game.Resources/Samples/Menu/button-play-select.wav
+++ b/osu.Game.Resources/Samples/Menu/button-play-select.wav
--- a/osu.Game.Resources/Samples/Menu/button-solo-select.wav
+++ b/osu.Game.Resources/Samples/Menu/button-solo-select.wav
--- a/osu.Game.Resources/Samples/Menu/heartbeat.mp3
+++ b/osu.Game.Resources/Samples/Menu/heartbeat.mp3
--- a/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat.mp3
+++ b/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat.mp3
--- a/osu.Game.Resources/Samples/Menu/osu-logo-select.wav
+++ b/osu.Game.Resources/Samples/Menu/osu-logo-select.wav
--- a/osu.Game.Resources/Samples/Menu/select-1.wav
+++ b/osu.Game.Resources/Samples/Menu/select-1.wav
--- a/osu.Game.Resources/Samples/Menu/select-2.wav
+++ b/osu.Game.Resources/Samples/Menu/select-2.wav
--- a/osu.Game.Resources/Samples/Menu/select-3.wav
+++ b/osu.Game.Resources/Samples/Menu/select-3.wav
--- a/osu.Game.Resources/Samples/Menu/select-4.wav
+++ b/osu.Game.Resources/Samples/Menu/select-4.wav
--- a/osu.Game.Resources/Samples/Menu/select-5.wav
+++ b/osu.Game.Resources/Samples/Menu/select-5.wav
--- a/osu.Game.Resources/Samples/Menu/select-6.wav
+++ b/osu.Game.Resources/Samples/Menu/select-6.wav
--- a/osu.Game.Resources/Samples/Menu/select-7.wav
+++ b/osu.Game.Resources/Samples/Menu/select-7.wav
--- a/osu.Game.Resources/Samples/SongSelect/confirm-selection.wav
+++ b/osu.Game.Resources/Samples/SongSelect/confirm-selection.wav
--- a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-1.wav
+++ b/osu.Game.Resources/Samples/SongSelect/song-ping-variation-1.wav
--- a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-2.wav
+++ b/osu.Game.Resources/Samples/SongSelect/song-ping-variation-2.wav
--- a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-3.wav
+++ b/osu.Game.Resources/Samples/SongSelect/song-ping-variation-3.wav
--- a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-4.wav
+++ b/osu.Game.Resources/Samples/SongSelect/song-ping-variation-4.wav
--- a/osu.Game.Resources/Samples/UI/generic-click.wav
+++ b/osu.Game.Resources/Samples/UI/generic-click.wav
--- a/osu.Game.Resources/Samples/UI/generic-hover-soft.wav
+++ b/osu.Game.Resources/Samples/UI/generic-hover-soft.wav
--- a/osu.Game.Resources/Samples/UI/generic-hover-softer.wav
+++ b/osu.Game.Resources/Samples/UI/generic-hover-softer.wav
--- a/osu.Game.Resources/Samples/UI/generic-hover.wav
+++ b/osu.Game.Resources/Samples/UI/generic-hover.wav
--- a/osu.Game.Resources/Samples/UI/generic-select-soft.wav
+++ b/osu.Game.Resources/Samples/UI/generic-select-soft.wav
--- a/osu.Game.Resources/Samples/UI/generic-select-softer.wav
+++ b/osu.Game.Resources/Samples/UI/generic-select-softer.wav
--- a/osu.Game.Resources/Samples/UI/generic-select.wav
+++ b/osu.Game.Resources/Samples/UI/generic-select.wav
--- a/osu.Game.Resources/Samples/UI/melodic-1.wav
+++ b/osu.Game.Resources/Samples/UI/melodic-1.wav
--- a/osu.Game.Resources/Samples/UI/melodic-2.wav
+++ b/osu.Game.Resources/Samples/UI/melodic-2.wav
--- a/osu.Game.Resources/Samples/UI/melodic-3.wav
+++ b/osu.Game.Resources/Samples/UI/melodic-3.wav
--- a/osu.Game.Resources/Samples/UI/melodic-4.wav
+++ b/osu.Game.Resources/Samples/UI/melodic-4.wav
--- a/osu.Game.Resources/Samples/UI/melodic-5.wav
+++ b/osu.Game.Resources/Samples/UI/melodic-5.wav
--- a/osu.Game.Resources/Samples/UI/overlay-pop-in.wav
+++ b/osu.Game.Resources/Samples/UI/overlay-pop-in.wav
--- a/osu.Game.Resources/Samples/UI/overlay-pop-out.wav
+++ b/osu.Game.Resources/Samples/UI/overlay-pop-out.wav
--- a/osu.Game.Resources/Samples/UI/screen-back.wav
+++ b/osu.Game.Resources/Samples/UI/screen-back.wav