yinjimmy 7d430742f1 Merge branch 'bugfix_executeScriptFile' into combine		2015-01-07 15:33:15 +08:00
..
2d	Merge pull request #9830 from huangshiwu/v3_drawNode_fixbug	2015-01-07 14:46:13 +08:00
3d	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2014-12-31 11:40:37 +08:00
audio	Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID	2014-12-31 20:51:45 -04:00
base	Merge pull request #9746 from pandamicro/v3_origin	2014-12-31 15:50:33 +08:00
deprecated	Multi platform cmake support	2014-10-03 23:21:45 +01:00
editor-support	Bug fix:When parsing a plist file as image mergin, if in fact the plist file is a particle, a crush will occur.	2015-01-05 16:59:09 +08:00
math	performance improvement	2014-12-04 18:37:57 +08:00
network	Merge pull request #9775 from huangshiwu/iosnetwork-fixbug	2015-01-04 14:45:18 +08:00
physics	Update project	2015-01-06 14:40:15 +08:00
platform	class rename for EGLConfigChooser	2015-01-06 16:18:01 +08:00
renderer	code adjust, delay deprecated flag specification	2015-01-05 13:52:22 +08:00
scripting/lua-bindings	Merge branch 'bugfix_executeScriptFile' into combine	2015-01-07 15:33:15 +08:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge pull request #9634 from andyque/fixIssue9628	2014-12-29 11:24:36 +08:00
Android.mk	Update project	2015-01-06 14:40:15 +08:00
CMakeLists.txt	update external config to v3-deps-28.zip and update cocos2d-x version to rc2	2014-12-04 14:23:44 +08:00
cocos2d.cpp	[ci skip]	2014-12-24 15:35:58 +08:00
cocos2d.h	lua binding	2014-12-24 15:09:26 +08:00