13 Commits

Author	SHA1	Message	Date
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
boyu0	e07c4ffec1	Change NULL to nullptr, edit hungarian notation.	2013-12-18 17:47:20 +08:00
minggo	fa7c97171b	fix some warnings	2013-12-06 16:32:06 +08:00
minggo	b67d567a79	replace long with int or ssize_t	2013-12-05 17:22:22 +08:00
Ricardo Quesada	9b52af010d	Macro CC_DISABLE_COPY is renamed to CC_DISALLOW_COPY_AND_ASSIGN ... and the old CC_DISALLOW_COPY_AND_ASSIGN is removed	2013-11-22 16:09:05 -08:00
bmanGH	9893fbc514	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into fix_touch_retain ... Conflicts: cocos2dx/platform/CCEGLViewProtocol.cpp	2013-11-12 19:24:09 +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
Ricardo Quesada	0350ac7021	arm64 support	2013-11-04 11:53:40 -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	27b71ba73c	Use integer as event type and listener type.	2013-10-25 10:53:47 +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	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00