59 Commits

Author	SHA1	Message	Date
WuHuan	668c4b83ef	Merge pull request #3 from cocos2d/develop ... update	2014-01-08 00:44:40 -08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
WuHuan	e972c97dcf	support mingw	2014-01-04 14:40:22 +08:00
James Chen	79700118db	Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole ... Conflicts: cocos/base/CCConsole.cpp cocos/base/CCConsole.h	2013-12-05 16:26:04 +08:00
James Chen	2b857ebb52	Fixing compilation errors on windows.	2013-12-05 16:09:38 +08:00
Ricardo Quesada	73321199b9	Console: commands receives the char* ... The char* is passed in case the commands need to sub-parse the arguments. Very useful for QA. For example, the could create a command called "click", and the command could receive arguments.	2013-12-04 21:51:08 -08:00
Ricardo Quesada	49b25231f2	Compiles on Android	2013-12-04 19:16:01 -08:00
Ricardo Quesada	15321a58df	fixes compiler errors on Linux	2013-12-04 18:28:09 -08:00
Ricardo Quesada	f42aef0af8	Moves CCConsole.* to base/	2013-12-04 18:09:23 -08:00