diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 430cfc9b9..897b9b3c9 100644
--- 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
index b58c1da19..d312c2cfa 100644
--- a/Arcade/Breakout/Project.xml
+++ b/Arcade/Breakout/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/Arcade/Flappybalt/Project.xml b/Arcade/Flappybalt/Project.xml
index 72e230c6e..f9a300141 100644
--- a/Arcade/Flappybalt/Project.xml
+++ b/Arcade/Flappybalt/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Arcade/FlxInvaders/Project.xml b/Arcade/FlxInvaders/Project.xml
index 6c4cd454d..04b8a0689 100644
--- a/Arcade/FlxInvaders/Project.xml
+++ b/Arcade/FlxInvaders/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Arcade/FlxLightPuzzle/Project.xml b/Arcade/FlxLightPuzzle/Project.xml
index 6c60a4730..83a5d5405 100644
--- a/Arcade/FlxLightPuzzle/Project.xml
+++ b/Arcade/FlxLightPuzzle/Project.xml
@@ -51,6 +51,9 @@
+
+
+
diff --git a/Arcade/FlxLightPuzzle/source/PlayState.hx b/Arcade/FlxLightPuzzle/source/PlayState.hx
index e0b4a7f9a..c40efc6fa 100644
--- 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
index 98f6cf3ff..7d6b9184b 100644
--- a/Arcade/FlxPongApi/Project.xml
+++ b/Arcade/FlxPongApi/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/Arcade/FlxSnake/Project.xml b/Arcade/FlxSnake/Project.xml
index d244f19f4..7deb9ea0b 100644
--- a/Arcade/FlxSnake/Project.xml
+++ b/Arcade/FlxSnake/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Arcade/FlxSnake/source/PlayState.hx b/Arcade/FlxSnake/source/PlayState.hx
index 5501b73c8..318aca938 100644
--- 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
index 90533468f..1ec83f7ff 100644
--- a/Arcade/FlxTeroids/Project.xml
+++ b/Arcade/FlxTeroids/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Arcade/MinimalistTD/Project.xml b/Arcade/MinimalistTD/Project.xml
index 55c5ebe48..b04c92747 100644
--- a/Arcade/MinimalistTD/Project.xml
+++ b/Arcade/MinimalistTD/Project.xml
@@ -47,7 +47,7 @@
-
+
diff --git a/Editors/FlxPexParser/Project.xml b/Editors/FlxPexParser/Project.xml
index 9d8f0aba3..704cfd513 100644
--- a/Editors/FlxPexParser/Project.xml
+++ b/Editors/FlxPexParser/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Editors/FlxSpine/Project.xml b/Editors/FlxSpine/Project.xml
index de821c0da..2993a3d74 100644
--- a/Editors/FlxSpine/Project.xml
+++ b/Editors/FlxSpine/Project.xml
@@ -50,6 +50,9 @@
+
+
+
diff --git a/Editors/TexturePackerAtlas/Project.xml b/Editors/TexturePackerAtlas/Project.xml
index fa8f23dd9..a2a11fa3a 100644
--- a/Editors/TexturePackerAtlas/Project.xml
+++ b/Editors/TexturePackerAtlas/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Editors/TiledEditor/Project.xml b/Editors/TiledEditor/Project.xml
index 63a4acd7d..94d60b1db 100644
--- a/Editors/TiledEditor/Project.xml
+++ b/Editors/TiledEditor/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Effects/BlendModeShaders/Project.xml b/Effects/BlendModeShaders/Project.xml
index 44c726a9c..366008d90 100644
--- a/Effects/BlendModeShaders/Project.xml
+++ b/Effects/BlendModeShaders/Project.xml
@@ -50,6 +50,9 @@
+
+
+
diff --git a/Effects/BlendModes/Project.xml b/Effects/BlendModes/Project.xml
index d4d98c6d2..68618abef 100644
--- a/Effects/BlendModes/Project.xml
+++ b/Effects/BlendModes/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Effects/DynamicShadows/Project.xml b/Effects/DynamicShadows/Project.xml
index 84bd6fd1c..60be04ecb 100644
--- a/Effects/DynamicShadows/Project.xml
+++ b/Effects/DynamicShadows/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Effects/Filters/Project.xml b/Effects/Filters/Project.xml
index 73c798772..16e4f22e8 100644
--- a/Effects/Filters/Project.xml
+++ b/Effects/Filters/Project.xml
@@ -55,6 +55,9 @@
+
+
+
diff --git a/Effects/FloodFill/Project.xml b/Effects/FloodFill/Project.xml
index 90a771e39..39b3a047f 100644
--- a/Effects/FloodFill/Project.xml
+++ b/Effects/FloodFill/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Effects/FlxBloom/Project.xml b/Effects/FlxBloom/Project.xml
index c656e1d8c..d1bf643b6 100644
--- a/Effects/FlxBloom/Project.xml
+++ b/Effects/FlxBloom/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/Effects/FlxBlur/Project.xml b/Effects/FlxBlur/Project.xml
index 9ce52f179..68552f0e5 100644
--- a/Effects/FlxBlur/Project.xml
+++ b/Effects/FlxBlur/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/Effects/FlxClothSprite/Project.xml b/Effects/FlxClothSprite/Project.xml
index 6ba93bc27..1485878ee 100644
--- a/Effects/FlxClothSprite/Project.xml
+++ b/Effects/FlxClothSprite/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Effects/FlxEffectSprite/Project.xml b/Effects/FlxEffectSprite/Project.xml
index 5b95bf0f8..4960ffc6b 100644
--- a/Effects/FlxEffectSprite/Project.xml
+++ b/Effects/FlxEffectSprite/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Effects/FlxFloodFill/Project.xml b/Effects/FlxFloodFill/Project.xml
index 502440b99..a873b3c12 100644
--- a/Effects/FlxFloodFill/Project.xml
+++ b/Effects/FlxFloodFill/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Effects/FlxSimplex/Project.xml b/Effects/FlxSimplex/Project.xml
index 738ad65fd..76d9b96dd 100644
--- a/Effects/FlxSimplex/Project.xml
+++ b/Effects/FlxSimplex/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/Effects/FlxSkewedSprite/Project.xml b/Effects/FlxSkewedSprite/Project.xml
index 65cc46eca..1a4d5d27e 100644
--- a/Effects/FlxSkewedSprite/Project.xml
+++ b/Effects/FlxSkewedSprite/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Effects/FlxSpriteFilters/project.xml b/Effects/FlxSpriteFilters/project.xml
index 2687ca080..c277e5247 100644
--- a/Effects/FlxSpriteFilters/project.xml
+++ b/Effects/FlxSpriteFilters/project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Effects/FlxTrailArea/Project.xml b/Effects/FlxTrailArea/Project.xml
index bce97c70e..34059a122 100644
--- a/Effects/FlxTrailArea/Project.xml
+++ b/Effects/FlxTrailArea/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/Effects/FlxTween/Project.xml b/Effects/FlxTween/Project.xml
index 5127b3d79..a97873842 100644
--- a/Effects/FlxTween/Project.xml
+++ b/Effects/FlxTween/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Effects/MosaicEffect/Project.xml b/Effects/MosaicEffect/Project.xml
index b740d069d..a05e339ba 100644
--- a/Effects/MosaicEffect/Project.xml
+++ b/Effects/MosaicEffect/Project.xml
@@ -53,6 +53,9 @@
+
+
+
diff --git a/Effects/Parallax/Project.xml b/Effects/Parallax/Project.xml
index 7fb7fc34a..f6cc56bee 100644
--- a/Effects/Parallax/Project.xml
+++ b/Effects/Parallax/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Effects/Transitions/Project.xml b/Effects/Transitions/Project.xml
index 860e6a8bc..f9c694007 100644
--- a/Effects/Transitions/Project.xml
+++ b/Effects/Transitions/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/CollisionAndGrouping/Project.xml b/Features/CollisionAndGrouping/Project.xml
index e6505bed6..46e801809 100644
--- a/Features/CollisionAndGrouping/Project.xml
+++ b/Features/CollisionAndGrouping/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/Colors/Project.xml b/Features/Colors/Project.xml
index 976011d70..69e03ce35 100644
--- a/Features/Colors/Project.xml
+++ b/Features/Colors/Project.xml
@@ -51,6 +51,9 @@
+
+
+
diff --git a/Features/FlxCamera/project.xml b/Features/FlxCamera/project.xml
index db0a86cb4..34c63ba7a 100644
--- a/Features/FlxCamera/project.xml
+++ b/Features/FlxCamera/project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/FlxFSM/Project.xml b/Features/FlxFSM/Project.xml
index b5c69c6ab..eaf5c4c57 100644
--- a/Features/FlxFSM/Project.xml
+++ b/Features/FlxFSM/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/FlxNape/project.xml b/Features/FlxNape/project.xml
index 117b293bf..e2ea713d6 100644
--- a/Features/FlxNape/project.xml
+++ b/Features/FlxNape/project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/FlxNape/source/states/Blob.hx b/Features/FlxNape/source/states/Blob.hx
index d4d258e00..2b70c5658 100644
--- 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;
diff --git a/Features/FlxNapeTerrain/Project.xml b/Features/FlxNapeTerrain/Project.xml
index 902717c8a..60b2c2066 100644
--- a/Features/FlxNapeTerrain/Project.xml
+++ b/Features/FlxNapeTerrain/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/FlxNapeTilemap/Project.xml b/Features/FlxNapeTilemap/Project.xml
index 4fc28f9a6..b15aa3ba0 100644
--- a/Features/FlxNapeTilemap/Project.xml
+++ b/Features/FlxNapeTilemap/Project.xml
@@ -40,4 +40,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Features/FlxPieDial/Project.xml b/Features/FlxPieDial/Project.xml
index 0ea2b3348..350b66aa5 100644
--- a/Features/FlxPieDial/Project.xml
+++ b/Features/FlxPieDial/Project.xml
@@ -46,6 +46,9 @@
+
+
+
diff --git a/Features/FlxScene/Project.xml b/Features/FlxScene/Project.xml
index ec9a92a37..daf90df01 100644
--- a/Features/FlxScene/Project.xml
+++ b/Features/FlxScene/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/FlxShape/Project.xml b/Features/FlxShape/Project.xml
index 835893628..2df645b12 100644
--- a/Features/FlxShape/Project.xml
+++ b/Features/FlxShape/Project.xml
@@ -46,6 +46,9 @@
+
+
+
diff --git a/Features/FlxSound/Project.xml b/Features/FlxSound/Project.xml
index 48afb2611..f4e71fc51 100644
--- a/Features/FlxSound/Project.xml
+++ b/Features/FlxSound/Project.xml
@@ -50,6 +50,9 @@
+
+
+
diff --git a/Features/FlxSubState/Project.xml b/Features/FlxSubState/Project.xml
index 97ec0d819..fc803ef3f 100644
--- a/Features/FlxSubState/Project.xml
+++ b/Features/FlxSubState/Project.xml
@@ -46,6 +46,9 @@
+
+
+
diff --git a/Features/HeatmapPathfinding/Project.xml b/Features/HeatmapPathfinding/Project.xml
index f3d80dee0..781df6cb2 100644
--- a/Features/HeatmapPathfinding/Project.xml
+++ b/Features/HeatmapPathfinding/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/Particles/Project.xml b/Features/Particles/Project.xml
index d3ba6f319..987349118 100644
--- a/Features/Particles/Project.xml
+++ b/Features/Particles/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/Features/Pathfinding/Project.xml b/Features/Pathfinding/Project.xml
index dda821f23..90df051ba 100644
--- a/Features/Pathfinding/Project.xml
+++ b/Features/Pathfinding/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/Replay/Project.xml b/Features/Replay/Project.xml
index 32ccd2433..753f41613 100644
--- a/Features/Replay/Project.xml
+++ b/Features/Replay/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/Replay/source/PlayState.hx b/Features/Replay/source/PlayState.hx
index 048ad286b..e3840279f 100644
--- a/Features/Replay/source/PlayState.hx
+++ b/Features/Replay/source/PlayState.hx
@@ -116,8 +116,8 @@ class PlayState extends FlxState
{
_cursor.scale.set(2, 2);
}
- _cursor.x = FlxG.mouse.screenX;
- _cursor.y = FlxG.mouse.screenY;
+ _cursor.x = FlxG.mouse.viewX;
+ _cursor.y = FlxG.mouse.viewY;
super.update(elapsed);
}
diff --git a/Features/Save/Project.xml b/Features/Save/Project.xml
index c679ff195..b940fc5ab 100644
--- a/Features/Save/Project.xml
+++ b/Features/Save/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/Features/ScaleModes/Project.xml b/Features/ScaleModes/Project.xml
index 2a78208f6..86f54fdee 100644
--- a/Features/ScaleModes/Project.xml
+++ b/Features/ScaleModes/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/SetTileProperties/Project.xml b/Features/SetTileProperties/Project.xml
index 4b6ca5b2a..b60476ab2 100644
--- a/Features/SetTileProperties/Project.xml
+++ b/Features/SetTileProperties/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/SplitScreen/Project.xml b/Features/SplitScreen/Project.xml
index ef73babad..cd9d89640 100644
--- a/Features/SplitScreen/Project.xml
+++ b/Features/SplitScreen/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Features/Tilemap/Project.xml b/Features/Tilemap/Project.xml
index 545fd0288..4594bfb04 100644
--- a/Features/Tilemap/Project.xml
+++ b/Features/Tilemap/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Graphics/FlxAsepriteUtil/Project.xml b/Graphics/FlxAsepriteUtil/Project.xml
index 899da9cf4..8883f03ba 100644
--- a/Graphics/FlxAsepriteUtil/Project.xml
+++ b/Graphics/FlxAsepriteUtil/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Graphics/FlxAsepriteUtil/source/PlayState.hx b/Graphics/FlxAsepriteUtil/source/PlayState.hx
index 409621e78..d784b2ec5 100644
--- a/Graphics/FlxAsepriteUtil/source/PlayState.hx
+++ b/Graphics/FlxAsepriteUtil/source/PlayState.hx
@@ -1,11 +1,11 @@
package;
-import flixel.math.FlxMath;
import flixel.FlxG;
import flixel.FlxSprite;
import flixel.FlxState;
import flixel.animation.FlxAnimation;
import flixel.graphics.FlxAsepriteUtil;
+import flixel.math.FlxMath;
import flixel.text.FlxText;
import flixel.ui.FlxButton;
@@ -16,78 +16,77 @@ class PlayState extends FlxState
{
static inline var POINTER_VERTICAL_OFFSET = 3;
static inline var ANIM_NAME_LINE_SPACING = 10;
-
+
var loadTitle:FlxText;
var loadedAnimations:FlxText;
var animList:Array;
var currentAnimationLabel:FlxText;
var player:FlxSprite;
-
+
var curAnimIndex = 0;
var pointer:FlxSprite;
-
+
var nextButton:FlxButton;
var previousButton:FlxButton;
-
+
override public function create():Void
{
player = new FlxSprite();
add(player);
-
+
loadTitle = new FlxText();
add(loadTitle);
-
+
loadedAnimations = new FlxText(20);
add(loadedAnimations);
-
+
pointer = new FlxSprite("assets/pointer.png");
add(pointer);
-
+
currentAnimationLabel = new FlxText(0, 0, 0, player.animation.name);
currentAnimationLabel.alignment = CENTER;
currentAnimationLabel.y = FlxG.height - currentAnimationLabel.height;
add(currentAnimationLabel);
-
- previousButton = new FlxButton(0, 0, "Previous", () -> {
- setPlayerAnim(curAnimIndex-1);
- });
+
+ previousButton = new FlxButton(0, 0, "Previous", () -> setPlayerAnim(curAnimIndex - 1));
previousButton.setPosition(0, FlxG.height - previousButton.height);
add(previousButton);
-
- nextButton = new FlxButton(0, 0, "Next", () -> {
- setPlayerAnim(curAnimIndex+1);
- });
+
+ nextButton = new FlxButton(0, 0, "Next", () -> setPlayerAnim(curAnimIndex + 1));
nextButton.setPosition(FlxG.width - nextButton.width, FlxG.height - nextButton.height);
add(nextButton);
-
+
loadAnims();
}
-
- function loadAnims() {
+
+ function loadAnims()
+ {
loadTitle.text = "Anims by Index";
FlxAsepriteUtil.loadAseAtlasAndTagsByIndex(player, "assets/player.png", "assets/player.json");
// Can also call FlxAsepriteUtil.loadAseAtlasAndTagsByPrefix(player, "assets/player.png", "assets/player.json");
-
+
player.screenCenter();
-
+
animList = player.animation.getAnimationList();
-
- loadedAnimations.text = animList.map((a) -> { a.name; }).join("\n");
+
+ loadedAnimations.text = animList.map((a) -> a.name).join("\n");
loadedAnimations.screenCenter(Y);
-
+
setPlayerAnim(0);
}
-
- function setPlayerAnim(index:Int) {
+
+ function setPlayerAnim(index:Int)
+ {
curAnimIndex = FlxMath.wrap(index, 0, animList.length - 1);
player.animation.play(animList[curAnimIndex].name);
-
+
pointer.setPosition(0, POINTER_VERTICAL_OFFSET + loadedAnimations.y + ANIM_NAME_LINE_SPACING * curAnimIndex);
}
-
- override function update(elapsed:Float) {
+
+ override function update(elapsed:Float)
+ {
super.update(elapsed);
-
+
currentAnimationLabel.text = 'Current Animation: ${player.animation.name}';
currentAnimationLabel.screenCenter(X);
}
diff --git a/Input/FlxAccelerometer/Project.xml b/Input/FlxAccelerometer/Project.xml
index 69e650ed5..2dbc9d008 100644
--- a/Input/FlxAccelerometer/Project.xml
+++ b/Input/FlxAccelerometer/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/Input/FlxAction/Project.xml b/Input/FlxAction/Project.xml
index 550fef931..daa007808 100644
--- a/Input/FlxAction/Project.xml
+++ b/Input/FlxAction/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Input/FlxMouseEvent/Project.xml b/Input/FlxMouseEvent/Project.xml
index 43a295109..d35124dc8 100644
--- a/Input/FlxMouseEvent/Project.xml
+++ b/Input/FlxMouseEvent/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Input/GamepadTest/Project.xml b/Input/GamepadTest/Project.xml
index 002054ede..79ada773b 100644
--- a/Input/GamepadTest/Project.xml
+++ b/Input/GamepadTest/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Input/GridMovement/Project.xml b/Input/GridMovement/Project.xml
index d49c5d36d..bb4487b7b 100644
--- a/Input/GridMovement/Project.xml
+++ b/Input/GridMovement/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Input/Multitouch/Project.xml b/Input/Multitouch/Project.xml
index 3a7a0f8cf..be5483aac 100644
--- a/Input/Multitouch/Project.xml
+++ b/Input/Multitouch/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/Other/BSPMapGen/Project.xml b/Other/BSPMapGen/Project.xml
index c96544c9e..4098e2780 100644
--- a/Other/BSPMapGen/Project.xml
+++ b/Other/BSPMapGen/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Other/Calculator/Project.xml b/Other/Calculator/Project.xml
index c67018491..b75f56891 100644
--- a/Other/Calculator/Project.xml
+++ b/Other/Calculator/Project.xml
@@ -20,6 +20,9 @@
+
+
+
diff --git a/Other/FlxAsyncLoop/Project.xml b/Other/FlxAsyncLoop/Project.xml
index 53a1f9107..6453c7623 100644
--- a/Other/FlxAsyncLoop/Project.xml
+++ b/Other/FlxAsyncLoop/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/Other/FlxAtlas/Project.xml b/Other/FlxAtlas/Project.xml
index 3adf876c2..caae97227 100644
--- a/Other/FlxAtlas/Project.xml
+++ b/Other/FlxAtlas/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Other/FlxCollisions/Project.xml b/Other/FlxCollisions/Project.xml
index f66a58109..432618297 100644
--- a/Other/FlxCollisions/Project.xml
+++ b/Other/FlxCollisions/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Other/FrameCollections/Project.xml b/Other/FrameCollections/Project.xml
index c2e3aadbe..4072032fc 100644
--- a/Other/FrameCollections/Project.xml
+++ b/Other/FrameCollections/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Other/FlxGameOfLife/Project.xml b/Other/SubFolder/FlxGameOfLife/Project.xml
similarity index 97%
rename from Other/FlxGameOfLife/Project.xml
rename to Other/SubFolder/FlxGameOfLife/Project.xml
index 0a1618c73..c5edb8872 100644
--- a/Other/FlxGameOfLife/Project.xml
+++ b/Other/SubFolder/FlxGameOfLife/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Other/FlxGameOfLife/source/Main.hx b/Other/SubFolder/FlxGameOfLife/source/Main.hx
similarity index 100%
rename from Other/FlxGameOfLife/source/Main.hx
rename to Other/SubFolder/FlxGameOfLife/source/Main.hx
diff --git a/Other/FlxGameOfLife/source/PlayState.hx b/Other/SubFolder/FlxGameOfLife/source/PlayState.hx
similarity index 100%
rename from Other/FlxGameOfLife/source/PlayState.hx
rename to Other/SubFolder/FlxGameOfLife/source/PlayState.hx
diff --git a/Performance/FlxBunnyMark/Project.xml b/Performance/FlxBunnyMark/Project.xml
index bed242021..697cefae6 100644
--- a/Performance/FlxBunnyMark/Project.xml
+++ b/Performance/FlxBunnyMark/Project.xml
@@ -50,6 +50,9 @@
+
+
+
diff --git a/Performance/FlxRandom/Project.xml b/Performance/FlxRandom/Project.xml
index d0750b63e..3574aa867 100644
--- a/Performance/FlxRandom/Project.xml
+++ b/Performance/FlxRandom/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Performance/PixelPerfectCollision/Project.xml b/Performance/PixelPerfectCollision/Project.xml
index 0b3c1918f..77e5e1174 100644
--- a/Performance/PixelPerfectCollision/Project.xml
+++ b/Performance/PixelPerfectCollision/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Platformers/EZPlatformer/Project.xml b/Platformers/EZPlatformer/Project.xml
index e149b72e3..2e6c39403 100644
--- a/Platformers/EZPlatformer/Project.xml
+++ b/Platformers/EZPlatformer/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Platformers/FlipRotationAnimationTiles/Project.xml b/Platformers/FlipRotationAnimationTiles/Project.xml
index 75591efd5..14e31f41d 100644
--- a/Platformers/FlipRotationAnimationTiles/Project.xml
+++ b/Platformers/FlipRotationAnimationTiles/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Platformers/FlxCaveGenerator/Project.xml b/Platformers/FlxCaveGenerator/Project.xml
index cda3e0536..7068b2dcf 100644
--- a/Platformers/FlxCaveGenerator/Project.xml
+++ b/Platformers/FlxCaveGenerator/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Platformers/FlxTilemapExt/Project.xml b/Platformers/FlxTilemapExt/Project.xml
index 37b6edf42..bb0846e63 100644
--- a/Platformers/FlxTilemapExt/Project.xml
+++ b/Platformers/FlxTilemapExt/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Platformers/Mode/Project.xml b/Platformers/Mode/Project.xml
index 5d47e3cde..0483dfd4c 100644
--- a/Platformers/Mode/Project.xml
+++ b/Platformers/Mode/Project.xml
@@ -47,6 +47,9 @@
+
+
+
@@ -71,9 +74,6 @@
-
-
-
diff --git a/Platformers/Mode/source/AssetPaths.hx b/Platformers/Mode/source/AssetPaths.hx
index db7ef4445..e31032f88 100644
--- a/Platformers/Mode/source/AssetPaths.hx
+++ b/Platformers/Mode/source/AssetPaths.hx
@@ -1,4 +1,21 @@
package;
-@:build(flixel.system.FlxAssets.buildFileReferences("assets", true))
-class AssetPaths {}
+@:build(flixel.system.FlxAssets.buildFileReferences("assets", true, null, "*.mp3|*.ogg"))
+class AssetPaths
+{
+ public static final sounds = SoundPaths;
+}
+
+// remove extension of sounds
+@:build(flixel.system.FlxAssets.buildFileReferences("assets/sounds", true, #if web "*.mp3" #else "*.ogg" #end, null,
+ function (name)
+ {
+ return name.toLowerCase()
+ .split("assets/sounds/").join("")
+ .split("/").join("_")
+ .split("-").join("_")
+ .split(" ").join("_")
+ .split(".")[0];
+ }
+))
+class SoundPaths {}
diff --git a/Platformers/Mode/source/Bullet.hx b/Platformers/Mode/source/Bullet.hx
index 923f10d51..ecce0e2df 100644
--- a/Platformers/Mode/source/Bullet.hx
+++ b/Platformers/Mode/source/Bullet.hx
@@ -50,7 +50,7 @@ class Bullet extends FlxSprite
velocity.set(0, 0);
if (isOnScreen())
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/jump"));
+ FlxG.sound.play(AssetPaths.sounds.jump);
alive = false;
solid = false;
@@ -59,7 +59,7 @@ class Bullet extends FlxSprite
public function shoot(Location:FlxPoint, Aim:FlxDirection):Void
{
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/shoot"));
+ FlxG.sound.play(AssetPaths.sounds.shoot);
super.reset(Location.x - width / 2, Location.y - height / 2);
diff --git a/Platformers/Mode/source/Enemy.hx b/Platformers/Mode/source/Enemy.hx
index d7caffb5f..1f560e5f4 100644
--- a/Platformers/Mode/source/Enemy.hx
+++ b/Platformers/Mode/source/Enemy.hx
@@ -205,7 +205,7 @@ class Enemy extends FlxSprite implements IHurt
_jets.start(false, 0.01);
if (isOnScreen())
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/jet"));
+ FlxG.sound.play(AssetPaths.sounds.jet);
}
// Then, position the jets at the center of the Enemy,
// and point the jets the opposite way from where we're moving.
@@ -242,7 +242,7 @@ class Enemy extends FlxSprite implements IHurt
*/
public function hurt(damage:Int = 1):Void
{
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/hit"));
+ FlxG.sound.play(AssetPaths.sounds.hit);
FlxSpriteUtil.flicker(this, 0.2, 0.02, true);
Reg.score += 10;
@@ -260,7 +260,7 @@ class Enemy extends FlxSprite implements IHurt
if (!alive)
return;
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/asplode"));
+ FlxG.sound.play(AssetPaths.sounds.asplode);
super.kill();
diff --git a/Platformers/Mode/source/EnemyBullet.hx b/Platformers/Mode/source/EnemyBullet.hx
index 2d1cf67e1..c4099d86b 100644
--- a/Platformers/Mode/source/EnemyBullet.hx
+++ b/Platformers/Mode/source/EnemyBullet.hx
@@ -40,7 +40,7 @@ class EnemyBullet extends FlxSprite
velocity.set();
if (isOnScreen())
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/jump"));
+ FlxG.sound.play(AssetPaths.sounds.jump);
alive = false;
solid = false;
@@ -49,7 +49,7 @@ class EnemyBullet extends FlxSprite
public function shoot(Location:FlxPoint, angle:Float):Void
{
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/enemy"), 0.5);
+ FlxG.sound.play(AssetPaths.sounds.enemy, 0.5);
super.reset(Location.x - width / 2, Location.y - height / 2);
velocity.setPolarDegrees(speed, angle);
diff --git a/Platformers/Mode/source/MenuState.hx b/Platformers/Mode/source/MenuState.hx
index f407801c8..3aad539f2 100644
--- a/Platformers/Mode/source/MenuState.hx
+++ b/Platformers/Mode/source/MenuState.hx
@@ -112,7 +112,7 @@ class MenuState extends FlxState
_title2.velocity.x = 0;
// Then, play a cool sound, change their color, and blow up pieces everywhere
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/menu_hit"));
+ FlxG.sound.play(AssetPaths.sounds.menu_hit);
FlxG.cameras.flash(0xffd8eba2, 0.5);
FlxG.cameras.shake(0.035, 0.5);
@@ -163,7 +163,7 @@ class MenuState extends FlxState
if ((FlxG.keys.pressed.X && FlxG.keys.pressed.C) || _demoMode)
{
_fading = true;
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/menu_hit_2"));
+ FlxG.sound.play(AssetPaths.sounds.menu_hit_2);
FlxG.cameras.flash(0xffd8eba2, 0.5);
FlxG.cameras.fade(0xff131c1b, 1, false, onFade);
@@ -186,7 +186,7 @@ class MenuState extends FlxState
function onPlay()
{
onFade();
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/menu_hit_2"));
+ FlxG.sound.play(AssetPaths.sounds.menu_hit_2);
}
/**
diff --git a/Platformers/Mode/source/PlayState.hx b/Platformers/Mode/source/PlayState.hx
index d6bdad421..ac10d64b3 100644
--- a/Platformers/Mode/source/PlayState.hx
+++ b/Platformers/Mode/source/PlayState.hx
@@ -175,7 +175,7 @@ class PlayState extends FlxState
s.cameras = [FlxG.camera];
});
- FlxG.sound.playMusic(FlxAssets.getSound("assets/sounds/mode"));
+ FlxG.sound.playMusic(AssetPaths.sounds.mode);
FlxG.cameras.flash(0xff131c1b);
_fading = false;
@@ -311,7 +311,7 @@ class PlayState extends FlxState
volume = 1.0;
}
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/countdown"), volume);
+ FlxG.sound.play(AssetPaths.sounds.countdown, volume);
}
}
diff --git a/Platformers/Mode/source/Player.hx b/Platformers/Mode/source/Player.hx
index 39b9daea3..d30633f0f 100644
--- a/Platformers/Mode/source/Player.hx
+++ b/Platformers/Mode/source/Player.hx
@@ -173,7 +173,7 @@ class Player extends FlxSprite implements IHurt
if (flickering)
return;
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/hurt"));
+ FlxG.sound.play(AssetPaths.sounds.hurt);
flicker(1.3);
@@ -201,8 +201,8 @@ class Player extends FlxSprite implements IHurt
return;
solid = false;
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/asplode"));
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/menu_hit_2"));
+ FlxG.sound.play(AssetPaths.sounds.asplode);
+ FlxG.sound.play(AssetPaths.sounds.menu_hit_2);
super.kill();
@@ -254,7 +254,7 @@ class Player extends FlxSprite implements IHurt
if (isReadyToJump && (velocity.y == 0))
{
velocity.y = -_jumpPower;
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/jump"));
+ FlxG.sound.play(AssetPaths.sounds.jump);
}
}
@@ -266,7 +266,7 @@ class Player extends FlxSprite implements IHurt
if (flickering)
{
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/jam"));
+ FlxG.sound.play(AssetPaths.sounds.jam);
}
else
{
diff --git a/Platformers/Mode/source/Spawner.hx b/Platformers/Mode/source/Spawner.hx
index e8ffc8d40..046ed836f 100644
--- a/Platformers/Mode/source/Spawner.hx
+++ b/Platformers/Mode/source/Spawner.hx
@@ -81,7 +81,7 @@ class Spawner extends FlxSprite implements IHurt
public function hurt(damage:Int = 1):Void
{
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/hit"));
+ FlxG.sound.play(AssetPaths.sounds.hit);
FlxSpriteUtil.flicker(this, 0.2, 0.02, true);
Reg.score += 50;
@@ -97,8 +97,8 @@ class Spawner extends FlxSprite implements IHurt
return;
}
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/asplode"));
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/menu_hit_2"));
+ FlxG.sound.play(AssetPaths.sounds.asplode);
+ FlxG.sound.play(AssetPaths.sounds.menu_hit_2);
super.kill();
diff --git a/Platformers/Mode/source/VictoryState.hx b/Platformers/Mode/source/VictoryState.hx
index b68ad0c67..c5b3c10a6 100644
--- a/Platformers/Mode/source/VictoryState.hx
+++ b/Platformers/Mode/source/VictoryState.hx
@@ -51,7 +51,7 @@ class VictoryState extends FlxState
if (_timer > 0.35 && (_timer > 10 #if FLX_KEYBOARD || FlxG.keys.anyJustPressed([X, C]) #end))
{
_fading = true;
- FlxG.sound.play(FlxAssets.getSound("assets/sounds/menu_hit_2"));
+ FlxG.sound.play(AssetPaths.sounds.menu_hit_2);
FlxG.cameras.fade(0xff131c1b, 2, false, function()
{
FlxG.switchState(PlayState.new);
diff --git a/Platformers/Revenge/Project.xml b/Platformers/Revenge/Project.xml
index 381fa944f..06463f561 100644
--- a/Platformers/Revenge/Project.xml
+++ b/Platformers/Revenge/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/Tutorials/TurnBasedRPG/Project.xml b/Tutorials/TurnBasedRPG/Project.xml
index 1eb8e8d59..9bcfd88e6 100644
--- a/Tutorials/TurnBasedRPG/Project.xml
+++ b/Tutorials/TurnBasedRPG/Project.xml
@@ -49,6 +49,9 @@
+
+
+
diff --git a/UserInterface/Cursor/Project.xml b/UserInterface/Cursor/Project.xml
index 1d3fcbfc8..286e95770 100644
--- a/UserInterface/Cursor/Project.xml
+++ b/UserInterface/Cursor/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/UserInterface/FileBrowse/Project.xml b/UserInterface/FileBrowse/Project.xml
index 8cdef6d18..ae8a939fb 100644
--- a/UserInterface/FileBrowse/Project.xml
+++ b/UserInterface/FileBrowse/Project.xml
@@ -48,6 +48,9 @@
+
+
+
diff --git a/UserInterface/FlxBitmapText/Project.xml b/UserInterface/FlxBitmapText/Project.xml
index 86157e73e..cd7fa9a85 100644
--- a/UserInterface/FlxBitmapText/Project.xml
+++ b/UserInterface/FlxBitmapText/Project.xml
@@ -42,6 +42,9 @@
+
+
+
diff --git a/UserInterface/FlxTextFormat/Project.xml b/UserInterface/FlxTextFormat/Project.xml
index 72f25f3bd..859500e91 100644
--- a/UserInterface/FlxTextFormat/Project.xml
+++ b/UserInterface/FlxTextFormat/Project.xml
@@ -47,6 +47,9 @@
+
+
+
diff --git a/UserInterface/FlxTypeText/Project.xml b/UserInterface/FlxTypeText/Project.xml
index 46e9bbe6b..58a4c9d99 100644
--- a/UserInterface/FlxTypeText/Project.xml
+++ b/UserInterface/FlxTypeText/Project.xml
@@ -49,6 +49,9 @@
+
+
+
diff --git a/UserInterface/FlxTypeText/source/MenuState.hx b/UserInterface/FlxTypeText/source/MenuState.hx
index 6c89034b5..727bdc5ed 100644
--- a/UserInterface/FlxTypeText/source/MenuState.hx
+++ b/UserInterface/FlxTypeText/source/MenuState.hx
@@ -44,8 +44,13 @@ class MenuState extends FlxState
_typeText.color = 0x8811EE11;
_typeText.skipKeys = ["SPACE"];
_typeText.sounds = [
- FlxG.sound.load(FlxAssets.getSound("assets/type01")),
- FlxG.sound.load(FlxAssets.getSound("assets/type02"))
+ #if flash
+ FlxG.sound.load("assets/type01.mp3"),
+ FlxG.sound.load("assets/type02.mp3")
+ #else
+ FlxG.sound.load("assets/type01.ogg"),
+ FlxG.sound.load("assets/type02.ogg")
+ #end
];
_status = new FlxTypeText(15, FlxG.height - 102, FlxG.width - 20, "None", 16);
diff --git a/UserInterface/RPGInterface/Project.xml b/UserInterface/RPGInterface/Project.xml
index f6a1f5925..c9680aa72 100644
--- a/UserInterface/RPGInterface/Project.xml
+++ b/UserInterface/RPGInterface/Project.xml
@@ -50,6 +50,9 @@
+
+
+
diff --git a/UserInterface/Tooltips/Project.xml b/UserInterface/Tooltips/Project.xml
index a46bb3e8a..f964c7c05 100644
--- a/UserInterface/Tooltips/Project.xml
+++ b/UserInterface/Tooltips/Project.xml
@@ -48,6 +48,9 @@
+
+
+