1365 Commits

Author SHA1 Message Date
NathanSweet
371aaefa9f Added const char* methods so NULL can be passed. 2015-03-16 20:02:11 +01:00
NathanSweet
fae952d73c Docs, accept empty string for std::string refs that can be null in the C API. 2015-03-16 19:56:51 +01:00
NathanSweet
91e7d4e973 Merge remote-tracking branch 'origin/master' 2015-03-16 14:38:42 +01:00
NathanSweet
85dba4aa3a Added bone plotting example. 2015-03-16 14:38:35 +01:00
Fenrisul
7d52923c84 Merge pull request #389 from Fenrisul/master
Added BoundingBoxAttachment support to spine-unity
2015-03-16 00:24:07 -07:00
Fenrisul
1e6764d4d5 Added BoundingBoxAttachment support for SkeletonUtility and SkeletonDataAssetInspector. 2015-03-16 00:21:51 -07:00
NathanSweet
39f379efd7 Removed spine-tk2d, it has been merged into spine-unity. 2015-03-15 23:32:38 +01:00
Fenrisul
77d8657d9a Merge pull request #388 from Fenrisul/master
Made things prettier for Pharan.
2015-03-15 11:53:17 -07:00
Fenrisul
a295b528f5 Made things prettier for Pharan. 2015-03-15 11:38:54 -07:00
Fenrisul
98f9c6a574 Merge pull request #387 from Fenrisul/master
Added TK2D support directly to spine-unity runtime
2015-03-15 11:02:36 -07:00
Fenrisul
528a182c93 Formatting cleanup 2015-03-15 11:00:11 -07:00
Fenrisul
34b08bceec Added TK2D support to main spine-unity runtime with compiler directive.
spine-tk2d now obsolete
Added PreferenceItem GUI to SpineEditorUtilities (Default Mix and TK2D)
2015-03-15 10:59:30 -07:00
Fenrisul
dfa6c383df Merge pull request #385 from Fenrisul/master
Fixed non-packed sprite attachment issue
2015-03-13 22:46:45 -07:00
Fenrisul
3d7437f6c5 Merge branch 'master' of https://github.com/EsotericSoftware/spine-runtimes 2015-03-13 22:46:13 -07:00
Fenrisul
abdd68ba02 Fixed non-packed sprite attachment issue 2015-03-13 22:44:14 -07:00
Fenrisul
a7bc5321ac Merge pull request #384 from Fenrisul/master
SpriteAttachmentLoader
2015-03-13 20:26:03 -07:00
Fenrisul
fcf90be386 Return Attachment after adding from Sprite.
Misc clean up
2015-03-13 20:24:30 -07:00
Fenrisul
18bbcfdc6a Formatting clean up 2015-03-13 20:15:29 -07:00
Fenrisul
f73d6e5d1c SpriteAttachmentLoader and friends 2015-03-13 20:15:01 -07:00
Fenrisul
8544125ead Merge pull request #374 from pharan/sortinglayerinspector
Added Sorting Layers GUI to SkeletonRenderer and SkeletonAnimation
2015-03-08 15:52:53 -07:00
NathanSweet
8c3e024f3b Fixed events on frame zero not firing. 2015-03-06 05:32:54 +01:00
pharan
b28b7674d8 Fixed ambiguous method return in Unity 5 release. 2015-03-04 10:13:53 +08:00
pharan
2de88fc6aa Unity 5 compatible SkeletonRendererInspector sorting layer fields. 2015-02-26 11:00:17 +08:00
Nathan Sweet
194104f742 Update README.md 2015-02-25 18:39:47 +01:00
NathanSweet
3b48afb78b Made script URLs relative. 2015-02-25 18:25:40 +01:00
NathanSweet
05fcfaa8bc Merge remote-tracking branch 'origin/master' 2015-02-25 18:22:37 +01:00
NathanSweet
37552cff42 Added spine-canvas.js and an example. 2015-02-25 18:22:33 +01:00
Nathan Sweet
08b298f277 Update README.md 2015-02-25 18:09:02 +01:00
pharan
cd198cc970 Added Sorting Layers GUI to SkeletonRenderer and SkeletonAnimation Inspectors. 2015-02-24 14:02:07 +08:00
NathanSweet
67a639d12a Actually needed named values to avoid warnings.
derp
2015-02-21 02:51:23 +01:00
NathanSweet
0815fad4d6 Used zero for enums in C++ ctors. 2015-02-21 02:48:45 +01:00
Nathan Sweet
75446e60a7 Merge pull request #369 from jrenner/master
add C++ constructors to all structs (VS Compiler C++ compatibility)
2015-02-21 02:47:59 +01:00
Jon Renner
8ae2ae1cdf add C++ constructors to all structs
for Visual Studio compiler compatibility
2015-02-20 19:25:24 -06:00
NathanSweet
156d531b1a Set lastTime to zero.
Shouldn't be different from the constructor.
2015-02-19 02:45:36 +01:00
NathanSweet
8dace6cfef "Fixed" compiling to iOS 64bit.
http://esotericsoftware.com/forum/viewtopic.php?p=19690#p19690
2015-02-19 02:45:09 +01:00
Fenrisul
7c861591d4 Merge pull request #362 from Fenrisul/master
SkeletonAnimator & Unity5 compatibility pass
2015-02-17 18:40:34 -08:00
Fenrisul
fdb83d5428 Merge branch 'master' of https://github.com/EsotericSoftware/spine-runtimes 2015-02-17 18:37:28 -08:00
Fenrisul
678296a3d7 Added SkeletonUtility button to SkeletonAnimatorInspector 2015-02-17 18:36:56 -08:00
Fenrisul
9c7b95ff30 SkeletonAnimator update
Unity5 compatibility pass
2015-02-17 18:22:51 -08:00
Fenrisul
f25f33fbc5 MixMode list added to SkeletonAnimator 2015-02-17 17:33:30 -08:00
Fenrisul
39e754315e Added SkeletonAnimator
Changed SkeletonAnimation delegates to pass SkeletonRenderer instead of SkeletonAnimation
Refactored how delegates/events work a bit in SkeletonAnimation by implementing ISkeletonAnimation interface.
2015-02-17 16:20:57 -08:00
Nathan Sweet
1697c4e301 Merge pull request #342 from asRIA/fix_buffer_overflow_json_error
Fix buffer overflow when JSON Skeleton produces Error
2015-02-10 17:34:19 +01:00
Nathan Sweet
96f230d3cb Merge pull request #334 from TrompoGames/Trompo-JS-AtlasAttachmentLoader
[JAVASCRIPT] Atlas attachment loader fix.
2015-02-10 17:32:30 +01:00
Nathan Sweet
633e47920d Merge pull request #298 from pinguin999/master
Spine c-runtime struct definition & sfml memory access after free
2015-02-10 17:30:33 +01:00
Nathan Sweet
4386cdefc2 Merge pull request #332 from RandolphBurt/fix-monogame-example-goblin-mesh-not-ffd
Fix monogame example program
2015-02-10 17:24:04 +01:00
Nathan Sweet
49493b065d Merge pull request #338 from Fraggle/patch-5
Fix issue with HitTest
2015-02-10 17:15:28 +01:00
Nathan Sweet
36cd56039a Merge pull request #354 from tadas-miceika/master
spine-c compile fix
2015-02-10 17:11:25 +01:00
Nathan Sweet
9e88d8e70a Merge pull request #358 from harkal/master
return the proper local for the module
2015-02-10 17:11:10 +01:00
Nathan Sweet
64ff391358 Merge pull request #346 from nheagy/patch-1
Fixing links to examples
2015-02-10 17:10:51 +01:00
Nathan Sweet
d21f65eb3e Merge pull request #347 from nheagy/patch-2
Readme fixes
2015-02-10 17:10:38 +01:00