minggo bb9fb9f0d6 Merge pull request #9591 from liamcindy/Layout ... update for lay out		2014-12-24 14:27:08 +08:00
..
2d	Merge pull request #9600 from huangshiwu/v3_allocator_wp	2014-12-24 10:54:16 +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 #9600 from huangshiwu/v3_allocator_wp	2014-12-24 10:54:16 +08:00
deprecated	Multi platform cmake support	2014-10-03 23:21:45 +01:00
editor-support	update for code format	2014-12-24 10:56:01 +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	fix webp format premultipliedAlpha error	2014-12-17 14:21:46 +08:00
renderer	comment line 83	2014-12-18 13:49:54 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-12-23 06:49:30 +00:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge pull request #9591 from liamcindy/Layout	2014-12-24 14:27:08 +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]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