minggo 7d33aef5cb Merge pull request #8156 from samuele3hu/v3_check_lua ... Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector		2014-09-26 11:49:09 +08:00
..
2d	Merge pull request #8139 from tttreal/label-getStringNumLines-bugfix	2014-09-25 14:44:28 +08:00
3d	Merge pull request #8106 from super626/v3	2014-09-19 16:16:33 +08:00
audio	fix noise on mac	2014-09-22 16:59:24 +08:00
base	CC_USE_MEM_LEAK_DETECTION -> CC_REF_LEAK_DETECTION	2014-09-26 10:44:29 +08:00
deprecated	Adds MARK: TODO: FIXME: in code	2014-08-29 12:54:24 -07:00
editor-support	remove deprecated warning	2014-09-12 17:06:13 +08:00
math	neon works on android(only on armeabi-v7a)	2014-09-25 16:09:28 +08:00
network	Rename setSSLVerification	2014-09-14 00:28:11 +09:00
physics	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
platform	reverse target=android-10 on android	2014-09-25 16:54:33 +08:00
renderer	add comment	2014-09-18 12:04:42 +08:00
scripting/lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_lua	2014-09-25 15:17:55 +08:00
storage/local-storage	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
ui	remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp	2014-09-24 17:47:38 +08:00
Android.mk	neon works on android(only on armeabi-v7a)	2014-09-25 16:09:28 +08:00
CMakeLists.txt	fix compile on ubuntu.	2014-09-21 23:49:43 +08:00
cocos2d.cpp	[ci skip]update version info	2014-09-19 21:54:01 +08:00
cocos2d.h	merge cocos	2014-09-10 10:28:59 +08:00