Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Geokureli committed Aug 15, 2023
2 parents 25944b5 + edefd96 commit 6df925b
Show file tree
Hide file tree
Showing 47 changed files with 1,081 additions and 397 deletions.
187 changes: 106 additions & 81 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
3.2.0 (August 15, 2023)
------------------------------
#### New Features:
- `FlxRuntimeShader`: Generate shaders from glsl provided at runtime ([#399](https://github.com/HaxeFlixel/flixel-addons/pull/399))

#### Changes and improvements:
- `FlxSkewedSprite`: Allow shaders ([#390](https://github.com/HaxeFlixel/flixel-addons/pull/390))
- `FlxBackdrop`: Use pooled `FlxPoint` for `spacing` ([#394](https://github.com/HaxeFlixel/flixel-addons/pull/394))
- `FlxMouseControl`: Deprecated, use [FlxMouseEvent](https://haxeflixel.com/demos/FlxMouseEvent/) instead
- `FlxTransitionSprite`: Fix transition sprite graphics on html5 ([#396](https://github.com/HaxeFlixel/flixel-addons/pull/396))
- Compress and include asset paths for transition images:
- "flixel/images/transitions/circle.png"
- "flixel/images/transitions/square.png"
- "flixel/images/transitions/diamond.png"
- "flixel/images/transitions/diagonal_gradient.png"
- Fix graphic classes
- `GraphicTransTileCircle`
- `GraphicTransTileSquare`
- `GraphicTransTileDiamond`
- `GraphicDiagonalGradient`
- prevent double update on transitions
- optimize wipe transitions, especially diagonal wipe
- Replace `flash` imports with `openfl` equivalents, where possible ([#400](https://github.com/HaxeFlixel/flixel-addons/pull/400))
- `FlxFSMTransitionTable`: Add `removeNow` arg to `remove` and `replace` ([#401](https://github.com/HaxeFlixel/flixel-addons/pull/401))

3.1.1 (May 19, 2023)
------------------------------
#### Changes and improvements:
Expand Down Expand Up @@ -52,8 +77,8 @@
2.8.0 (February 8, 2020)
------------------------------
* `FlxSliceSprite`:
* added `sourceRect` and `fillCenter` (#334)
* redid the implementation to make it work on older machines and in Safari (#335)
* added `sourceRect` and `fillCenter` (#334)
* redid the implementation to make it work on older machines and in Safari (#335)
* Added `flixel.addons.editors.ogmo.FlxOgmo3Loader` (#337)
* `flixel.addons.editors.tiled`: added support for grouped layers (#332)

Expand All @@ -73,9 +98,9 @@
------------------------------
* Compatibility with flixel 4.6.0 and Haxe 4.0.0-rc.1
* `flixel.addons.editors.tiled`:
* `TiledTileSet`: fixed `numRows` and `numCols` being flipped (#326)
* added support for Tiled Collision Editor (#327)
* `TiledImageLayer`: improved documentation (#329)
* `TiledTileSet`: fixed `numRows` and `numCols` being flipped (#326)
* added support for Tiled Collision Editor (#327)
* `TiledImageLayer`: improved documentation (#329)

2.7.1 (November 10, 2018)
------------------------------
Expand All @@ -97,9 +122,9 @@
* `FlxShapeCircle`: fixed some rounding issues (#304)
* `FlxExtendedSprite`: fixed click callbacks not working without drag (#308)
* `flixel.addons.editors.tiled`:
* fixed loading of external tile sets (#312)
* improved error messages for invalid paths (#312)
* fixed compatibility with Haxe 4
* fixed loading of external tile sets (#312)
* improved error messages for invalid paths (#312)
* fixed compatibility with Haxe 4
* `FlxSlider`: fixed bounds not being updated after position changes (#306)

2.5.0 (July 22, 2017)
Expand All @@ -114,18 +139,18 @@
------------------------------
* `FlxWeapon`: added `angleOffset` to `FlxWeaponFireFrom.PARENT` (#292)
* `FlxTypeText`:
* changed `start()` and `erase()` to always set the callbacks (#293)
* stop sounds when typing is complete (#295)
* added `finishSounds` (#296)
* changed `start()` and `erase()` to always set the callbacks (#293)
* stop sounds when typing is complete (#295)
* added `finishSounds` (#296)
* `TiledTileLayer`: removed an unnecessary warning on HTML5 (3c79b46)

2.3.0 (February 10, 2017)
------------------------------
* `FlxBackdrop`: fixed `color` not working with tilesheet rendering (#277)
* `FlxWeapon`: fixed `FIRE_FROM_PARENT_FACING` angles (#259)
* `FlxSliceSprite`:
* added setters for `alpha` and `color` (#276)
* fixed a rendering issue on Flash (#275)
* added setters for `alpha` and `color` (#276)
* fixed a rendering issue on Flash (#275)
* `flixel.addons.editors.spine`: support for spinehaxe version 3.5.0 (#281)
* `TiledObject`: fixed `gid` handling of flipped objects (#287)

Expand All @@ -134,8 +159,8 @@
* Compatibility with flixel 4.2.0
* `FlxWeaponFireFrom`: added a `useParentAngle` argument to `PARENT` (#261)
* `FlxPexParser`:
* added a `scale` argument to `new()` (#263)
* added support for blend modes (#270)
* added a `scale` argument to `new()` (#263)
* added support for blend modes (#270)
* `FlxSpine`: fixed an issue with texture loading and state switches (#265)
* `FlxTypeText`: added support for adding / removing more than one char per frame (#267)
* `flixel.addons.editors.tiled`: added support for animated tiles (#268)
Expand All @@ -153,17 +178,17 @@
* `FlxEffectSprite`: added `updateTargetAnimation` (#236)
* `FlxControlHandler`: added `invertX` and `invertY` (#239)
* `FlxBackdrop`:
* added support for `alpha` (#244)
* added support for `offset`
* added support for `alpha` (#244)
* added support for `offset`
* `TiledMap`:
* added a `rootPath` argument to `new()` (#245)
* renamed `FlxTiledAsset` to `FlxTiledMapAsset` (#245)
* added a `rootPath` argument to `new()` (#245)
* renamed `FlxTiledAsset` to `FlxTiledMapAsset` (#245)
* `TiledTileLayer`:
* added support for CSV encoding to `tileArray` (#245)
* changed `new()`'s `data` argument from `Dynamic` to `FlxTiledTileAsset` (#245)
* added support for CSV encoding to `tileArray` (#245)
* changed `new()`'s `data` argument from `Dynamic` to `FlxTiledTileAsset` (#245)
* `TiledObject`:
* changed the default name from `"[object]"` to `""` (#247)
* [Neko] fixed the types of `flippedHorizontally` / `flippedVertically`
* changed the default name from `"[object]"` to `""` (#247)
* [Neko] fixed the types of `flippedHorizontally` / `flippedVertically`
* `TiledLayer`: added `offsetX` and `offsetY` (#251)
* `FlxFSM`: [Neko] fixed an invalid field access error (#257)
* Added `FlxTiledSprite`
Expand All @@ -173,71 +198,71 @@
------------------------------
* Compatibility with flixel 4.0.0
* `flixel.addons.editors.tiled`:
* `TiledLayer` and `TiledObjectGroup` have been replaced with `TiledTileLayer` and `TiledObjectLayer` with a common base class `TiledLayer`
* `TiledMap` now stores object layers and tile layers in a single array, `layers`, to maintain the order of object and tile layers
* `TileTileLayer`: added `encoding`
* `TiledTileSet`: added `"id"` to `tileProps`
* added `TiledImageLayer`
* added `TiledImageTile` and `TiledTileSet#tileImagesSources`
* `TiledLayer` and `TiledObjectGroup` have been replaced with `TiledTileLayer` and `TiledObjectLayer` with a common base class `TiledLayer`
* `TiledMap` now stores object layers and tile layers in a single array, `layers`, to maintain the order of object and tile layers
* `TileTileLayer`: added `encoding`
* `TiledTileSet`: added `"id"` to `tileProps`
* added `TiledImageLayer`
* added `TiledImageTile` and `TiledTileSet#tileImagesSources`
* `FlxTileSpecial`:
* fixed bugs related to rotation happening after flipping
* `flipHorizontal` -> `flipX`
* `flipVertical` -> `flipY`
* fixed bugs related to rotation happening after flipping
* `flipHorizontal` -> `flipX`
* `flipVertical` -> `flipY`
* added `flixel.addons.util.FlxFSM`
* `FlxTrail`:
* now extends `FlxSpriteGroup`
* now supports animations
* now extends `FlxSpriteGroup`
* now supports animations
* `FlxTrailArea`: fixed the `offset` of sprites not being taken into account
* `flixel.addons.weapon`:
* abstracted `FlxWeapon` into `FlxTypedWeapon` (`FlxWeapon` is now a `typedef` for `FlxTypedWeapon<FlxBullet>`)
* `FlxTypedWeapon#new()` now requires a `BulletFactory` function
* moved firing logic from `FlxBullet` to `FlxTypedWeapon`
* removed `onFireCallback` and `onFireSound`
* abstracted `FlxWeapon` into `FlxTypedWeapon` (`FlxWeapon` is now a `typedef` for `FlxTypedWeapon<FlxBullet>`)
* `FlxTypedWeapon#new()` now requires a `BulletFactory` function
* moved firing logic from `FlxBullet` to `FlxTypedWeapon`
* removed `onFireCallback` and `onFireSound`
* `FlxTypeText`:
* changed `Dynamic` callbacks to `Void->Void`
* replaced `sound` by a `sounds` array, from which one is randomly picked
* fixed jumping between lines during typing
* added `useDefaultSound` which is `false` by default
* changed `Dynamic` callbacks to `Void->Void`
* replaced `sound` by a `sounds` array, from which one is randomly picked
* fixed jumping between lines during typing
* added `useDefaultSound` which is `false` by default
* added `flixel.addons.editors.pex.FlxPexParser`
* added `flixel.addons.transition`
* added `flixel.addons.util.FlxScene`
* `flixel.addons.nape`:
* refactored `FlxNapeState` into a plugin called `FlxNapeSpace`, making it possible to use nape with other `FlxState` child classes like `FlxUIState`
* `FlxNapeSpace`: added `napePhysicsEnabled`
* `FlxNapeSpace`: made `shapeDebug` public
* `FlxNapeSprite`: `setPosition()` is now overridden and sets `body.position`
* `FlxNapeSprite#new()`: the `EnablePhysics` argument is now no longer ignored if `CreateRectangularBody` is `false`
* refactored `FlxNapeState` into a plugin called `FlxNapeSpace`, making it possible to use nape with other `FlxState` child classes like `FlxUIState`
* `FlxNapeSpace`: added `napePhysicsEnabled`
* `FlxNapeSpace`: made `shapeDebug` public
* `FlxNapeSprite`: `setPosition()` is now overridden and sets `body.position`
* `FlxNapeSprite#new()`: the `EnablePhysics` argument is now no longer ignored if `CreateRectangularBody` is `false`
* `flixel.addons.plugin.taskManager`:
* `AntTaskManager` -> `FlxTaskManager`
* `AntTask` -> `FlxTask`
* `AntTaskManager` -> `FlxTaskManager`
* `AntTask` -> `FlxTask`
* `FlxBackdrop`: added support for `scale`, `loadGraphic()` and `loadFrame()`
* `flixel.addons.editors.spine`:
* now uses [spinehaxe](https://github.com/bendmorris/spinehaxe) instead of [spinehx](https://github.com/nitrobin/spinehx)
* `FlxSpine#readSkeletonData()` now allows for different atlas and animation file names
* now uses [spinehaxe](https://github.com/bendmorris/spinehaxe) instead of [spinehx](https://github.com/nitrobin/spinehx)
* `FlxSpine#readSkeletonData()` now allows for different atlas and animation file names
* `FlxOgmoLoader`:
* added `getProperty()`
* the constructor no longer sets the camera bounds
* added `getProperty()`
* the constructor no longer sets the camera bounds
* `FlxScreenGrab`:
* fixed `defineHotkeys()` arguments overriding those in `grab()`
* now uses linc_dialogs instead of systools on native targets
* fixed `defineHotkeys()` arguments overriding those in `grab()`
* now uses linc_dialogs instead of systools on native targets
* `FlxTilemapExt`:
* added support for slopes with 22.5 and 67.5 degrees
* added `setGentle()` and `setSteep()`
* removed `setClouds()`
* added support for slopes with 22.5 and 67.5 degrees
* added `setGentle()` and `setSteep()`
* removed `setClouds()`
* `FlxExtendedSprite`: `mouseStartDragCallback` and `mouseStopDragCallback` now work
* added `flixel.addons.display.FlxPieDial`
* `FlxGridOverlay`: removed the non-functional `AddLegend` arguments
* `FlxZoomCamera`: made `zoomSpeed` and `zoomMargin` public
* added `flixel.addons.text.FlxTextField` (moved from core Flixel)
* added `flixel.addons.effects.chainable`:
* `IFlxEffect`
* `FlxEffectSprite`
* `FlxGlitchEffect` (replaces `FlxGlitchSprite`)
* `FlxWaveEffect` (replaces `FlxWaveSprite`)
* `FlxRainbowEffect`
* `FlxOutlineEffect`
* `FlxTrailEffect`
* `FlxShakeEffect`
* `IFlxEffect`
* `FlxEffectSprite`
* `FlxGlitchEffect` (replaces `FlxGlitchSprite`)
* `FlxWaveEffect` (replaces `FlxWaveSprite`)
* `FlxRainbowEffect`
* `FlxOutlineEffect`
* `FlxTrailEffect`
* `FlxShakeEffect`
* added `flixel.addons.effects.FlxClothSprite`

1.1.1 (December 15, 2015)
Expand All @@ -251,21 +276,21 @@
* Refactored StarFieldFX into FlxStarField2D and FlxStarField3D
* FlxBullet: removed redundant xGravity, yGravity, maxVelocityX and maxVelocityY
* FlxButtonPlus:
* Fixed initial text visibility
* Added setters for the member sprites and texts so you can change them
* Constructor params X and Y are now Floats
* Fixed initial text visibility
* Added setters for the member sprites and texts so you can change them
* Constructor params X and Y are now Floats
* FlxExtendedSprite: mouseStartDragCallback and mouseStopDragCallback now use MouseCallback (instead of Dynamic)
* FlxSlider: fixed uniqueness of the body sprite graphic
* FlxNestedSprite: fixed a potential issue in destroy()
* TiledObjectGroup:
* Removed x, y, width and height vars
* Added map and color vars
* Removed x, y, width and height vars
* Added map and color vars
* FlxTypeText: added skip()
* FlxNapeState: fixed issue with nape debug draw not showing on native targets
* Refactored AntTaskManager:
* Switched to Bool->Void callbacks as opposed to Dynamic
* Now extends FlxBasic and has to be add()ed
* Removed pause variable
* Switched to Bool->Void callbacks as opposed to Dynamic
* Now extends FlxBasic and has to be add()ed
* Removed pause variable
* FlxControlHandler: added compensation for diagonal movement
* Added FlxNapeTilemap
* Added FlxWaveSprite
Expand All @@ -282,17 +307,17 @@
------------------------------
* Compatibility with flixel 3.1.0
* FlxButtonPlus:
* fixed button graphic always being white
* use Void->Void for the callback function for consistency with the FlxTypedButton changes ([more info](https://github.com/HaxeFlixel/flixel/issues/805?source=cc))
* fixed button graphic always being white
* use Void->Void for the callback function for consistency with the FlxTypedButton changes ([more info](https://github.com/HaxeFlixel/flixel/issues/805?source=cc))
* Moved shape classes from flixel-ui to flixel.addons.display.shapes
* Added FlxAsyncLoop
* FlxNestedSprite:
* fixes for update and draw calls
* added relativeAlpha to fix the alpha calculation
* fixes for update and draw calls
* added relativeAlpha to fix the alpha calculation
* FlxSkewedSprite:
* added SimpleGraphic param to the constructor
* now correctly works with origin on cpp targets
* exposed the transformation matrix via transformMatrix and matrixExposed
* added SimpleGraphic param to the constructor
* now correctly works with origin on cpp targets
* exposed the transformation matrix via transformMatrix and matrixExposed
* Moved FlxTrail, FlxTrailArea and FlxSlider into flixel-addons

1.0.1 (December 28, 2013)
Expand Down
Binary file modified assets/images/transitions/circle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/transitions/diagonal_gradient.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/transitions/diamond.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/transitions/square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions flixel/addons/api/FlxGameJolt.hx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package flixel.addons.api;

import flash.display.Loader;
import flash.display.BitmapData;
import flash.events.Event;
import flash.events.IOErrorEvent;
import flash.net.URLLoader;
import flash.net.URLRequest;
import flash.net.URLRequestMethod;
import openfl.display.Loader;
import openfl.display.BitmapData;
import openfl.events.Event;
import openfl.events.IOErrorEvent;
import openfl.net.URLLoader;
import openfl.net.URLRequest;
import openfl.net.URLRequestMethod;
import haxe.crypto.Md5;
import haxe.crypto.Sha1;
import flixel.FlxG;
Expand Down
6 changes: 3 additions & 3 deletions flixel/addons/display/FlxBackdrop.hx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class FlxBackdrop extends FlxSprite
/**
* The gap between repeated tiles, defaults to (0, 0), or no gap.
*/
public var spacing(default, null):FlxPoint = new FlxPoint();
public var spacing(default, null):FlxPoint = FlxPoint.get();

/**
* If true, tiles are pre-rendered to a intermediary bitmap whenever `loadGraphic` is called
Expand Down Expand Up @@ -68,7 +68,7 @@ class FlxBackdrop extends FlxSprite
* Creates an instance of the FlxBackdrop class, used to create infinitely scrolling backgrounds.
*
* @param graphic The image you want to use for the backdrop.
* @param repeatAxes If the backdrop should repeat on the X axis.
* @param repeatAxes The axes on which to repeat. The default, `XY` will tile the entire camera.
* @param spacingX Amount of spacing between tiles on the X axis
* @param spacingY Amount of spacing between tiles on the Y axis
*/
Expand Down Expand Up @@ -569,4 +569,4 @@ typedef BackdropDrawParams = {
spacingY:Float,
repeatAxes:FlxAxes,
angle:Float
};
};
6 changes: 3 additions & 3 deletions flixel/addons/display/FlxGridOverlay.hx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package flixel.addons.display;

import flash.display.BitmapData;
import flash.geom.Point;
import flash.geom.Rectangle;
import openfl.display.BitmapData;
import openfl.geom.Point;
import openfl.geom.Rectangle;
import flixel.FlxG;
import flixel.FlxSprite;
import flixel.util.FlxColor;
Expand Down
2 changes: 1 addition & 1 deletion flixel/addons/display/FlxNestedSprite.hx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flixel.addons.display;

import flash.geom.ColorTransform;
import openfl.geom.ColorTransform;
import flixel.FlxBasic;
import flixel.FlxG;
import flixel.FlxSprite;
Expand Down
Loading

0 comments on commit 6df925b

Please sign in to comment.