mannewalis 6b1f994c40 turn off global new delete		2014-12-17 13:55:14 -05:00
..
2d	Merge pull request #9501 from joewan/v3-fix-mismatch	2014-12-16 18:28:36 +08:00
3d	Merge pull request #171 from tangziwen/v3	2014-12-08 09:34:58 +07:00
audio	Code conforms with the cocos2d-x c++ guidelines	2014-11-25 17:53:52 -08:00
base	turn off global new delete	2014-12-17 13:55:14 -05:00
deprecated	Multi platform cmake support	2014-10-03 23:21:45 +01:00
editor-support	Merge pull request #9453 from sxd1140/v3	2014-12-17 18:32:04 +08:00
math	performance improvement	2014-12-04 18:37:57 +08:00
network	Code conforms with the cocos2d-x c++ guidelines	2014-11-25 17:53:52 -08:00
physics	try to fix ubuntu 12.04 compile error	2014-10-10 17:27:15 +08:00
platform	reverting android properties change	2014-12-15 16:31:22 -08:00
renderer	Merge pull request #175 from lvlonggame/v3	2014-12-12 09:52:01 +07:00
scripting/lua-bindings	Synchronize the KeyCode Enum to Lua	2014-12-17 11:27:01 +08:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge pull request #9519 from andyque/addNewRequirements	2014-12-17 09:53:31 +08:00
Android.mk	android fixes	2014-12-15 16:21:12 -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	2014-12-11 18:14:28 +08:00
cocos2d.h	Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d	2014-10-20 16:25:24 +08:00