From fe7a3e5e5180272b2c7318beeec306b073a26435 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Sat, 16 Sep 2023 11:55:00 -0600 Subject: [PATCH] allow miscInt and miscFloat --- haxe_libraries/hollywoo.hxml | 6 +++--- haxe_libraries/kiss-flixel.hxml | 4 ++-- haxe_libraries/kiss-tools.hxml | 4 ++-- src/hollywoo_flixel/FlxMovie.hx | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/haxe_libraries/hollywoo.hxml b/haxe_libraries/hollywoo.hxml index ce46b8b..6a26032 100644 --- a/haxe_libraries/hollywoo.hxml +++ b/haxe_libraries/hollywoo.hxml @@ -1,6 +1,6 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#cfa1d1779d5b620e35c16d7a4420cd88fbcb0fba" into hollywoo/0.0.0/github/cfa1d1779d5b620e35c16d7a4420cd88fbcb0fba -# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/cfa1d1779d5b620e35c16d7a4420cd88fbcb0fba" +# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#0ce43d3ed5b05a3b15cf30867b9b4aa05405eca8" into hollywoo/0.0.0/github/0ce43d3ed5b05a3b15cf30867b9b4aa05405eca8 +# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/0ce43d3ed5b05a3b15cf30867b9b4aa05405eca8" -lib kiss -lib kiss-tools --cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/cfa1d1779d5b620e35c16d7a4420cd88fbcb0fba/src/ +-cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/0ce43d3ed5b05a3b15cf30867b9b4aa05405eca8/src/ -D hollywoo=0.0.0 \ No newline at end of file diff --git a/haxe_libraries/kiss-flixel.hxml b/haxe_libraries/kiss-flixel.hxml index 37d0f2c..6650ce1 100644 --- a/haxe_libraries/kiss-flixel.hxml +++ b/haxe_libraries/kiss-flixel.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/kiss-flixel#4399f2dfe284588c320bd8069c3553af6ea37444" into kiss-flixel/0.0.0/github/4399f2dfe284588c320bd8069c3553af6ea37444 +# @install: lix --silent download "gh://github.com/kiss-lang/kiss-flixel#be3d7afaf57e6e7b67935ea5b0b2996858d94674" into kiss-flixel/0.0.0/github/be3d7afaf57e6e7b67935ea5b0b2996858d94674 -lib flixel -lib flixel-addons -lib flixel-ui @@ -6,5 +6,5 @@ -lib kiss-tools -lib lime -lib openfl --cp ${HAXE_LIBCACHE}/kiss-flixel/0.0.0/github/4399f2dfe284588c320bd8069c3553af6ea37444/src/ +-cp ${HAXE_LIBCACHE}/kiss-flixel/0.0.0/github/be3d7afaf57e6e7b67935ea5b0b2996858d94674/src/ -D kiss-flixel=0.0.0 \ No newline at end of file diff --git a/haxe_libraries/kiss-tools.hxml b/haxe_libraries/kiss-tools.hxml index bf7c124..676560b 100644 --- a/haxe_libraries/kiss-tools.hxml +++ b/haxe_libraries/kiss-tools.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/kiss-tools#3f538fd9eb7c76759012b5a0a3afc36b17a73191" into kiss-tools/0.0.0/github/3f538fd9eb7c76759012b5a0a3afc36b17a73191 +# @install: lix --silent download "gh://github.com/kiss-lang/kiss-tools#71d9ed9753a8899a66b8a758099e8d80d434ed7f" into kiss-tools/0.0.0/github/71d9ed9753a8899a66b8a758099e8d80d434ed7f -lib kiss --cp ${HAXE_LIBCACHE}/kiss-tools/0.0.0/github/3f538fd9eb7c76759012b5a0a3afc36b17a73191/src/ +-cp ${HAXE_LIBCACHE}/kiss-tools/0.0.0/github/71d9ed9753a8899a66b8a758099e8d80d434ed7f/src/ -D kiss-tools=0.0.0 \ No newline at end of file diff --git a/src/hollywoo_flixel/FlxMovie.hx b/src/hollywoo_flixel/FlxMovie.hx index 8dabc82..8ec89ae 100644 --- a/src/hollywoo_flixel/FlxMovie.hx +++ b/src/hollywoo_flixel/FlxMovie.hx @@ -23,8 +23,8 @@ import flixel.tweens.FlxTween; class FlxMovie extends Movie { // Think of HollywooFlixelDSL.kiss as the corresponding Kiss file for this class! - public function new(director:FlxDirector, lightSourceJsonFile:String, positionsJson:String, delayLengthsJson:String, voiceLineMatchesJson:String, propScalesJson:String) { - super(director, lightSourceJsonFile, new FlxLightSource([], FlxColor.TRANSPARENT), positionsJson, delayLengthsJson, voiceLineMatchesJson); + public function new(director:FlxDirector, lightSourceJsonFile:String, positionsJson:String, delayLengthsJson:String, voiceLineMatchesJson:String, propScalesJson:String, miscFloatsJson:String, miscIntsJson:String) { + super(director, lightSourceJsonFile, new FlxLightSource([], FlxColor.TRANSPARENT), positionsJson, delayLengthsJson, voiceLineMatchesJson, miscFloatsJson, miscIntsJson); propScales = new JsonMap(propScalesJson, new HFloat(1.0)); }