10 Commits

Author	SHA1	Message	Date
Ricardo Quesada	d0dbf34319	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
James Chen	1d852788e2	[Spine] Saves old transform matrix in Skeleton::draw, uses it in ::onDraw.	2014-01-07 21:40:06 +08:00
James Chen	9387e516be	[JSB] Fix for SpineTest didn’t show anything. Skeleton uses new renderer.	2014-01-07 21:19:51 +08:00
James Chen	538da31773	Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.	2013-12-25 11:18:14 +08:00
James Chen	6bbc6e2dde	CCSkeleton is inherited from Node now.	2013-12-23 21:12:58 +08:00
James Chen	df85ba8fd9	Merge commit 'refs/pull/4545/head' of git://github.com/cocos2d/cocos2d-x into new-spine ... Conflicts: cocos/editor-support/spine/CCSkeleton.h	2013-12-19 21:07:24 +08:00
byeonggee.seo	e673bd80bb	new spine runtime applied	2013-12-19 10:50:37 +09:00
boyu0	af5f496861	issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.	2013-12-06 18:07:16 +08:00
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00