update to latest upstream flixel + flixel-addon + flxanimate
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
"name": "flixel",
|
||||
"type": "git",
|
||||
"dir": null,
|
||||
"ref": "e0e481ca9c147ddaf3c18dd0e560d0bfc038790b",
|
||||
"ref": "21caee3a4fdbe5a73d74fd7c45d4b35834618998",
|
||||
"url": "https://github.com/FunkinCrew/flixel"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -705,7 +705,7 @@ class Controls extends FlxActionSet
|
||||
forEachBound(control, function(action, state) addKeys(action, keys, state));
|
||||
}
|
||||
|
||||
public function bindSwipe(control:Control, swipeDir:Int = FlxDirectionFlags.UP, ?swpLength:Float = 90)
|
||||
public function bindSwipe(control:Control, swipeDir:FlxDirectionFlags = FlxDirectionFlags.UP, ?swpLength:Float = 90)
|
||||
{
|
||||
forEachBound(control, function(action, press) action.add(new FlxActionInputDigitalMobileSwipeGameplay(swipeDir, press, swpLength)));
|
||||
}
|
||||
@@ -1443,9 +1443,9 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
|
||||
var activateLength:Float = 90;
|
||||
var hapticPressure:Int = 100;
|
||||
|
||||
public function new(swipeDir:Int = FlxDirectionFlags.ANY, Trigger:FlxInputState, ?swipeLength:Float = 90)
|
||||
public function new(swipeDir:FlxDirectionFlags = FlxDirectionFlags.ANY, Trigger:FlxInputState, ?swipeLength:Float = 90)
|
||||
{
|
||||
super(OTHER, swipeDir, Trigger);
|
||||
super(OTHER, swipeDir.toInt(), Trigger);
|
||||
|
||||
activateLength = swipeLength;
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ import flixel.util.FlxDestroyUtil;
|
||||
import funkin.graphics.adobeanimate.FlxAtlasSprite;
|
||||
import funkin.modding.events.ScriptEvent;
|
||||
import funkin.play.character.CharacterData.CharacterRenderType;
|
||||
import flixel.util.FlxDirectionFlags;
|
||||
import openfl.display.BitmapData;
|
||||
import openfl.display.BlendMode;
|
||||
|
||||
@@ -389,7 +390,7 @@ class AnimateAtlasCharacter extends BaseCharacter
|
||||
inline function directAlphaTransform(sprite:FlxSprite, alpha:Float):Void
|
||||
sprite.alpha = alpha; // direct set
|
||||
|
||||
inline function facingTransform(sprite:FlxSprite, facing:Int):Void
|
||||
inline function facingTransform(sprite:FlxSprite, facing:FlxDirectionFlags):Void
|
||||
sprite.facing = facing;
|
||||
|
||||
inline function flipXTransform(sprite:FlxSprite, flipX:Bool):Void
|
||||
@@ -588,7 +589,7 @@ class AnimateAtlasCharacter extends BaseCharacter
|
||||
return alpha = value;
|
||||
}
|
||||
|
||||
override function set_facing(value:Int):Int
|
||||
override function set_facing(value:FlxDirectionFlags):FlxDirectionFlags
|
||||
{
|
||||
if (exists && facing != value) transformChildren(facingTransform, value);
|
||||
return facing = value;
|
||||
|
||||
Reference in New Issue
Block a user