5 Commits

Author	SHA1	Message	Date
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +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	cf20329b71	issue #3069: Removing unused codes in UILayer.	2013-10-25 16:33:54 +08:00
James Chen	cfaef2a01a	Adding onEnterHook, onXXXHook for Node.	2013-10-25 10:53:45 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00