kaile.yin 9fdd8cee06 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp		2014-12-09 16:03:33 +08:00
..
2d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-12-05 14:42:25 +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	CCRANDOM_() uses std::rand() because it can be seeded with std::srand()	2014-11-26 20:07:42 -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-09 16:03:33 +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	Merge pull request #9401 from minggo/iss9398-not-close-dir	2014-12-08 18:10:41 +08:00
renderer	Merge pull request #9377 from dabingnn/v3.3Perf	2014-12-04 21:08:24 +08:00
scripting/lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-12-09 13:33:39 +08:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	update for cocos reader	2014-12-05 19:19:53 +08:00
Android.mk	Delete that use protocol buffers	2014-12-01 12:46:29 +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-04 15:36:09 +08:00
cocos2d.h	Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d	2014-10-20 16:25:24 +08:00