4887 Commits

Author SHA1 Message Date
NathanSweet
749d1743ab Merge branch '3.7' into 3.8-beta 2019-03-13 11:31:28 +01:00
NathanSweet
50bfb3ae0f [libgdx] Fixed NPE in AnimationState, javadoc. 2019-03-09 15:10:25 +01:00
NathanSweet
bd306d4781 [libgdx] Renamed Slot attachmentVertices to Slot deform.
This is a better term because they aren't necessarily vertices (they are offsets for a weighted mesh), it's less similar to vertices, which use in many places, and "deform" is the terminology we use in the editor and deform timeline.
2019-03-08 20:20:10 +01:00
NathanSweet
a321aa76d5 [libgdx] Fixed mixing out an attachment timeline when a subsequent entry sets the same attachment.
closes #1292
2019-03-08 20:15:30 +01:00
Ivan Popelyshev
6c32b9543e I gift you the second equals sign (#1299) 2019-03-08 17:21:36 +01:00
badlogic
79123e747d Merge branch '3.7' into 3.8-beta 2019-03-08 16:38:38 +01:00
badlogic
bd4a7328a5 Merge branch '3.7' of https://github.com/esotericsoftware/spine-runtimes into 3.7 2019-03-08 16:38:19 +01:00
badlogic
5ad954c16d [ts] New build. 2019-03-08 16:38:14 +01:00
badlogic
79e4f9ca69 [ue4] Only show preview animation and skin in editor viewports. 2019-03-08 16:37:22 +01:00
Ivan Popelyshev
d55724a1b5 Make let not var (#1298) 2019-03-08 16:36:05 +01:00
Ivan Popelyshev
5ee7d93fce Remove "spine." everywhere (#1297) 2019-03-08 15:44:15 +01:00
badlogic
ade1cafc8c Merge branch '3.7' into 3.8-beta 2019-03-07 19:01:03 +01:00
badlogic
b0629e51ec Merge branch '3.7' of https://github.com/esotericsoftware/spine-runtimes into 3.7 2019-03-07 19:00:52 +01:00
badlogic
5c62f78ed4 [cocos2dx] Segfault when copying old scratch buffer contents to resized buffer. Closes #1295. 2019-03-07 19:00:47 +01:00
badlogic
2eb85acff9 [cocos2dx] Segfault when copying old scratch buffer contents to resized buffer. Closes #1295. 2019-03-07 19:00:17 +01:00
badlogic
997cb49a28 Merge branch '3.7' into 3.8-beta 2019-03-07 18:10:33 +01:00
badlogic
8018bdfa23 [ue4] Rename category of preview properties. 2019-03-07 18:10:19 +01:00
badlogic
b966d7c60a [ue4] Rename category of preview properties. 2019-03-07 18:08:29 +01:00
badlogic
492a977f04 Merge branch '3.7' into 3.8-beta 2019-03-07 17:23:07 +01:00
badlogic
8185418319 [ue4] Fixed encoding of strings where necessary. Closes #1291. 2019-03-07 17:22:30 +01:00
badlogic
dcce71416f [ue4] Fixed call order of SpineSkeletonImportFactory, asset file name must be set before setting raw data. Fixes issue with importing .json files. See #1291. 2019-03-07 16:31:15 +01:00
badlogic
9d11512b28 Merge branch '3.7' into 3.8-beta 2019-03-06 16:57:13 +01:00
badlogic
dd85819c50 Updated CHANGELOG. 2019-03-06 16:57:01 +01:00
badlogic
8616600388 Merge branch '3.7' into 3.8-beta 2019-03-06 16:55:39 +01:00
badlogic
cef191f6c6 [ue4] Fixed segfault in SpineSkeletonDataAsset. Added PreviewAnimation and PreviewSkin to SpineSkeletonAnimationComponent. Enter the name of an animation or skin and it will be previewed live in the editor view. Use an empty string to reset the animation or skin. 2019-03-06 16:54:47 +01:00
badlogic
4ba46d76e8 [ue4] Extended skeleton data editor preview. It now shows bones, slots, animations, and skins. Closes #1047. 2019-03-06 16:21:27 +01:00
badlogic
f9965d601f Merge branch '3.7' into 3.8-beta 2019-03-06 15:25:47 +01:00
badlogic
444f604df3 Fixed README of spine-cpp. 2019-03-06 15:25:34 +01:00
badlogic
ede677ce3f Version fixes. 2019-03-06 15:24:02 +01:00
badlogic
28b3cd71f9 Updated CHANGELOG. 2019-03-06 15:21:13 +01:00
badlogic
1629c7e7ab [unity][libgdx] Fix versions after merging in beta branch... 2019-03-06 15:14:43 +01:00
badlogic
75f21f846c [ue4] Query methods for SpineSkeletonComponent and UTrackEntry. Closes #1289. 2019-03-06 15:11:24 +01:00
badlogic
e7e64ebf2f Merge branch '3.7' into 3.8-beta 2019-03-06 12:02:18 +01:00
badlogic
af0b285c73 [ue4] Fix formatting. 2019-03-06 12:01:24 +01:00
badlogic
0a73f6761e Merge branch 'paperzd_support_1.3.4' of https://github.com/heavybullets/spine-runtimes into heavybullets-paperzd_support_1.3.4 2019-03-06 11:52:25 +01:00
badlogic
7c938a7e3b Merge branch '3.7' into 3.8-beta 2019-03-06 11:15:03 +01:00
Nick Peterson
15547e1e0c TrackEntry now resets renderer object (#1293) 2019-03-06 11:14:27 +01:00
Harald Csaszar
930d4b4015 [unity] corrected version number in version.txt file of 3.8-beta branch. 2019-03-04 18:45:14 +01:00
Harald Csaszar
b5e8d49cb2 [unity] Fixed material being cleared to null when MeshRenderer is disabled in the editor. Closes #1288. 2019-03-04 18:30:47 +01:00
Harald Csaszar
088fb2ea02 [unity] Fixed material being cleared to null when MeshRenderer is disabled in the editor. Closes #1288. 2019-03-04 18:29:46 +01:00
badlogic
4da1cc35d8 Merge branch '3.7' into 3.8-beta 2019-03-04 17:07:46 +01:00
badlogic
2db16cc384 [lua] Fix for #1290, do not carry over time when timeScale of a track entry taht's being replaced by a new one is 0. 2019-03-04 17:06:50 +01:00
badlogic
c66113e19d [csharp] Fix for #1290, do not carry over time when timeScale of a track entry taht's being replaced by a new one is 0. 2019-03-04 17:05:03 +01:00
badlogic
ed5dee43ef [c][cpp] Fix for #1290, do not carry over time when timeScale of a track entry taht's being replaced by a new one is 0. 2019-03-04 17:04:03 +01:00
badlogic
57e38a0cb3 [as3] Fix for #1290, do not carry over time when timeScale of a track entry taht's being replaced by a new one is 0. 2019-03-04 17:01:45 +01:00
badlogic
95df49f88d [libgdx] Fix for #1290, do not carry over time when timeScale of a track entry taht's being replaced by a new one is 0. 2019-03-04 17:00:00 +01:00
badlogic
9fb2649dd1 [ts] Fix for #1290, do not carry over time when timeScale of a track entry taht's being replaced by a new one is 0. 2019-03-04 16:59:28 +01:00
badlogic
3c83810c43 Merge branch '3.7' into 3.8-beta 2019-03-01 11:53:48 +01:00
badlogic
d907ad1610 [cocos2d-objc] Fixed project configuration for latest Xcode. 2019-03-01 11:53:32 +01:00
Harald Csaszar
8ca94c2da4 [unity] Fixed another occurrence of compile errors in Unity 2017.3 when enabling TK2D define due to asmdef files. See #1280. 2019-02-26 17:00:42 +01:00