Merge branch 'dev' of https://github.com/HaxeFlixel/flixel-addons int…

…o dev

README.md

@@ -1,4 +1,4 @@
-![](https://raw.github.com/HaxeFlixel/haxeflixel.com/master/src/files/images/flixel-logos/flixel-addons.png)
+![](https://github.com/HaxeFlixel/haxeflixel.com/blob/dev/content/_static/images/flixel-logos/flixel-addons.png?raw=true)
 
 [flixel](https://github.com/HaxeFlixel/flixel) | [addons](https://github.com/HaxeFlixel/flixel-addons) | [ui](https://github.com/HaxeFlixel/flixel-ui) | [demos](https://github.com/HaxeFlixel/flixel-demos) | [tools](https://github.com/HaxeFlixel/flixel-tools) | [templates](https://github.com/HaxeFlixel/flixel-templates) | [docs](https://github.com/HaxeFlixel/flixel-docs) | [haxeflixel.com](https://github.com/HaxeFlixel/haxeflixel.com) |  [türkçe](/README_TR.md)
 

flixel/addons/display/FlxBackdrop.hx

@@ -115,7 +115,7 @@ class FlxBackdrop extends FlxSprite
 			drawToLargestCamera();
 		}
 
-		#if (flixel >= "5.7.0")
+		#if (flixel >= version("5.7.0"))
 		final cameras = getCamerasLegacy();
 		#end
 		for (camera in cameras)
@@ -161,7 +161,7 @@ class FlxBackdrop extends FlxSprite
 	{
 		var largest:FlxCamera = null;
 		var largestArea = 0.0;
-		#if (flixel >= "5.7.0")
+		#if (flixel >= version("5.7.0"))
 		final cameras = getCamerasLegacy(); // else use this.cameras
 		#end
 		for (camera in cameras)

flixel/addons/display/FlxShaderMaskCamera.hx

@@ -1,6 +1,6 @@
 package flixel.addons.display;
 
-#if (openfl >= "8.0.0")
+#if (openfl >= version("8.0.0"))
 import flixel.FlxBasic;
 import flixel.FlxCamera;
 import flixel.FlxG;

flixel/addons/editors/ogmo/FlxOgmo3Loader.hx

@@ -284,7 +284,7 @@ class FlxOgmo3Loader
 		for (i in 0...tileFlags.length)
 		{
 			var flag = tileFlags[i];
-			#if (flixel < "5.9.0")
+			#if (flixel <version( "5.9.0"))
 			var specialTile = new FlxTileSpecial(tilemap.getTileByIndex(i), false, false, 0);
 			#else
 			var specialTile = new FlxTileSpecial(tilemap.getTileIndex(i), false, false, 0);

flixel/addons/editors/spine/FlxSpine.hx

@@ -270,20 +270,11 @@ class FlxSpine extends FlxSprite
 					wrapper.y = 0;
 					wrapper._cameras = _cameras;
 
-					#if (flash || openfl >= "4.0.0")
 					wrapper.vertices.length = verticesLength;
 					for (i in 0...verticesLength)
 					{
 						wrapper.vertices[i] = worldVertices[i];
 					}
-					#else
-					if (worldVertices.length - verticesLength > 0)
-					{
-						worldVertices.splice(verticesLength, worldVertices.length - verticesLength);
-					}
-
-					wrapper.vertices = worldVertices;
-					#end
 
 					wrapper.indices = Vector.ofArray(triangles);
 					wrapper.uvtData = Vector.ofArray(uvtData);

flixel/addons/effects/FlxTrail.hx

@@ -17,7 +17,7 @@ import flixel.math.FlxPoint;
  * Feel free to use this class and adjust it to your needs.
  * @author Gama11
  */
-class FlxTrail extends #if (flixel < "5.7.0") FlxSpriteGroup #else FlxSpriteContainer #end
+class FlxTrail extends #if (flixel < version("5.7.0")) FlxSpriteGroup #else FlxSpriteContainer #end
 {
 	/**
 	 * Stores the FlxSprite the trail is attached to.

flixel/addons/effects/chainable/FlxEffectSprite.hx

@@ -2,7 +2,7 @@ package flixel.addons.effects.chainable;
 
 // TODO: remove this check when min flixel version is 5.6.0,
 // So that FlxAddonDefines will handle this
-#if (flixel < "5.3.0")
+#if (flixel < version("5.3.0"))
 #error "Flixel-Addons is not compatible with flixel versions older than 5.3.0";
 #end
 

flixel/addons/nape/FlxNapeSpace.hx

@@ -64,7 +64,7 @@ class FlxNapeSpace extends FlxBasic
 	 */
 	public static function init():Void
 	{
-		#if (flixel < "5.6.0")
+		#if (flixel < version("5.6.0"))
 		FlxG.plugins.add(new FlxNapeSpace());
 		#else
 		FlxG.plugins.addPlugin(new FlxNapeSpace());

flixel/addons/nape/FlxNapeTilemap.hx

@@ -100,7 +100,7 @@ class FlxNapeTilemap extends FlxTilemap
 		var polygon:Polygon;
 		for (index in tileIndices)
 		{
-			#if (flixel >= "5.9.0")
+			#if (flixel >= version("5.9.0"))
 			final points = getAllTilePos(index);
 			#else
 			final points = getTileCoords(index, false);

flixel/addons/plugin/control/FlxControlHandler.hx

@@ -7,7 +7,7 @@ import flixel.FlxSprite;
 import flixel.math.FlxMath;
 import flixel.math.FlxPoint;
 import flixel.math.FlxVelocity;
-#if (flixel >= "5.3.0")
+#if (flixel >= version("5.3.0"))
 import flixel.sound.FlxSound;
 #else
 import flixel.system.FlxSound;

flixel/addons/plugin/screengrab/FlxScreenGrab.hx

@@ -10,11 +10,9 @@ import flixel.addons.util.PNGEncoder;
 import flixel.FlxG;
 import flixel.input.keyboard.FlxKey;
 #if sys
-#if (!lime_legacy || lime < "2.9.0")
 import lime.ui.FileDialog;
 import lime.ui.FileDialogType;
 import openfl.display.PNGEncoderOptions;
-#end
 #else
 import openfl.net.FileReference;
 #end

flixel/addons/system/macros/FlxAddonDefines.hx

@@ -41,7 +41,7 @@ class FlxAddonDefines
 		 * When the minimum version of flixel is changed to 5.6.0 or greater, remove the above
 		 * checks and this comment.
 		 */
-		#if (flixel < "5.3.0")
+		#if (flixel < version("5.3.0"))
 		FlxDefines.abortVersion("Flixel", "5.3.0 or newer", "flixel", (macro null).pos);
 		#end
 	}
@@ -61,4 +61,4 @@ class FlxAddonDefines
 		Context.fatalError(message, pos);
 	}
 }
-#end
+#end

flixel/addons/text/FlxTypeText.hx

@@ -2,7 +2,7 @@ package flixel.addons.text;
 
 // TODO: remove this check when min flixel version is 5.6.0,
 // So that FlxAddonDefines will handle this
-#if (flixel < "5.3.0")
+#if (flixel < version("5.3.0"))
 #error "Flixel-Addons is not compatible with flixel versions older than 5.3.0";
 #end
 

flixel/addons/tile/FlxTilemapExt.hx

@@ -139,7 +139,7 @@ class FlxTilemapExt extends FlxTilemap
 		}
 
 		// Copy tile images into the tile buffer
-		#if (flixel < "5.2.0")
+		#if (flixel < version("5.2.0"))
 		_point.x = (camera.scroll.x * scrollFactor.x) - x - offset.x + camera.viewOffsetX; // modified from getScreenPosition()
 		_point.y = (camera.scroll.y * scrollFactor.y) - y - offset.y + camera.viewOffsetY;
 		#else
@@ -322,7 +322,7 @@ class FlxTilemapExt extends FlxTilemap
 		}
 	}
 
-	#if (flixel < "5.9.0")
+	#if (flixel < version("5.9.0"))
 	/**
 	 * THIS IS A COPY FROM FlxTilemap BUT IT SOLVES SLOPE COLLISION TOO
 	 * Checks if the Object overlaps any tiles with any collision flags set,

flixel/addons/transition/FlxTransitionableState.hx

@@ -2,7 +2,7 @@ package flixel.addons.transition;
 
 // TODO: remove this check when min flixel version is 5.6.0,
 // So that FlxAddonDefines will handle this
-#if (flixel < "5.3.0")
+#if (flixel < version("5.3.0"))
 #error "Flixel-Addons is not compatible with flixel versions older than 5.3.0";
 #end
 

flixel/addons/transition/TransitionEffect.hx

@@ -10,7 +10,7 @@ import flixel.util.FlxTimer;
  * @author larsiusprime
  */
 @:allow(flixel.addons.transition.Transition)
-class TransitionEffect extends #if (flixel < "5.7.0") FlxSpriteGroup #else FlxSpriteContainer #end
+class TransitionEffect extends #if (flixel < version("5.7.0")) FlxSpriteGroup #else FlxSpriteContainer #end
 {
 	public var finishCallback:Void->Void;
 	public var finished(default, null):Bool = false;

flixel/addons/ui/FlxButtonPlus.hx

@@ -24,7 +24,7 @@ import flixel.math.FlxMath;
  * @link http://www.photonstorm.com
  * @author Richard Davey / Photon Storm
  */
-class FlxButtonPlus extends #if (flixel < "5.7.0") FlxSpriteGroup #else FlxSpriteContainer #end
+class FlxButtonPlus extends #if (flixel < version("5.7.0")) FlxSpriteGroup #else FlxSpriteContainer #end
 {
 	public static inline var NORMAL:Int = 0;
 	public static inline var HIGHLIGHT:Int = 1;

flixel/addons/ui/FlxClickArea.hx

@@ -133,7 +133,7 @@ class FlxClickArea extends FlxObject
 		if (continueUpdate)
 		{
 			var offAll:Bool = true;
-			#if (flixel >= "5.7.0")
+			#if (flixel >= version("5.7.0"))
 			final cameras = getCameras(); // else use this.cameras
 			#end
 			for (camera in cameras)

flixel/addons/ui/FlxSlider.hx

@@ -16,7 +16,7 @@ import flixel.util.FlxSpriteUtil;
  * A slider GUI element for float and integer manipulation.
  * @author Gama11
  */
-class FlxSlider extends #if (flixel < "5.7.0") FlxSpriteGroup #else FlxSpriteContainer #end
+class FlxSlider extends #if (flixel < version("5.7.0")) FlxSpriteGroup #else FlxSpriteContainer #end
 {
 	/**
 	 * The horizontal line in the background.

flixel/addons/weapon/FlxWeapon.hx

@@ -2,7 +2,7 @@ package flixel.addons.weapon;
 
 // TODO: remove this check when min flixel version is 5.6.0,
 // So that FlxAddonDefines will handle this
-#if (flixel < "5.3.0")
+#if (flixel < version("5.3.0"))
 #error "Flixel-Addons is not compatible with flixel versions older than 5.3.0";
 #end
 
@@ -439,7 +439,7 @@ class FlxTypedWeapon<TBullet:FlxBullet>
 
 		if ((object is FlxTilemap))
 		{
-			#if (flixel < "5.9.0")
+			#if (flixel < version("5.9.0"))
 			return cast(object, FlxTilemap).overlapsWithCallback(bullet);
 			#else
 			return cast(object, FlxTilemap).objectOverlapsTiles(bullet);

haxelib.json

@@ -6,5 +6,8 @@
 	"description": "flixel-addons is a set of useful, additional classes for HaxeFlixel.",
 	"version": "3.3.0",
 	"releasenote": "Compatibility with flixel 5.9.0",
-	"contributors": ["haxeflixel", "Gama11", "GeoKureli"]
+	"contributors": ["haxeflixel", "Gama11", "GeoKureli"],
+	"dependencies": {
+		"flixel": ""
+	}
 }