diff --git a/CHANGES b/CHANGES index 977effdb..125debbe 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,5 @@ [0.1.5] +- [BREAK CHANGE] Update Spine runtime support to `4.2.0` - Add Items Tree search filter [0.1.4] diff --git a/assets/plugins/plugin-tiled-0.1.5.jar b/assets/plugins/plugin-tiled-0.1.5.jar index f94f8a6f..823b404b 100644 Binary files a/assets/plugins/plugin-tiled-0.1.5.jar and b/assets/plugins/plugin-tiled-0.1.5.jar differ diff --git a/gradle.properties b/gradle.properties index c5ee7e13..0225bfd5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ gdxVersion = 1.12.1 lwjgl3Version = 3.3.3 artemisVersion = 2.3.0 -spineVersion = 4.1.0 +spineVersion = 4.2.0 visuiVersion = 1.5.3 typingLabelVersion = 1.3.0 shapedrawerVersion = 2.5.0 -talosVersion = 1.5.0 +talosVersion = 1.5.1-SNAPSHOT gdxTinyVGVersion=7a8927633e pureMvcVersion=1.0.3-SNAPSHOT \ No newline at end of file diff --git a/h2d-libgdx-bvb-extension b/h2d-libgdx-bvb-extension index c4ba6809..a11620ef 160000 --- a/h2d-libgdx-bvb-extension +++ b/h2d-libgdx-bvb-extension @@ -1 +1 @@ -Subproject commit c4ba68090c16423d55163d4b2be66f9547e18870 +Subproject commit a11620ef8fa377a7d05819e83b8770a38e07bd88 diff --git a/h2d-libgdx-spine-extension b/h2d-libgdx-spine-extension index 6868a469..6d595db3 160000 --- a/h2d-libgdx-spine-extension +++ b/h2d-libgdx-spine-extension @@ -1 +1 @@ -Subproject commit 6868a469f05614b92e33a2d372a20bc5df0219aa +Subproject commit 6d595db3239d8989f69e439c9745312d4701e744 diff --git a/h2d-libgdx-talos-extension b/h2d-libgdx-talos-extension index 40256a90..64edfb50 160000 --- a/h2d-libgdx-talos-extension +++ b/h2d-libgdx-talos-extension @@ -1 +1 @@ -Subproject commit 40256a900e2a41ebe6031d7b4216031c2b20ea0f +Subproject commit 64edfb501053642ffb58ed34af9f284dab3ddb3a diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/view/SpineDrawable.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/view/SpineDrawable.java index 7d00c955..057fe29d 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/view/SpineDrawable.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/view/SpineDrawable.java @@ -56,7 +56,7 @@ public class SpineDrawable extends BaseDrawable { } private void computeBoundBox() { - skeleton.updateWorldTransform(); + skeleton.updateWorldTransform(Skeleton.Physics.update); Array drawOrder = skeleton.getDrawOrder(); minX = Float.MAX_VALUE; @@ -95,7 +95,7 @@ public class SpineDrawable extends BaseDrawable { @Override public void draw(Batch batch, float x, float y, float width, float height) { - skeleton.updateWorldTransform(); + skeleton.updateWorldTransform(Skeleton.Physics.update); animationState.update(Gdx.graphics.getDeltaTime()); animationState.apply(skeleton); skeleton.setPosition(x, y - 20); diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java b/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java index 776d75df..0642c9eb 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java +++ b/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java @@ -39,7 +39,7 @@ public class SpineActor extends Actor { private void computeBoundBox() { skeleton.setPosition(0, 0); - skeleton.updateWorldTransform(); + skeleton.updateWorldTransform(Skeleton.Physics.update); Array drawOrder = skeleton.getDrawOrder(); minX = Float.MAX_VALUE; @@ -130,7 +130,7 @@ public class SpineActor extends Actor { @Override public void act(float delta) { - skeleton.updateWorldTransform(); // + skeleton.updateWorldTransform(Skeleton.Physics.update); // state.update(delta); state.apply(skeleton); super.act(delta);