1392 Commits

Author SHA1 Message Date
NathanSweet
27270a5781 Spine Runtimes license update.
Minor update to fix "SOFTARE" typo and clairfy how to get permission.
2015-04-24 21:33:24 +02:00
NathanSweet
dee4d7f801 Better MALLOC macro. 2015-04-17 09:26:17 +02:00
Fenrisul
9fae45306e Merge pull request #409 from Fenrisul/master
[Unity] Added BoundingBoxFollower
2015-04-10 01:34:06 -07:00
Fenrisul
a4361c6f0c [Unity] Added BoundingBoxFollower 2015-04-10 01:32:36 -07:00
Fenrisul
fe2635e209 Merge pull request #406 from Fenrisul/master
[Unity] No seriously this time, fixed the Basic Platformer.unity example...
2015-04-07 11:56:48 -07:00
Fenrisul
e5a3cf3070 [Unity] No seriously this time, fixed the Basic Platformer.unity example scene. 2015-04-07 11:55:36 -07:00
Fenrisul
983b558eb6 Merge pull request #405 from Fenrisul/master
[Unity] Updated Basic Platformer example scene with mesh Hero.
2015-04-05 11:49:45 -07:00
Fenrisul
2cc4add0a1 [Unity] Updated Basic Platformer example scene with mesh Hero. 2015-04-05 11:41:37 -07:00
NathanSweet
fb7db79ff8 Update for latest libgdx. 2015-04-03 22:59:54 +02:00
NathanSweet
f8a76c6455 Blend modes for all runtimes. 2015-04-02 14:20:20 +02:00
NathanSweet
142e770e5b Don't required a BufferedStream. 2.1.25 2015-03-29 18:36:37 +02:00
NathanSweet
412ec15442 Merge remote-tracking branch 'origin/master'
Conflicts:
	spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs
	spine-unity/Assets/spine-unity/SkeletonDataAsset.cs
2015-03-29 18:26:05 +02:00
NathanSweet
1ccef4f1cf SkeletonDataAsset can now parse binary files.
Left benchmark code commented out.
2015-03-29 17:54:08 +02:00
Fenrisul
d5c68c5d7b Merge pull request #397 from Fenrisul/master
Implemented SkeletonBinary for spine-unity runtimes.
2015-03-28 21:35:27 -07:00
Fenrisul
4369f0ee6c Implemented SkeletonBinary for spine-unity runtimes. 2015-03-28 20:15:03 -07:00
NathanSweet
d0625e06a0 Added binary format support for C#.
Also fixed up line endings.
2015-03-29 00:49:31 +01:00
NathanSweet
f9e0e103b8 Fixed warnings. 2015-03-29 00:48:18 +01:00
NathanSweet
668534a687 Minor cleanup. 2015-03-29 00:46:01 +01:00
NathanSweet
451f7fd18d Updated raptor example data. 2015-03-29 00:45:39 +01:00
Fenrisul
4d8e00919d Merge pull request #396 from pharan/moreextensions
Added skeleton.SetColor to Unity SkeletonExtensions.
2015-03-28 10:10:17 -07:00
pharan
7bf9b0f524 Added skeleton.SetColor to Unity SkeletonExtensions. 2015-03-28 14:26:57 +08:00
NathanSweet
858ca30fd8 Update for latest libgdx. 2015-03-27 01:41:59 +01:00
NathanSweet
adb30b2fa9 Merge remote-tracking branch 'origin/master' 2015-03-27 01:41:47 +01:00
NathanSweet
0402396c62 Javadocs. 2015-03-19 02:56:52 +01:00
Fenrisul
ceff50030c Merge pull request #390 from Fenrisul/master
Temporary patchjob for SkeletonUtility Submeshes
2015-03-16 18:06:09 -07:00
Fenrisul
974ae1d640 Formatting cleanup 2015-03-16 18:03:40 -07:00
Fenrisul
1f0a23a9aa Temporary patch job for SkeletonUtilitySubmeshRenderer 2015-03-16 18:03:06 -07:00
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