6 Commits

Author	SHA1	Message	Date
boyu0	e07c4ffec1	Change NULL to nullptr, edit hungarian notation.	2013-12-18 17:47:20 +08:00
Ricardo Quesada	b6f6e72c94	Merge branch 'develop' into constructors_are_protected ... Conflicts: cocos/2d/CCActionInstant.h	2013-11-25 13:59:24 -08:00
samuele3	192deb7952	issue #3228: Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case	2013-11-22 11:51:07 +08:00
Ricardo Quesada	515786a7ee	adds CC_DISALLOW_COPY_AND_ASSIGN() to Actilons ... ... and also moves the Contructor/Destrucotor/initXXX to `protected:`	2013-11-21 17:06:06 -08:00
minggo	982a23af3d	fix some hungarial	2013-11-16 21:08:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00