Commit Graph

22 Commits

Author SHA1 Message Date
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
James Chen 26efb4bf5c long —> ssize_t for some classes. 2014-01-07 18:26:31 +08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
yinkaile 891d8c3a38 change comment 2013-12-26 16:48:19 +08:00
yinkaile c096743325 change comment 2013-12-26 14:57:38 +08:00
yinkaile 13408e4dc5 change play interface name 2013-12-25 16:46:31 +08:00
yinkaile ba809a0096 change const char* to const std::string& 2013-12-23 14:05:46 +08:00
yinkaile 324732b867 change play arguments 2013-12-18 23:29:54 +08:00
yinkaile 7be834ea37 change play arguments 2013-12-18 22:57:18 +08:00
yinkaile d3a575e8cc change for iterator and callfunc 2013-12-18 22:07:33 +08:00
yinkaile 581a7856de fixed compiler error 2013-12-17 19:32:16 +08:00
youyou 6a3aff0861 fixed change animation internal, animation speed not right 2013-12-13 15:58:58 +08:00
youyou e17b9d839b 1.add TEST_EASING
2.add play serveral movement function
3.update TEST_COLLIDER_DETECTOR
4.fixed movement event
2013-12-06 13:40:49 +08:00
samuele3 8a408f9951 Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
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 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 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 91eada6c1e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder 2013-10-16 16:50:46 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00