10 Commits

Author	SHA1	Message	Date
2youyou2	cdae8f51bc	Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop	2013-11-11 17:30:52 +08:00
2youyou2	528c257497	add setUserObject method to CCArmatureAnimation	2013-11-11 17:30:37 +08:00
yinkaile	0bb8714f86	Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop	2013-11-11 14:53:18 +08:00
yinkaile	5ba1e4ce10	1.remove compiler wornings ... 2.change void Bone::removeFromParent(bool recursion); to void Bone::removeFromParent();	2013-11-11 14:50:30 +08:00
2youyou2	0a72c3c1c2	1.when add a skin to last index, applay it's skindata to the previous skindata ... 2.Do not retain target when regist frame event and movement event	2013-11-11 13:33:47 +08:00
2youyou2	12d6bc1722	1. change CCARRAY_FOREACH to range-based loop	2013-11-06 15:25:44 +08:00
2youyou2	16c23d0ad3	remove CC_PROPERTY and CC_SYNTHESIZE.	2013-11-05 19:53:38 +08:00
2youyou2	3eef64c3b8	1. Change NULL to null ... 2. Remove CocoStudio/Armature files	2013-11-05 15:32:13 +08:00
yinkaile	8fa8b9f844	update develop	2013-10-30 09:41:40 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00