minggo 99f3b371ed Merge pull request #7744 from lite3/customguireader ... GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua		2014-09-04 10:53:00 +08:00
..
2d	Merge pull request #7680 from andyque/fixNormalizedPosition	2014-09-03 10:07:22 -07:00
3d	Merge pull request #125 from liuliang2004/Meshv3	2014-09-03 15:59:49 +08:00
audio	Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme	2014-08-29 12:55:14 -07:00
base	fix	2014-09-02 10:51:17 +08:00
deprecated	Adds MARK: TODO: FIXME: in code	2014-08-29 12:54:24 -07:00
editor-support	Merge pull request #7744 from lite3/customguireader	2014-09-04 10:53:00 +08:00
math	Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme	2014-08-29 12:55:14 -07:00
network	remove unneeded includes	2014-08-29 15:39:52 +08:00
physics	fix chipmunk	2014-08-30 21:09:28 +08:00
platform	Merge pull request #7934 from wohaaitinciu/loc_ver	2014-09-04 10:49:30 +08:00
renderer	Merge branch 'newcode' into v3	2014-09-01 15:11:27 +08:00
scripting/lua-bindings	Merge pull request #7744 from lite3/customguireader	2014-09-04 10:53:00 +08:00
storage/local-storage	Adjust android.mk for cocos2d and related module	2014-08-27 22:54:28 +08:00
ui	setPlaceholderFontSize fix	2014-09-03 23:38:44 +04:00
Android.mk	Adjust android.mk for cocos2d and related module	2014-08-27 22:54:28 +08:00
CMakeLists.txt	fix linux and android compile error	2014-09-01 17:43:40 +08:00
cocos2d-prefix.pch	add cocos2d.h into pre-compiled header	2014-08-26 16:45:24 +08:00
cocos2d.cpp	update version	2014-08-22 11:48:14 +08:00
cocos2d.h	Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.	2014-08-27 10:18:44 +08:00