diff --git a/art/SECRET REPO INSTRUCTIONS.md b/art/SECRET REPO INSTRUCTIONS.md new file mode 100644 index 00000000..4b47da12 --- /dev/null +++ b/art/SECRET REPO INSTRUCTIONS.md @@ -0,0 +1,10 @@ +## DEV (PRIVATE) REPO INSTRUCTIONS TO SYNC UP WITH IT INSTEAD OF SYNCING WITH THE PUBLIC ONE +- Open a Command Prompt window in the public codename repo folder +- Type those commands: + - `git remote add dev https://www.github.com/YoshiCrafter29/CodenameEngine-Dev` + - `git branch --set-upstream-to dev/main` +- GitHub desktop should be synchronized with the dev repo now. If you're unsure, + - Repo name should still say "CodenameEngine" + - Current branch should still say "main" + - "Fetch" button should say "Fetch dev" + - You shouldn't have any commit to push. \ No newline at end of file diff --git a/assets/shaders/editorBlur.frag b/assets/shaders/editorBlur.frag index f29cf77f..e0b08742 100644 --- a/assets/shaders/editorBlur.frag +++ b/assets/shaders/editorBlur.frag @@ -12,7 +12,10 @@ vec4 getColor(vec2 pos) { return textureCam(bitmap, pos); } void main() { + return; vec2 camPos = getCamPos(openfl_TextureCoordv); + if (camPos.x < 0 || camPos.x > 1 || camPos.y < 0 || camPos.y > 1) + return; vec4 color = getColor(camPos); float fsteps = steps; diff --git a/buildnumber.txt b/buildnumber.txt index 881449a4..6b6243de 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -2569 \ No newline at end of file +2571 \ No newline at end of file diff --git a/source/funkin/editors/ui/UIContextMenu.hx b/source/funkin/editors/ui/UIContextMenu.hx index 3b5f56fc..116eb8a9 100644 --- a/source/funkin/editors/ui/UIContextMenu.hx +++ b/source/funkin/editors/ui/UIContextMenu.hx @@ -34,6 +34,11 @@ class UIContextMenu extends MusicBeatSubstate { contextCam.alpha = CoolUtil.fpsLerp(contextCam.alpha, 1, 0.25); } + + public override function destroy() { + super.destroy(); + FlxG.cameras.remove(contextCam); + } } typedef UIContextMenuOption = { diff --git a/source/funkin/editors/ui/UISprite.hx b/source/funkin/editors/ui/UISprite.hx index 1654baa9..f0c3ad41 100644 --- a/source/funkin/editors/ui/UISprite.hx +++ b/source/funkin/editors/ui/UISprite.hx @@ -20,6 +20,10 @@ class UISprite extends FlxSprite { public var hoverCallback:Void->Void = null; public override function update(elapsed:Float) { + hovered = false; + pressed = false; + hoveredByChild = false; + super.update(elapsed); updateButton(); @@ -33,9 +37,6 @@ class UISprite extends FlxSprite { FlxCamera._defaultCameras = __oldDefCams; } - hovered = false; - pressed = false; - hoveredByChild = false; } public override function draw() {