NathanSweet
5994c65e51
Merge remote-tracking branch 'origin/dev' into dev
2016-10-19 22:43:50 +02:00
NathanSweet
e084f7c745
Removed crossfade "dip" fix.
...
It worked by applying the mixing from timeline with full alpha, then mix the higher timeline. It wasn't good since it would blow away any pose from before the mixing from timeline.
2016-10-19 22:43:41 +02:00
NathanSweet
5cd29e55df
AnimationState, mixing from multiple animations.
...
#621
2016-10-19 22:36:04 +02:00
badlogic
a5e05c3e06
Merge branch 'master' into dev
2016-10-19 13:11:31 +02:00
NathanSweet
f92e770bb1
noRotationOrReflection simplification.
2016-10-19 13:06:27 +02:00
badlogic
f41790af99
Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes
2016-10-19 12:01:07 +02:00
badlogic
69889d8a07
[c] Fixes compilation in VS201x
2016-10-19 12:00:59 +02:00
pharan
3bcf399227
[unity] Added some multi-editing support.
2016-10-19 09:04:10 +08:00
badlogic
6629a7d332
[lua] Fixed type in SkeletonJson.lua
2016-10-17 14:20:36 +02:00
John
92236380c0
[unity] Fix backwards json check.
2016-10-17 18:50:57 +08:00
NathanSweet
97756d6921
Added version placeholder for building JAR.
2016-10-17 11:27:36 +02:00
NathanSweet
257e72de11
Added version placeholder for building JAR.
2016-10-17 11:24:13 +02:00
NathanSweet
92f91bae58
Simplified noRotationOrReflection.
2016-10-16 12:48:32 +02:00
NathanSweet
3a3f0cc2f4
Whitespace.
2016-10-16 00:32:34 +02:00
NathanSweet
583dbee7ad
Merge branch 'master' into dev
2016-10-16 00:31:10 +02:00
NathanSweet
4a8d02a144
Cleaned up contribution comments.
2016-10-16 00:25:08 +02:00
NathanSweet
0df3eea08b
Added some missing license header comments.
2016-10-16 00:19:26 +02:00
NathanSweet
b42f1b9b94
Removed mystery question mark.
2016-10-16 00:07:32 +02:00
pharan
2f0d80f0dc
[unity] Fixed stray character.
2016-10-16 06:03:42 +08:00
NathanSweet
15015a12e0
Merge branch 'master' into dev
...
# Conflicts:
# spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTest.java
# spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java
2016-10-15 23:50:01 +02:00
NathanSweet
3bfe462534
Fixed local rotation when inherit rotation is disabled.
2016-10-15 23:47:33 +02:00
NathanSweet
2e87ab8f9f
Debugging AnimationState.
2016-10-15 23:47:12 +02:00
NathanSweet
c0fdc454a2
Fixed inconsistent newlines.
...
License header was followed by \n\n and files ended with \n. Changed to \r\n.
2016-10-15 23:45:16 +02:00
NathanSweet
7a18f0818c
Every space in its place! (tm)
...
(whitespace clean up)
2016-10-15 23:15:41 +02:00
NathanSweet
ded7a697d9
Removed obsolete SkinnedMeshAttachment.
2016-10-15 23:15:01 +02:00
NathanSweet
6cdcdbdb40
Renamed TextureAtlasAttachmentLoader to AtlasAttachmentLoader, matching the other runtimes.
2016-10-15 10:27:38 +02:00
NathanSweet
f63561085a
List explicit Spine editor version that is supported.
2016-10-13 22:55:04 +02:00
NathanSweet
3bf261dc4b
Clean up.
2016-10-13 18:05:00 +02:00
NathanSweet
aae761cd19
Removed blending caching (from master).
2016-10-13 18:04:43 +02:00
badlogic
06e7037503
[runtimes] Merged with master, updated license headers
2016-10-13 16:49:30 +02:00
badlogic
21de61a094
Merge branch 'master' into dev
2016-10-13 15:48:15 +02:00
badlogic
ef50131431
[runtimes] Updated all LICENSE files and README.mds
2016-10-13 15:21:05 +02:00
badlogic
5aa27771c3
[runtimes] Updated ALL sources to use latest Spine Runtimes License v2.5. Manually checked all the things...
2016-10-13 15:12:05 +02:00
badlogic
5ada79849a
Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes
2016-10-13 12:03:29 +02:00
badlogic
1ecd627afa
[runtimes] Closes #719 , fixed sortPathConstraintAttachment
2016-10-13 12:03:23 +02:00
NathanSweet
5dd5d2a2f0
Merge remote-tracking branch 'origin/master'
2016-10-13 11:52:09 +02:00
NathanSweet
d631da5f56
Moved version to make it more clear it's a license version, not a runtime version.
2016-10-13 11:52:02 +02:00
Mario Zechner
f84ae17615
Updated License Headers
2016-10-13 10:27:54 +02:00
Mario Zechner
5b1814cff3
spine-lua, spine-love, spine-corona update to 3.4.02 ( #722 )
...
The spine-lua API has been updated to be compatible with Spine version 3.4.02 (latest stable). The spine-lua API now supports path constraints, transform constraints, uses the new way we encode meshes etc. There are no API breaking changes, only API additions, such as PathConstraints and TransformConstraints as well as additional methods to Skeleton and similar classes. The internals of the spine-lua API have also been updated to follow Lua best performance practices by localizing heavily and using meta tables for "class methods". The spine-lua API now also loads texture atlases as exported by Spine. All that is required for a consumer is to supply an image loading function for their specific engine/framework. We provide implementations for spine-love and spine-corona.
The spine-love API can now render all Spine attachment types, including meshes and linked meshes. The API has changed. Where previously a "class" Skeleton existed with a draw function, the new spine-love API introduces a new SkeletonRenderer. See the example on API usage.
The spine-corona API can now also render all Spine attachment types. The API has not changed.
2016-10-11 16:33:25 +02:00
John
41fcd084e9
[unity] Fix Spine json detection.
2016-10-11 22:30:16 +08:00
badlogic
32b022d0bc
[cocos2dx] Clean-up
2016-10-11 16:06:49 +02:00
badlogic
c2274020be
[cocos2dx] Updated README.md
2016-10-11 15:10:59 +02:00
badlogic
84dad97828
Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes
2016-10-11 14:45:25 +02:00
badlogic
b34e6dbb78
[cocos2dx] Added Android project for testing, see README.md for instructions
2016-10-11 14:44:36 +02:00
badlogic
75683d280a
Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes
2016-10-10 16:09:59 +02:00
NathanSweet
eb1e8e7942
Disable inherit rotation can be stable if also disabling reflection.
2016-10-10 15:50:57 +02:00
NathanSweet
6ef7cf3ba4
Disable inherit rotation can be stable if also disabling reflection.
2016-10-07 18:30:25 +02:00
NathanSweet
a42ce71796
Simplified disable inherit scale math.
2016-10-07 16:12:15 +02:00
John
7c6c6ef535
[csharp] Fixed path constraint bone sorting.
...
Based on: c34db336d5
2016-10-07 20:40:41 +08:00
NathanSweet
c34db336d5
Fixed path constraint bone sorting.
2016-10-07 14:22:28 +02:00
