11 Commits

Author	SHA1	Message	Date
James Chen	b0af2667f8	Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole ... Conflicts: cocos/scripting/auto-generated	2013-12-05 12:48:32 +08:00
Ricardo Quesada	4aae44f1e9	fixes cocos2d.h include	2013-12-04 18:54:15 -08:00
Ricardo Quesada	f42aef0af8	Moves CCConsole.* to base/	2013-12-04 18:09:23 -08:00
James Chen	76896d70d0	issue #2790: Android build was ok, fixes some warnings.	2013-12-04 16:02:54 +08:00
James Chen	d2bddee11e	issue #2790: Adds CCMap.h.	2013-12-04 16:01:56 +08:00
James Chen	c152652c5b	issue #2790: Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr).	2013-12-04 15:56:08 +08:00
Ricardo Quesada	a34352cef7	Console is working!	2013-12-03 18:46:54 -08:00
Nite Luo	fe04448c8d	Merge folder changes from develop	2013-10-30 23:19:36 -07:00
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +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