16 Commits

Author	SHA1	Message	Date
Ricardo Quesada	c386f88e32	Merge branch 'develop' into visit_draw_improved ... Conflicts: CHANGELOG cocos/gui/UILayout.h	2014-03-03 11:27:42 -08:00
yinkaile	8f1ba73a52	fixed add ParticleSystem display crashed	2014-03-03 14:56:56 +08:00
Ricardo Quesada	cdc19eea1c	Nodes: setAdditionalTransform() receives a pointer ... and not a const reference. If the pointer is `NULL`, then it won't use the additionalTransform	2014-03-01 08:26:54 -08:00
Ricardo Quesada	d0dbf34319	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
andyque	4a6e137389	fixed #3683. fixed convertToWorldSpaceAR of CCSkin returning error coordinate	2014-01-16 15:00:35 +08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
yinkaile	6ff45b09e7	Merge branch 'newRenderer' into Array ... Conflicts: cocos/editor-support/cocostudio/CCArmature.cpp cocos/editor-support/cocostudio/CCArmature.h cocos/editor-support/cocostudio/CCBatchNode.cpp cocos/editor-support/cocostudio/CCColliderDetector.cpp cocos/scripting/auto-generated tools/bindings-generator	2013-12-17 18:06:11 +08:00
youyou	917bd8c3d9	change Array to Vector	2013-12-13 19:40:38 +08:00
Ricardo Quesada	23222923bf	Migrated code to Matrix4	2013-12-10 11:07:15 -08:00
youyou	c96bc7b58d	fix collider Synchronization	2013-12-09 11:14:53 +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
2youyou2	12d6bc1722	1. change CCARRAY_FOREACH to range-based loop	2013-11-06 15:25:44 +08:00
2youyou2	f05c1590ae	1.fix particle kCCPositionTypeFree state bug	2013-11-06 11:20:16 +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