1471 Commits

Author SHA1 Message Date
John
987f4a17d2 Fix 2D Projects breaking PMA atlases.
Disable alphaIsTransparency by default.
This will prevent 2D projects from causing PMA atlases to bleed colors into transparent areas.
2014-12-06 11:59:49 +08:00
pinguin999
a9f404a7e3 Merge remote-tracking branch 'upstream/master'
Conflicts:
	spine-c/include/spine/SkeletonData.h
2014-12-02 17:53:12 +01:00
Igor Mats
2725eff1c8 Some improvements. 2014-12-02 17:06:03 +02:00
Dario Segura
145aed328e Merge branch 'master' of github.com:EsotericSoftware/spine-runtimes into Trompo-JS-AtlasAttachmentLoader 2014-12-01 14:58:55 -05:00
Dario Segura
18584fc496 -[JAVASCRIPT] Atlas attachment loader was using the name as the path instead of the path passed to it. It would throw an exception using the path to report the error, making it extremely confusing. 2014-12-01 14:58:17 -05:00
NathanSweet
3ed63ef028 Moar boxes. 2014-11-30 12:42:23 +01:00
Igor Mats
22a0eb0c5f Cocos2d-x: changes for JSB support. 2014-11-28 08:43:52 +02:00
RandolphBurt
99c0282047 Fix goblin skeleton file references after file rename (Visual Studio Windows) 2014-11-25 17:07:45 +00:00
Randolph Burt
ecaea3ae12 Fix goblin skeleton file references after file rename (Xamarin iOS) 2014-11-25 16:54:09 +00:00
Dario Segura
a1783db250 -[JAVASCRIPT] Fixed nasty infinite loop bug. 2014-11-24 13:38:29 -05:00
Dario Segura
7ec398c4f5 -[JAVASCRIPT][SYNTAX] Fixes various syntax mistakes that prevented some files from loading. 2014-11-24 13:37:36 -05:00
NathanSweet
e38213fb67 Fixed NPE if file failed to load. 2014-11-24 02:16:38 +01:00
NathanSweet
9cb1a2852b Added bone width to debug renderer. 2014-11-24 02:16:24 +01:00
Dario Segura
19225fda79 -[JAVASCRIPT][MESHES] Fixed missing 'this' keywords in updateUVs functions + added support for typed arrays. 2014-11-21 17:05:01 -05:00
Dario Segura
f3108c33c7 -[JAVASCRIPT] Added support for typed arrays, useful for rendering with WebGL. 2014-11-21 17:04:49 -05:00
NathanSweet
cad68f30ff Organized spine-libgdx so tests and the skeleton viewer are separate. 2014-11-20 12:42:54 +01:00
NathanSweet
14c8484caa Fixed null check. 2014-11-20 11:40:18 +01:00
NathanSweet
8dc8f8f9e8 Added null checks for add/set animation.
closes #173
2014-11-19 18:02:14 +01:00
NathanSweet
60d724b7c4 Moved scheduleUpdate to onEnter, added unscheduleUpdate onExit.
closes #230
2014-11-19 17:56:44 +01:00
NathanSweet
abb3782e27 Fixed opacity with cascadeOpacityEnabled.
closes #237
2014-11-19 17:49:33 +01:00
NathanSweet
962321574c Added missing ctor.
closes #209
2014-11-19 17:40:22 +01:00
NathanSweet
fb214ee276 Updated spine-c struct definitions to allow for forward declarations. 2014-11-18 03:40:20 +01:00
NathanSweet
1fa410bb53 Fixed warnings. 2014-11-18 02:38:39 +01:00
NathanSweet
66dee75951 Fixed spine-lua IK timelines. 2014-11-17 23:06:52 +01:00
NathanSweet
97bc171bdd Merge remote-tracking branch 'origin/master' 2014-11-17 19:41:56 +01:00
NathanSweet
63801b6f13 setSkin docs. 2014-11-17 19:41:50 +01:00
Nathan Sweet
7b804f4197 Merge pull request #289 from zhongfq/master
Bugfixes in 64bit system
2014-11-17 14:26:00 +01:00
NathanSweet
7b3bc205fd Minor clean up. 2014-11-16 03:06:08 +01:00
NathanSweet
7c065a76e2 IK for spine-lua, spine-corona, spine-love. 2014-11-16 03:05:46 +01:00
NathanSweet
c3e8058208 Removed test flip timeline. 2014-11-16 00:33:09 +01:00
NathanSweet
3dbc1c5565 Merge remote-tracking branch 'origin/master' 2014-11-16 00:13:59 +01:00
NathanSweet
ee1f13ab9c Don't clear FFD if before first FFD key in animation.
Didn't make any sense. Any existing FFD should remain until time passes a key.
2014-11-16 00:13:37 +01:00
NathanSweet
31848ad22a Minor clean up. 2014-11-16 00:09:37 +01:00
NathanSweet
59204db7f8 Flip timelines for spine-lua, spine-corona, spine-love. 2014-11-16 00:05:01 +01:00
Nathan Sweet
8b870e3ae1 Merge pull request #299 from gadavid/master
Makefile(Linux and MingW support) for spine-c
2014-11-14 01:57:20 +01:00
NathanSweet
631add64fb Set spineboy as default. 2014-11-14 01:55:42 +01:00
NathanSweet
1ef7334c17 Merge remote-tracking branch 'origin/master' 2014-11-14 01:55:29 +01:00
NathanSweet
ecaace0f80 Many spine-js fixes, added hero example. 2014-11-14 01:48:42 +01:00
NathanSweet
9dcaeb6853 Clean up. 2014-11-14 01:47:39 +01:00
Nathan Sweet
5abfbe1200 Merge pull request #321 from ubiyf/master
Fix Bug : Can not build android apk, if not set char* as const.
2014-11-14 00:06:22 +01:00
Nathan Sweet
9a7dca6230 Merge pull request #323 from wangjian1009/master
load flipX flipY from json
2014-11-14 00:05:54 +01:00
NathanSweet
fbd9a2057e Better scale. 2014-11-13 01:17:45 +01:00
NathanSweet
378a413863 Updated spine-turbulenz example. 2014-11-13 00:50:33 +01:00
Nathan Sweet
8e024e9623 Update README.md 2014-11-13 00:48:09 +01:00
Nathan Sweet
9a27f11816 Update README.md 2014-11-13 00:47:52 +01:00
Nathan Sweet
634a3b92c4 Update README.md 2014-11-13 00:47:33 +01:00
NathanSweet
cb011c8400 Bug fixes. 2014-11-12 23:59:25 +01:00
NathanSweet
11633a0b22 IK and flip timelines for spine-js. 2014-11-12 21:22:51 +01:00
NathanSweet
efae035f18 Flip timelines for spine-as3 and spine-starling. 2014-11-12 19:38:43 +01:00
NathanSweet
322d8ed0ab Fixed first flip key not being applied. 2014-11-11 17:42:19 +01:00