9571 Commits

Author SHA1 Message Date
Paxton Hare
bb30f8130e fixing wrong timeline being pushed to array 2013-05-30 05:00:13 -04:00
NathanSweet
7346b35a5c Merge remote-tracking branch 'origin/master' 2013-05-30 07:58:40 +02:00
NathanSweet
b6bab0b9c2 Fixed spineboy script. 2013-05-30 03:01:50 +02:00
Nathan Sweet
a26bdd34e4 Merge pull request #54 from moitias/master
Fix scaling when attachment is rotated 90 degrees from the bone, Add relative paths to package.path when running in simulator to make the example work straight out of the box
2013-05-29 08:48:40 -07:00
NathanSweet
78625d6dcd Fixed project. 2013-05-29 17:35:13 +02:00
Matias
116ad3ce53 fix indentation 2013-05-29 12:29:49 +03:00
Matias
f3d1467972 comment out the warning 2013-05-29 12:24:36 +03:00
Matias
460451a6a2 fix scaling when attachment is rotated 90 degrees from the bone 2013-05-29 12:18:18 +03:00
Matias
b5da5daa38 add relative path to package.path to make running the example work straight out of the box on simulator 2013-05-29 12:05:31 +03:00
Matias
2034a6e726 Merge branch 'master' of git://github.com/EsotericSoftware/spine-runtimes 2013-05-29 11:51:58 +03:00
Matias
32c7dc8cb0 Revert "add support for loading from relative directories to make the example load out of the box"
This reverts commit 3a9623cdd7f1f7a376442d36ee760de1f9ff1b08.
2013-05-29 11:50:26 +03:00
Matias
3a9623cdd7 add support for loading from relative directories to make the example load out of the box 2013-05-29 11:19:08 +03:00
NathanSweet
5070b21341 Initialize skeleton on start. 2013-05-29 03:24:44 +02:00
NathanSweet
56ec15c0f4 Merge remote-tracking branch 'origin/master' 2013-05-29 00:27:14 +02:00
NathanSweet
fbbe262a39 Fixed spine-unity. 2013-05-29 00:03:06 +02:00
Nathan Sweet
e64613e915 Merge pull request #53 from moitias/master
Lua support for inheriting scale and rotation
2013-05-28 14:25:16 -07:00
Matias
09ff781a9a Add Lua support for reading scale and rotation inheritance 2013-05-28 20:43:11 +03:00
Matias
fb21554a49 Add Lua support for inheriting scale and rotation 2013-05-28 20:41:45 +03:00
NathanSweet
22fabe8769 Forgot to flip the root bone for some runtimes since the skeleton is now placed separately from the root bone. 2013-05-28 18:22:06 +02:00
NathanSweet
e6d7cf8b26 Add x and y to skeleton for positioning instead of using root bone. 2013-05-28 18:17:55 +02:00
NathanSweet
1f8cad35eb Fix up property name case. 2013-05-28 17:52:34 +02:00
Nathan Sweet
5ba06b952b Merge pull request #52 from pharan/master
Inherit rotation and scale in C#
2013-05-28 08:42:14 -07:00
John Dy
6c784ec0cd Added bone inherit rotation and scale in csharp
Just mimicked the changes in spine-libgdx and your code pattern in c#.
Working fine in Unity.
2013-05-27 16:45:40 +08:00
NathanSweet
3172f66480 Nasty stuff, Unity. 2013-05-26 22:13:41 +02:00
NathanSweet
b70c0c8c49 Update example to not crash Unity 3.5.7. 2013-05-26 13:17:53 +02:00
NathanSweet
9d4aff8da7 Stripped folder paths from atlas region names. Formatting. 2013-05-25 17:41:52 +02:00
NathanSweet
cef7e46e5b Variable should be local. 2013-05-24 13:54:19 +02:00
NathanSweet
20d42b0bff Merge remote-tracking branch 'origin/master' 2013-05-24 13:38:19 +02:00
NathanSweet
1cf4071cf7 Prevent errors if image could not be loaded. 2013-05-24 13:38:08 +02:00
Nathan Sweet
c4848d1340 Merge pull request #49 from MobiDevelop/libgdx-gwt
Add GWT module definition
2013-05-24 02:25:53 -07:00
NathanSweet
d237ed758b Cleaned up warnings, #50. 2013-05-24 11:24:22 +02:00
NathanSweet
7cae307c55 Default time scale to 1. 2013-05-23 12:45:31 +02:00
NathanSweet
a383c85862 Updated binary example file. 2013-05-22 06:52:35 +02:00
NathanSweet
0e49ab8a96 Merge remote-tracking branch 'origin/master' 2013-05-22 06:51:27 +02:00
NathanSweet
8c3a4e4761 Added bone inherit rotation and scale, and slot additive blending. 2013-05-22 06:44:46 +02:00
Justin Shapcott
9bc13dbc84 Add GWT module definition 2013-05-21 07:15:06 -07:00
Nathan Sweet
76194599b9 Merge pull request #48 from Dgizusse/master
tk2d: Fixed source textures included in the build along the atlas.
2013-05-15 12:14:28 -07:00
Dgizusse
73f2407f9d - Fixed source textures being included in the build along the atlas. ***NOT BACKWARD COMPATIBLE*** 2013-05-15 12:12:07 -04:00
NathanSweet
d1d1c6a638 Added Skin_getAttachmentName to enumerate skin attachments for a slot. Thanks James Poag! 2013-05-15 09:06:06 -04:00
NathanSweet
69f37c2a48 SpineboyComponent renamed to Spineboy. 2013-05-15 09:06:05 -04:00
Nathan Sweet
78d687e2db Merge pull request #46 from Dgizusse/master
Small fix and optimization when updating the mesh.
2013-05-14 19:47:53 -07:00
NathanSweet
27d6766289 Added Skin_getAttachmentName to enumerate skin attachments for a slot. Thanks James Poag! 2013-05-14 15:02:22 +02:00
NathanSweet
53662aac09 Merge remote-tracking branch 'origin/master' 2013-05-14 03:51:28 +02:00
Dgizusse
99c8efb6b7 Merge branch 'master' of https://github.com/EsotericSoftware/spine-runtimes.git 2013-05-13 21:22:25 -04:00
Dgizusse
cd21837efb - Added Tangents generation if needed. 2013-05-13 21:20:49 -04:00
NathanSweet
fbefc609a2 SpineboyComponent renamed to Spineboy. 2013-05-14 01:36:50 +02:00
Dgizusse
0a24fc576f - Recalculate normals only if required by the SpriteCollection. 2013-05-13 19:04:31 -04:00
Dgizusse
a1570c960a - Clear the mesh before setting it up again to prevent an assert when showing/hiding a slot image. 2013-05-13 17:36:12 -04:00
Nathan Sweet
ae17932d53 Merge pull request #45 from Dgizusse/master
tk2d Support for multiple platform SpriteCollections
2013-05-13 09:06:15 -07:00
Dgizusse
aee230b156 - Properly update mesh data when switching platform in editor. 2013-05-13 11:25:08 -04:00