diff --git a/art/flashFiles/RECOVER_teaser animated.fla b/art/flashFiles/RECOVER_teaser animated.fla new file mode 100644 index 00000000..a96f8195 Binary files /dev/null and b/art/flashFiles/RECOVER_teaser animated.fla differ diff --git a/art/flashFiles/teaser animated.fla b/art/flashFiles/teaser animated.fla new file mode 100644 index 00000000..a96f8195 Binary files /dev/null and b/art/flashFiles/teaser animated.fla differ diff --git a/art/teaser layers/teaser bg.png b/art/teaser layers/teaser bg.png new file mode 100644 index 00000000..dd6a21e1 Binary files /dev/null and b/art/teaser layers/teaser bg.png differ diff --git a/art/teaser layers/teaser checkerboard.png b/art/teaser layers/teaser checkerboard.png new file mode 100644 index 00000000..e35aefa6 Binary files /dev/null and b/art/teaser layers/teaser checkerboard.png differ diff --git a/art/teaser layers/teaser funkin logo.png b/art/teaser layers/teaser funkin logo.png new file mode 100644 index 00000000..2ddb4a5e Binary files /dev/null and b/art/teaser layers/teaser funkin logo.png differ diff --git a/art/teaser layers/teaser question mark.png b/art/teaser layers/teaser question mark.png new file mode 100644 index 00000000..fe36a227 Binary files /dev/null and b/art/teaser layers/teaser question mark.png differ diff --git a/buildnumber.txt b/buildnumber.txt index 8bf8757c..5b18ee08 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -2490 \ No newline at end of file +2492 \ No newline at end of file diff --git a/source/funkin/editors/DebugOptions.hx b/source/funkin/editors/DebugOptions.hx index e4dce706..29c3ae0e 100644 --- a/source/funkin/editors/DebugOptions.hx +++ b/source/funkin/editors/DebugOptions.hx @@ -5,6 +5,8 @@ import funkin.options.TreeMenu; class DebugOptions extends TreeMenu { public override function create() { super.create(); + + FlxG.camera.fade(0xFF000000, 0.5, true); var bg:FlxSprite = new FlxSprite(-80).loadAnimatedGraphic(Paths.image('menus/menuBGBlue')); diff --git a/source/funkin/editors/EditorPicker.hx b/source/funkin/editors/EditorPicker.hx index 05c152ae..53aeedce 100644 --- a/source/funkin/editors/EditorPicker.hx +++ b/source/funkin/editors/EditorPicker.hx @@ -50,7 +50,7 @@ class EditorPicker extends MusicBeatSubstate { camera = new FlxCamera(); camera.bgColor = 0; - FlxG.cameras.add(camera); + FlxG.cameras.add(camera, false); bg = new FlxSprite().makeGraphic(1, 1, 0xFF000000); bg.scrollFactor.set(); diff --git a/source/funkin/editors/EditorTreeMenu.hx b/source/funkin/editors/EditorTreeMenu.hx index 7c5d44a8..0eac78b1 100644 --- a/source/funkin/editors/EditorTreeMenu.hx +++ b/source/funkin/editors/EditorTreeMenu.hx @@ -10,6 +10,8 @@ class EditorTreeMenu extends TreeMenu { public override function create() { super.create(); + FlxG.camera.fade(0xFF000000, 0.5, true); + bg = new FlxBackdrop(); bg.loadGraphic(Paths.image('editors/bgs/${bgType}')); bg.antialiasing = true; diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 863e1317..447bcbce 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -532,8 +532,8 @@ class PlayState extends MusicBeatState // ADD YOUR HARDCODED SCRIPTS HERE! default: for(content in [ - Paths.getFolderContent('songs/${SONG.meta.name.toLowerCase()}/scripts', true, fromMods ? MODS : SOURCE), - Paths.getFolderContent('data/charts/', true, fromMods ? MODS : SOURCE)]) { + Paths.getFolderContent('songs/${SONG.meta.name.toLowerCase()}/scripts', true, fromMods ? MODS : BOTH), + Paths.getFolderContent('data/charts/', true, fromMods ? MODS : BOTH)]) { for(file in content) { var ext = Path.extension(file).toLowerCase(); if (Script.scriptExtensions.contains(ext)) diff --git a/source/funkin/options/OptionsMenu.hx b/source/funkin/options/OptionsMenu.hx index 6735f621..4f1dcbe9 100644 --- a/source/funkin/options/OptionsMenu.hx +++ b/source/funkin/options/OptionsMenu.hx @@ -31,11 +31,6 @@ class OptionsMenu extends TreeMenu { name: 'Miscellaneous', desc: 'Use this menu to reset save data or engine settings.', state: MiscOptions - }, - { - name: 'Debug Options', - desc: 'Use this menu to change debug options.', - state: DebugOptions } ];