UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
badlogic 2016-06-22 15:33:35 +02:00
commit 6e71449974
16 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-as3/README.md
View File

@ -10,7 +10,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-as3 works with data exported from Spine 3.1.08. Updating spine-as3 to [v3.2](https://trello.com/c/k7KtGdPW/76-update-runtimes-to-support-v3-2-shearing) is in progress. spine-as3 works with data exported from Spine 3.1.08. Updating spine-as3 to [v3.2](https://github.com/EsotericSoftware/spine-runtimes/issues/586) and [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-as3 supports all Spine features, including meshes. If using the `spine.flash` classes for rendering, meshes are not supported. spine-as3 supports all Spine features, including meshes. If using the `spine.flash` classes for rendering, meshes are not supported.

2
spine-corona/README.md
View File

@ -10,7 +10,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-corona works with data exported from Spine 2.1.27. Updating spine-corona to [v3.0](https://trello.com/c/tF8UykBM/72-update-runtimes-to-support-v3-0-skewing-scale), [v3.1](https://trello.com/c/bERJAFEq/73-update-runtimes-to-support-v3-1-linked-meshes), and [v3.2](https://trello.com/c/k7KtGdPW/76-update-runtimes-to-support-v3-2-shearing) is in progress. spine-corona works with data exported from Spine 2.1.27. Updating spine-corona to [v3.0](https://trello.com/c/tF8UykBM/72-update-runtimes-to-support-v3-0-skewing-scale), [v3.1](https://trello.com/c/bERJAFEq/73-update-runtimes-to-support-v3-1-linked-meshes), [v3.2](https://github.com/EsotericSoftware/spine-runtimes/issues/586), and [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-corona supports all Spine features except for rendering meshes due to Corona having a limited graphics API. spine-corona supports all Spine features except for rendering meshes due to Corona having a limited graphics API.

2
spine-csharp/README.md
View File

@ -10,7 +10,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-csharp works with data exported from the latest version of Spine. spine-csharp works with data exported from Spine 3.2.01. Updating spine-csharp to [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-csharp supports all Spine features. spine-csharp supports all Spine features.

2
spine-js/README.md
View File

@ -14,7 +14,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-js works with data exported from Spine 3.1.08. Updating spine-js to [v3.2](https://trello.com/c/k7KtGdPW/76-update-runtimes-to-support-v3-2-shearing) is in progress. spine-js works with data exported from Spine 3.1.08. Updating spine-js to [v3.2](https://github.com/EsotericSoftware/spine-runtimes/issues/586) and [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-js supports all Spine features. spine-canvas does not support color tinting, mesh attachments, or nonuniform scaling. spine-js supports all Spine features. spine-canvas does not support color tinting, mesh attachments, or nonuniform scaling.

2
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java
View File

@ -140,7 +140,7 @@ public class PathConstraint implements Updatable {
} }
} }
private float[] computeWorldPositions (PathAttachment path, int spacesCount, boolean tangents, boolean percentPosition, float[] computeWorldPositions (PathAttachment path, int spacesCount, boolean tangents, boolean percentPosition,
boolean percentSpacing) { boolean percentSpacing) {
Slot target = this.target; Slot target = this.target;
float position = this.position; float position = this.position;

5
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java
View File

@ -531,11 +531,10 @@ public class Skeleton {
Slot slot = drawOrder.get(i); Slot slot = drawOrder.get(i);
float[] vertices = null; float[] vertices = null;
Attachment attachment = slot.attachment; Attachment attachment = slot.attachment;
if (attachment instanceof RegionAttachment) { if (attachment instanceof RegionAttachment)
vertices = ((RegionAttachment)attachment).updateWorldVertices(slot, false); vertices = ((RegionAttachment)attachment).updateWorldVertices(slot, false);
} else if (attachment instanceof MeshAttachment) { else if (attachment instanceof MeshAttachment) //
vertices = ((MeshAttachment)attachment).updateWorldVertices(slot, true); vertices = ((MeshAttachment)attachment).updateWorldVertices(slot, true);
}
if (vertices != null) { if (vertices != null) {
for (int ii = 0, nn = vertices.length; ii < nn; ii += 5) { for (int ii = 0, nn = vertices.length; ii < nn; ii += 5) {
float x = vertices[ii], y = vertices[ii + 1]; float x = vertices[ii], y = vertices[ii + 1];

1
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/JsonRollback.java
View File

@ -19,7 +19,6 @@ import com.badlogic.gdx.utils.JsonWriter.OutputType;
* the runtime is updated to support a newer Spine version should animators update their Spine editor version to match. */ * the runtime is updated to support a newer Spine version should animators update their Spine editor version to match. */
public class JsonRollback { public class JsonRollback {
static public void main (String[] args) throws Exception { static public void main (String[] args) throws Exception {
args = new String[] {"C:/test/CoilGrapple.json", "C:/test/CoilGrapple-fixed.json"};
if (args.length == 0) { if (args.length == 0) {
System.out.println("Usage: <inputFile> [outputFile]"); System.out.println("Usage: <inputFile> [outputFile]");
System.exit(0); System.exit(0);

2
spine-love/README.md
View File

@ -10,7 +10,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-love works with data exported from Spine 2.1.27. Updating spine-love to [v3.0](https://trello.com/c/tF8UykBM/72-update-runtimes-to-support-v3-0-skewing-scale), [v3.1](https://trello.com/c/bERJAFEq/73-update-runtimes-to-support-v3-1-linked-meshes), and [v3.2](https://trello.com/c/k7KtGdPW/76-update-runtimes-to-support-v3-2-shearing) is in progress. spine-love works with data exported from Spine 2.1.27. Updating spine-love to [v3.0](https://trello.com/c/tF8UykBM/72-update-runtimes-to-support-v3-0-skewing-scale), [v3.1](https://trello.com/c/bERJAFEq/73-update-runtimes-to-support-v3-1-linked-meshes), [v3.2](https://github.com/EsotericSoftware/spine-runtimes/issues/586), and [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-love supports all Spine features except for rendering meshes. spine-love supports all Spine features except for rendering meshes.

2
spine-lua/README.md
View File

@ -10,7 +10,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-lua works with data exported from Spine 2.1.27. Updating spine-lua to [v3.0](https://trello.com/c/tF8UykBM/72-update-runtimes-to-support-v3-0-skewing-scale), [v3.1](https://trello.com/c/bERJAFEq/73-update-runtimes-to-support-v3-1-linked-meshes), and [v3.2](https://trello.com/c/k7KtGdPW/76-update-runtimes-to-support-v3-2-shearing) is in progress. spine-lua works with data exported from Spine 2.1.27. Updating spine-lua to [v3.0](https://trello.com/c/tF8UykBM/72-update-runtimes-to-support-v3-0-skewing-scale), [v3.1](https://trello.com/c/bERJAFEq/73-update-runtimes-to-support-v3-1-linked-meshes), [v3.2](https://github.com/EsotericSoftware/spine-runtimes/issues/586), and [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-lua supports all Spine features. spine-lua supports all Spine features.

2
spine-monogame/README.md
View File

@ -10,7 +10,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-monogame works with data exported from the latest version of Spine. spine-monogame works with data exported from Spine 3.2.01. Updating spine-monogame to [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-monogame supports all Spine features. spine-monogame supports all Spine features.

2
spine-sfml/README.md
View File

@ -10,7 +10,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-sfml works with data exported from Spine version 3.2.x. spine-sfml works with data exported from Spine version 3.2.01.
spine-sfml supports all Spine features. spine-sfml supports all Spine features.

2
spine-starling/README.md
View File

@ -10,7 +10,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-starling works with data exported from Spine 3.1.08. Updating spine-starling to [v3.2](https://trello.com/c/k7KtGdPW/76-update-runtimes-to-support-v3-2-shearing) is in progress. spine-starling works with data exported from Spine 3.1.08. Updating spine-starling to [v3.2](https://github.com/EsotericSoftware/spine-runtimes/issues/586) and [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-starling supports all Spine features. spine-starling supports all Spine features.

2
spine-threejs/README.md
View File

@ -10,7 +10,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-threejs works with data exported from Spine 3.1.08. Updating spine-threejs to [v3.2](https://trello.com/c/k7KtGdPW/76-update-runtimes-to-support-v3-2-shearing) is in progress. spine-threejs works with data exported from Spine 3.1.08. Updating spine-threejs to [v3.2](https://github.com/EsotericSoftware/spine-runtimes/issues/586) and [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-threejs supports all Spine features except for rendering meshes. spine-threejs supports all Spine features except for rendering meshes.

2
spine-turbulenz/README.md
View File

@ -10,7 +10,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-turbulenz works with data exported from Spine 3.1.08. Updating spine-turbulenz to [v3.2](https://trello.com/c/k7KtGdPW/76-update-runtimes-to-support-v3-2-shearing) is in progress. spine-turbulenz works with data exported from Spine 3.1.08. Updating spine-turbulenz to [v3.2](https://github.com/EsotericSoftware/spine-runtimes/issues/586) and [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-turbulenz supports all Spine features except for rendering meshes. spine-turbulenz supports all Spine features except for rendering meshes.

2
spine-unity/README.md
View File

@ -14,7 +14,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-unity works with data exported from the latest version of Spine. spine-unity works with data exported from Spine 3.2.01. Updating spine-unity to [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-unity supports all Spine features. spine-unity supports all Spine features.

2
spine-xna/README.md
View File

@ -10,7 +10,7 @@ The Spine Runtimes are developed with the intent to be used with data exported f
## Spine version ## Spine version
spine-xna works with data exported from the latest version of Spine. spine-xna works with data exported from Spine 3.2.01. Updating spine-xna to [v3.3](https://github.com/EsotericSoftware/spine-runtimes/issues/613) is in progress.
spine-xna supports all Spine features. spine-xna supports all Spine features.