yangxiao d23eb83ba1 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3		2014-12-31 11:40:37 +08:00
..
2d	added missing files	2014-12-30 17:27:37 -08:00
3d	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2014-12-31 11:40:37 +08:00
audio	AudioEngine-win32.ccp: Switch OpenAL include paths based on OPENAL_PLAINS_INCLUDES.	2014-12-19 16:50:47 -05:00
base	added missing inet_pton() for windows phone	2014-12-30 16:39:26 -08:00
deprecated	Multi platform cmake support	2014-10-03 23:21:45 +01:00
editor-support	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into armaturenodefix	2014-12-31 04:06:11 +08:00
math	performance improvement	2014-12-04 18:37:57 +08:00
network	Merge pull request #8922 from TimothyZhang/do-not-lock-when-no-message-in-websocket	2014-12-25 14:09:35 +08:00
physics	try to fix ubuntu 12.04 compile error	2014-10-10 17:27:15 +08:00
platform	fixed check for header already included	2014-12-30 16:39:02 -08:00
renderer	Merge pull request #9720 from dabingnn/v3_perf	2014-12-31 10:02:59 +08:00
scripting/lua-bindings	Merge pull request #9709 from htlxyz/v3_origin	2014-12-30 18:32:20 +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	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum	2014-12-26 13:42:13 +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