163 Commits

Author	SHA1	Message	Date
boyu0	72f2d68edd	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-11-27 17:47:37 +08:00
boyu0	99d904363a	issue #2771: delete all the box2d implementation in physics parts.	2013-11-26 13:47:42 +08:00
Ricardo Quesada	cd0ba6850c	Merge branch 'develop' into constructors_are_protected	2013-11-14 11:57:18 -08:00
Ricardo Quesada	d590986e73	Constructors are protected	2013-11-13 15:55:36 -08:00
Ricardo Quesada	6b29391212	Adds markdown comments in the doxstrings ... Since Doxygen 1.8.0 (we are already using it), it is possible to add markdown comments in the doxygen strings. This will make our comments easier to read. This patch only adds markdown to CCNode.h as a test. If you like, I'll keep adding markdown comments as I see them. Please, encourage the rest of the team to do the same.	2013-11-11 20:21:01 -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	48ce5e39fe	EventDispatcher is managed by Director now, like Scheduler and ActionManager.	2013-10-26 15:04:01 +08:00
James Chen	1f3863e787	Event Dispatcher refactor commit. TestCpp could run.	2013-10-25 10:53:45 +08:00
James Chen	f7e2c63230	Refactor event dispatcher. Remove non-node relative member variables.	2013-10-25 10:53:45 +08:00
James Chen	cfaef2a01a	Adding onEnterHook, onXXXHook for Node.	2013-10-25 10:53:45 +08:00
boyu0	d12ee5f120	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-10-18 15:34:13 +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