4336 Commits

Author SHA1 Message Date
badlogic
f5cc2933be Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-24 11:37:12 +02:00
pharan
aef9261d40 [unity] Add IkConstraint compress and uniform to SkeletonDebugWindow. 2018-08-24 05:59:20 +08:00
pharan
cbd6b2617e [csharp] Port IkConstraint unform and compress. 2018-08-24 05:54:02 +08:00
badlogic
66236adea5 [c][cpp] Ported addition of uniform/compressed IK and rotation fix. 2018-08-23 16:30:16 +02:00
badlogic
3e8cb852bb [lua] Ported addition of uniform/compressed IK and rotation fix. 2018-08-23 15:47:50 +02:00
badlogic
d079555f84 [ts] Fix up for compression IK timeline keys. 2018-08-23 15:38:44 +02:00
badlogic
18f2ccf480 [ts] Ported addition of uniform/compressed IK and rotation fix. See #1163. 2018-08-23 15:23:18 +02:00
badlogic
38e5d2f35a Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-23 15:11:16 +02:00
NathanSweet
7df713b13f Added IK constraint compress and uniform settings. 2018-08-23 12:15:38 +02:00
pharan
671c921089
[csharp] Fix rotation spinning out of control.
Port of: 7996f2b
2018-08-17 23:19:49 +08:00
NathanSweet
9b259c66e0 Added TrackEntry#holdPrevious to avoid dipping in higher tracks.
Also:
- Added mixingTo to make track entries a doubly linked list, removing the need for the mixingTo array.
- Renamed dip->hold, timelineData->timelineMode, timelineDipMix->timelineHoldMix ("dip" naming was bad).
2018-08-16 02:51:49 +02:00
NathanSweet
7996f2bae0 [libgdx] Prevent rotation from spinning out of control.
For example, when diff is -360 at the == 0 check, it later becomes 0.
2018-08-16 02:51:49 +02:00
pharan
1ed6d7c485 [examples] Root motion animation on stretchyman-pro. 2018-08-15 16:10:32 +08:00
pharan
3d52f1a7e2 [unity] IkConstraint.stretch 2018-08-15 00:04:07 +08:00
pharan
1b238325d6 [unity] Clarify version check message. 2018-08-15 00:03:14 +08:00
pharan
31b48382a5 [unity] Minor formatting. 2018-08-15 00:01:37 +08:00
pharan
c3fb8cb962 [unity] Minor change to SkeletonGhost inspector and default. 2018-08-15 00:01:05 +08:00
pharan
56566fb774 [unity] Update SkeletonGhostRenderer implementation. 2018-08-15 00:00:43 +08:00
pharan
70448abcdc [csharp] Update formatting and docs. 2018-08-14 23:51:33 +08:00
pharan
d5354cb6bf [csharp] Ported stretchy IK. See https://github.com/EsotericSoftware/spine-runtimes/issues/1142 2018-08-14 23:45:38 +08:00
badlogic
47b8086b67 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-14 16:17:02 +02:00
badlogic
4b8b4a4adf Updated CHANGELOG. 2018-08-14 16:16:52 +02:00
badlogic
31ca0b7ce8 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-14 16:12:34 +02:00
badlogic
fd7b0caec4 [lua] Ported stretchy IK. 2018-08-14 16:12:15 +02:00
badlogic
be272c63df [cpp] Fix to stretchy IK. 2018-08-14 15:30:30 +02:00
badlogic
e724231c5f Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-14 15:09:15 +02:00
badlogic
a506047242 [c] Ported stretchy IK, fixed warnings. 2018-08-14 15:05:40 +02:00
badlogic
b4d71f68c2 [cpp] Bone length fix for stretchy IK. 2018-08-14 14:32:41 +02:00
badlogic
4b66fffcd7 [cpp] Updated samples to include stretch IK flag, implemented stretchy IK for C++. 2018-08-14 14:30:11 +02:00
badlogic
7fba618e88 [cpp] Fixed bug in handling of dark colors on load. 2018-08-13 17:21:24 +02:00
badlogic
f033239b54 [cocos2dx] Fixes tint black. 2018-08-13 16:56:05 +02:00
badlogic
a6dcbc61e3 [cocos2dx] Fix for tint black in 3.7 branch. 2018-08-13 16:47:36 +02:00
badlogic
bd778ba417 Merge branch '3.6' into 3.7-beta 2018-08-13 16:36:38 +02:00
badlogic
ce536558e5 [cocos2dx] Tint black did not work, didn't multiple dark color with skeleton/attachment color. Closes #1158. 2018-08-13 16:34:06 +02:00
badlogic
7a7fc714c0 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-13 14:09:55 +02:00
badlogic
5f9bc785cb [ue4][cpp] UE4 pulls in various system headers on macOS that collide with our types. Fixes #1150. 2018-08-13 14:09:43 +02:00
badlogic
a7debf8bcd [ue4] Partial fix for #1150. 2018-08-13 14:08:46 +02:00
badlogic
2b9f215c9e Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-13 13:47:14 +02:00
pharan
e04e587abc [unity] Some cleanup of SkeletonGhost inspector and new Initialize(overwrite) method. 2018-08-10 23:52:28 +08:00
pharan
7580db5701 [unity] SetSlotAttachmentsToSetupPose extension. 2018-08-10 23:51:46 +08:00
pharan
5f28ce21d6 [unity] Some inspector improvements. 2018-08-10 23:51:07 +08:00
badlogic
5a78663bfa [cocos2dx] Resolved merge conflict that got accidentially commited. 2018-08-10 11:57:11 +02:00
badlogic
253bda4ee4 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-10 11:54:49 +02:00
badlogic
1c86d63941 [cpp] Fixes #1159, illegal memory access in Vector. 2018-08-10 11:52:59 +02:00
badlogic
d3e37284fc Merge branch '3.6' into 3.7-beta 2018-08-10 11:14:01 +02:00
badlogic
a578be88e0 [cocos2dx][c] Fixed call to spVertexAttachment_computeWorldVertices, as well as count calcalculation. 2018-08-10 11:11:15 +02:00
badlogic
c405dcd165 [cocos2dx][cpp] More changes to computeWorldVertices. 2018-08-09 15:27:26 +02:00
badlogic
f12728f0d2 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-09 15:18:15 +02:00
badlogic
4005ff2ad4 Merge branch '3.6' into 3.7-beta 2018-08-09 15:02:55 +02:00
badlogic
9a428a02b8 [c] Fixes #1148, revert changes to spVertexAttachment_computeWorldVertices. Vertex size must be a multiple of 4, which explains why #1148 failed. 2018-08-09 14:59:09 +02:00