andyque 19dc8b5d19 fix conflicts and wp8, wp8.1 linker error		2014-12-25 18:11:59 +08:00
..
2d	fix conflicts and wp8, wp8.1 linker error	2014-12-25 18:11:59 +08:00
3d	Merge pull request #9595 from super626/v3	2014-12-24 10:31:44 +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 #9601 from minggo/set-glcolor	2014-12-24 14:45:43 +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 v3	2014-12-25 12:09:31 +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	fix ci compile error	2014-12-25 15:38:51 +08:00
renderer	comment line 83	2014-12-18 13:49:54 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-12-25 06:14:03 +00:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge branch 'v3' into modifyWidgetDefaultBehavior	2014-12-25 18:08:07 +08:00
Android.mk	merge cocos	2014-12-23 10:35:35 +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	Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d	2014-10-20 16:25:24 +08:00