111 Commits

Author	SHA1	Message	Date
Ricardo Quesada	f68dcd9969	Merge branch 'develop' into newRenderer ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj samples/Cpp/TestCpp/Classes/tests.h	2013-12-05 11:47:46 -08:00
minggo	b67d567a79	replace long with int or ssize_t	2013-12-05 17:22:22 +08:00
Nite Luo	ae551ae294	Convert RenderTexture to use RenderCommands	2013-12-04 11:54:57 -08:00
James Chen	1d5984b29a	issue #2790: Vector::makeObjectsPerformCallback —> Vector::forEach	2013-12-04 16:01:02 +08:00
James Chen	90062b656d	issue #2790: Node::_children is Vector<Node*> now.	2013-12-04 16:00:17 +08:00
Ricardo Quesada	a583ad461f	CCControlButton has protected constructor	2013-11-14 17:19:16 -08:00
Huabing.Xu	b726c6fd2c	issue #3025: move VolatileTexture static function to VolatileTextureMgr	2013-11-08 16:47:33 +08:00
Ricardo Quesada	ba7ed6e578	Fixes some compiler warnings ... The warnings are related to: * 64-to-32-bit conversion * shadow variables	2013-11-04 16:31:36 -08:00
James Chen	1f3863e787	Event Dispatcher refactor commit. TestCpp could run.	2013-10-25 10:53:45 +08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00