11 Commits

Author	SHA1	Message	Date
yinkaile	9f67ea786e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-11-11 14:57:20 +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
boyu0	6c1144ee79	issue #2770: fix some warning	2013-11-11 12:49:38 +08:00
2youyou2	fcf0b1ef5f	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-11-06 16:06:37 +08:00
Ricardo Quesada	84a6aa29cd	Adds more 64-bit fixes ... Replaces more `int` with `long` where it makes sense. Also , it repalces some `unsigned long` with `long` for "lenght" values as described in our c++ guideline	2013-11-05 17:36:44 -08:00
2youyou2	3eef64c3b8	1. Change NULL to null ... 2. Remove CocoStudio/Armature files	2013-11-05 15:32:13 +08:00
2youyou2	25196072f2	1. change color json format ... 2. fix tween easing 3. fix CCBone crate bug	2013-11-05 11:57:20 +08:00
2youyou2	005d3c0121	1. fix if frame event is at the last frame, it may emit event several times ... 2. add method for removing single data info 3. add test TEST_DIRECT_LOADING 4. add test TEST_FRAME_EVENT 5. add method for getting calculated collider vertex	2013-10-31 17:28:14 +08:00
yinkaile	80b97be6f4	update develop	2013-10-30 11:34:16 +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