Fix dep 5.9.0 (#369)

* remove FlxAssets refs * screenX/Y to view * reformat FlxAsepriteUtil * add subfolder, just to make sure it works * ci haxe 4.3.6 * add FLX_NO_HEALTH to all projects
HaxeFlixel · Dec 11, 2024 · e2ef48d · e2ef48d
1 parent 2ffc93b
commit e2ef48d
Show file tree

Hide file tree

Showing 100 changed files with 371 additions and 66 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        haxe-version: ["4.2.5", "4.3.4"]
+        haxe-version: ["4.2.5", "4.3.6"]
         target: [html5, hl, flash, cpp]
       fail-fast: false
     runs-on: ubuntu-latest

diff --git a/Arcade/Breakout/Project.xml b/Arcade/Breakout/Project.xml
@@ -47,6 +47,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Arcade/Flappybalt/Project.xml b/Arcade/Flappybalt/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Arcade/FlxInvaders/Project.xml b/Arcade/FlxInvaders/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Arcade/FlxLightPuzzle/Project.xml b/Arcade/FlxLightPuzzle/Project.xml
@@ -51,6 +51,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Arcade/FlxLightPuzzle/source/PlayState.hx b/Arcade/FlxLightPuzzle/source/PlayState.hx
@@ -65,7 +65,11 @@ class PlayState extends FlxState
 
 		// the original file was edited to have a 44100 Hz sampling frequency, since Flash cannot use 48000 Hz
 		// this is really easy to change using a free program like Audacity
-		FlxG.sound.playMusic(FlxAssets.getSound("assets/music/Waltzon_edit"), 0.5);
+		#if flash
+		FlxG.sound.playMusic("assets/music/Waltzon_edit.mp3", 0.5);
+		#else
+		FlxG.sound.playMusic("assets/music/Waltzon_edit.ogg", 0.5);
+		#end
 
 		openMenu();
 	}

diff --git a/Arcade/FlxPongApi/Project.xml b/Arcade/FlxPongApi/Project.xml
@@ -47,6 +47,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Arcade/FlxSnake/Project.xml b/Arcade/FlxSnake/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Arcade/FlxSnake/source/PlayState.hx b/Arcade/FlxSnake/source/PlayState.hx
@@ -158,7 +158,11 @@ class PlayState extends FlxState
 
 		// Our reward - a new segment! :)
 		addSegment();
-		FlxG.sound.load(FlxAssets.getSound("flixel/sounds/beep")).play();
+		#if flash
+		FlxG.sound.load("flixel/sounds/beep.mp3").play();
+		#else
+		FlxG.sound.load("flixel/sounds/beep.ogg").play();
+		#end
 
 		// Become faster each pickup - set a max speed though!
 		if (_movementInterval >= MIN_INTERVAL)

diff --git a/Arcade/FlxTeroids/Project.xml b/Arcade/FlxTeroids/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Arcade/MinimalistTD/Project.xml b/Arcade/MinimalistTD/Project.xml
@@ -47,7 +47,7 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
-	<!--Disable the legacy health system-->
+	<!--Remove the legacy health system-->
 	<haxedef name="FLX_NO_HEALTH" />
 
 	<!--Enable the Flixel core recording system-->

diff --git a/Editors/FlxPexParser/Project.xml b/Editors/FlxPexParser/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Editors/FlxSpine/Project.xml b/Editors/FlxSpine/Project.xml
@@ -50,6 +50,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Editors/TexturePackerAtlas/Project.xml b/Editors/TexturePackerAtlas/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Editors/TiledEditor/Project.xml b/Editors/TiledEditor/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/BlendModeShaders/Project.xml b/Effects/BlendModeShaders/Project.xml
@@ -50,6 +50,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/BlendModes/Project.xml b/Effects/BlendModes/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/DynamicShadows/Project.xml b/Effects/DynamicShadows/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/Filters/Project.xml b/Effects/Filters/Project.xml
@@ -55,6 +55,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/FloodFill/Project.xml b/Effects/FloodFill/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/FlxBloom/Project.xml b/Effects/FlxBloom/Project.xml
@@ -47,6 +47,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/FlxBlur/Project.xml b/Effects/FlxBlur/Project.xml
@@ -47,6 +47,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/FlxClothSprite/Project.xml b/Effects/FlxClothSprite/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/FlxEffectSprite/Project.xml b/Effects/FlxEffectSprite/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/FlxFloodFill/Project.xml b/Effects/FlxFloodFill/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/FlxSimplex/Project.xml b/Effects/FlxSimplex/Project.xml
@@ -47,6 +47,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/FlxSkewedSprite/Project.xml b/Effects/FlxSkewedSprite/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/FlxSpriteFilters/project.xml b/Effects/FlxSpriteFilters/project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/FlxTrailArea/Project.xml b/Effects/FlxTrailArea/Project.xml
@@ -47,6 +47,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/FlxTween/Project.xml b/Effects/FlxTween/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/MosaicEffect/Project.xml b/Effects/MosaicEffect/Project.xml
@@ -53,6 +53,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/Parallax/Project.xml b/Effects/Parallax/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Effects/Transitions/Project.xml b/Effects/Transitions/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Features/CollisionAndGrouping/Project.xml b/Features/CollisionAndGrouping/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Features/Colors/Project.xml b/Features/Colors/Project.xml
@@ -51,6 +51,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable this for nape release builds for a serious peformance improvement-->
 	<!--<haxedef name="NAPE_RELEASE_BUILD" />--> 
 

diff --git a/Features/FlxCamera/project.xml b/Features/FlxCamera/project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Features/FlxFSM/Project.xml b/Features/FlxFSM/Project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Features/FlxNape/project.xml b/Features/FlxNape/project.xml
@@ -48,6 +48,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<!--Remove the legacy health system-->
+	<haxedef name="FLX_NO_HEALTH" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 

diff --git a/Features/FlxNape/source/states/Blob.hx b/Features/FlxNape/source/states/Blob.hx
@@ -241,7 +241,7 @@ class Eye extends FlxGroup
 	{
 		super.update(elapsed);
 
-		var distance:Vec2 = new Vec2(FlxG.mouse.screenX - x, FlxG.mouse.screenY - y);
+		var distance:Vec2 = new Vec2(FlxG.mouse.viewX - x, FlxG.mouse.viewY - y);
 
 		outerEye.x = x;
 		outerEye.y = y;