yangxiao b0a6720cb2 reset auto lua, fix #9515		2014-12-26 15:52:27 +08:00
..
2d	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum	2014-12-26 13:42:13 +08:00
3d	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum	2014-12-26 13:42:13 +08:00
audio	AudioEngine-win32.ccp: Switch OpenAL include paths based on OPENAL_PLAINS_INCLUDES.	2014-12-19 16:50:47 -05:00
base	Merge pull request #9619 from yinjimmy/trackLogForWindows	2014-12-26 09:28:23 +08:00
deprecated	Multi platform cmake support	2014-10-03 23:21:45 +01:00
editor-support	update for cocos reader	2014-12-25 15:02:22 +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	Merge pull request #9636 from musikov/v3-language	2014-12-26 09:31:57 +08:00
renderer	comment line 83	2014-12-18 13:49:54 +08:00
scripting/lua-bindings	reset auto lua, fix #9515	2014-12-26 15:52:27 +08:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge pull request #9626 from liamcindy/CocoReader	2014-12-26 09:29:37 +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