16 Commits

Author	SHA1	Message	Date
yinkaile	2d3df69982	fix add display	2013-10-29 16:57: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	1f3863e787	Event Dispatcher refactor commit. TestCpp could run.	2013-10-25 10:53:45 +08:00
James Chen	cfaef2a01a	Adding onEnterHook, onXXXHook for Node.	2013-10-25 10:53:45 +08:00
minggo	d07d054a01	issue #2905:ndk-r8e build ok now	2013-10-23 17:44:20 +08:00
minggo	abcf8f268d	fix conflicts	2013-10-22 18:36:13 +08:00
minggo	6a664d480a	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
Dhilan007	232f0d598b	issues #2905:add new vs project	2013-10-21 22:21:11 +08:00
minggo	63c13d8eaa	issue #2905:simplify Android.mk dependence	2013-10-18 14:18:36 +08:00
minggo	e50f9fc43b	issue #2905: jsbinding samples and lua binding samples build ok on android	2013-10-17 15:04:30 +08:00
minggo	91eada6c1e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder	2013-10-16 16:50:46 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
James Chen	6fba0dd5db	issue #2905: [iOS Mac] TestJavascript works now.	2013-10-16 15:43:59 +08:00
James Chen	7dc8aeb156	issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix.	2013-10-16 11:19:01 +08:00
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00