yangxiao eccfbe5c59 merge bundle modification		2014-11-19 10:09:30 +08:00
..
2d	Merge pull request #9052 from huangshiwu/v3_fixbug	2014-11-07 10:33:08 +08:00
3d	merge bundle modification	2014-11-19 10:09:30 +08:00
audio	Fixed incorrect file path of audio resource in AudioEngine on Android.	2014-10-21 18:34:05 +08:00
base	Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization	2014-11-05 17:51:58 +08:00
deprecated	Multi platform cmake support	2014-10-03 23:21:45 +01:00
editor-support	Merge pull request #8977 from pipu/v3_Modify_TextReader	2014-11-11 12:05:49 +08:00
math	Add greater than operator to Vec2	2014-10-24 20:27:06 +01:00
network	Cleanup order of fields initialization.	2014-10-30 17:28:41 +03:00
physics	try to fix ubuntu 12.04 compile error	2014-10-10 17:27:15 +08:00
platform	Merge pull request #9005 from joshuastray/add-resource-folder-def	2014-11-07 10:25:14 +08:00
renderer	fixes some compiler warnings	2014-11-06 12:25:55 -08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-11-09 15:33:08 +00:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	fix scale9sprite flip issue	2014-11-07 11:09:22 +08:00
Android.mk	Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d	2014-10-20 16:25:24 +08:00
CMakeLists.txt	add needed link library for linux	2014-10-18 15:40:47 +08:00
cocos2d.cpp	[ci skip]update version	2014-10-16 15:41:43 +08:00
cocos2d.h	Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d	2014-10-20 16:25:24 +08:00