Merge branch 'dev' into compat-5.7.0

HaxeFlixel · Mar 18, 2024 · 5a16bf8 · 5a16bf8
2 parents 15411c0 + a1c877d
commit 5a16bf8
Show file tree

Hide file tree

Showing 18 changed files with 0 additions and 619 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -37,7 +37,6 @@
 		"Effects/FlxTween/source",
 		"Effects/MosaicEffect/source",
 		"Effects/Parallax/source",
-		"Effects/PostProcess/source",
 		"Effects/Transitions/source",
 		"Features/CollisionAndGrouping/source",
 		"Features/Colors/source",

diff --git a/Editors/TexturePackerAtlas/source/MenuState.hx b/Editors/TexturePackerAtlas/source/MenuState.hx
@@ -123,8 +123,5 @@ class MenuState extends FlxState
 		x11.animation.addByPrefix("spin", "", 3);
 		x11.animation.play("spin");
 		add(x11);
-
-		// Remove atlas bitmaps from memory (useful for targets with hardware acceleration: cpp only atm).
-		FlxG.bitmap.dumpCache();
 	}
 }
diff --git a/Effects/PostProcess/PostProcess.hxproj b/Effects/PostProcess/PostProcess.hxproj
diff --git a/Effects/PostProcess/Project.xml b/Effects/PostProcess/Project.xml
diff --git a/Effects/PostProcess/assets/images/logo.png b/Effects/PostProcess/assets/images/logo.png
diff --git a/Effects/PostProcess/assets/shaders/blur.frag b/Effects/PostProcess/assets/shaders/blur.frag
diff --git a/Effects/PostProcess/assets/shaders/deuteranopia.frag b/Effects/PostProcess/assets/shaders/deuteranopia.frag
diff --git a/Effects/PostProcess/assets/shaders/grain.frag b/Effects/PostProcess/assets/shaders/grain.frag