diff --git a/assets/preload/music/freakyMenu-unused.mp3 b/assets/preload/music/freakyMenu-unused.mp3 new file mode 100644 index 00000000000..58aed03fc0d Binary files /dev/null and b/assets/preload/music/freakyMenu-unused.mp3 differ diff --git a/assets/preload/music/freakyMenu-unused.ogg b/assets/preload/music/freakyMenu-unused.ogg new file mode 100644 index 00000000000..fb99188369a Binary files /dev/null and b/assets/preload/music/freakyMenu-unused.ogg differ diff --git a/assets/preload/music/unused/shadyMenu.mp3 b/assets/preload/music/unused/shadyMenu.mp3 new file mode 100644 index 00000000000..58aed03fc0d Binary files /dev/null and b/assets/preload/music/unused/shadyMenu.mp3 differ diff --git a/assets/preload/music/unused/shadyMenu.ogg b/assets/preload/music/unused/shadyMenu.ogg new file mode 100644 index 00000000000..fb99188369a Binary files /dev/null and b/assets/preload/music/unused/shadyMenu.ogg differ diff --git a/assets/splash/videos/fuck.mp4 b/assets/splash/videos/fuck.mp4 deleted file mode 100644 index c6bd4d0a5ce..00000000000 Binary files a/assets/splash/videos/fuck.mp4 and /dev/null differ diff --git a/source/StartupState.hx b/source/StartupState.hx index 891b3c36a74..8e78615cfec 100644 --- a/source/StartupState.hx +++ b/source/StartupState.hx @@ -96,8 +96,6 @@ class StartupState extends MusicBeatState playVideo('oops'); case 1: playVideo('haxe'); - case 2: - playVideo('fuck'); } } }); diff --git a/source/TitleState.hx b/source/TitleState.hx index 4ee06b68981..662980ddb50 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -198,6 +198,8 @@ class TitleState extends MusicBeatState Conductor.changeBPM(115); case 'Base Game' | 'Default': // just in case you're not making a source mod & wanna change this Conductor.changeBPM(titleJSON.bpm); + /*case 'unused' + Conductor.changeBPM(110);*/ default: // fallback Conductor.changeBPM(titleJSON.bpm); } diff --git a/source/editors/BenchmarkState.hx b/source/editors/BenchmarkState.hx index 8decea7292b..fea668c9c12 100644 --- a/source/editors/BenchmarkState.hx +++ b/source/editors/BenchmarkState.hx @@ -4,6 +4,7 @@ import flixel.FlxG; import flixel.FlxState; import model.objects.flixel.Flixel; import flixel.text.FlxText; +import flx3D.Flx3DUtil; import flixel.util.FlxDestroyUtil; class BenchmarkState extends FlxState