minggo abc6511ceb Merge pull request #10125 from samuele3hu/v3_4_issue9537 ... issue #10107: Binding AnimationInfo to lua		2015-01-21 11:02:11 +08:00
..
2d	Merge pull request #10090 from Dhilan007/v3-issue10089	2015-01-21 10:51:27 +08:00
3d	Refactor draw command	2015-01-15 14:00:49 -08:00
audio	Integrate CocosPlayClient	2015-01-13 17:30:07 +08:00
base	Merge pull request #10103 from damorton/v3	2015-01-20 16:09:35 +08:00
deprecated	comments	2015-01-06 14:45:10 +03:00
editor-support	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version_1	2015-01-20 14:35:15 +08:00
math	performance improvement	2014-12-04 18:37:57 +08:00
network	fix websocket dead lock	2015-01-16 18:43:57 +08:00
physics	Fixed fail to query the shapes which add to PhysicsWorld in the current frame	2015-01-16 14:22:16 +08:00
platform	Merge pull request #10090 from Dhilan007/v3-issue10089	2015-01-21 10:51:27 +08:00
renderer	Merge branch 'v3' into FixCrashOnWin32	2015-01-20 18:09:11 +08:00
scripting/lua-bindings	Merge pull request #10125 from samuele3hu/v3_4_issue9537	2015-01-21 11:02:11 +08:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge pull request #10113 from liamcindy/Scale9Error	2015-01-21 10:51:55 +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] update version	2015-01-19 09:50:19 +08:00
cocos2d.h	[ci skip]update version	2015-01-13 16:35:45 +08:00