raydelto e20c347767 Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID		2014-12-31 20:51:45 -04:00
..
2d	added base/allocator files	2014-12-30 21:41:46 -08:00
3d	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2014-12-31 11:40:37 +08:00
audio	Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID	2014-12-31 20:51:45 -04:00
base	Merge pull request #9746 from pandamicro/v3_origin	2014-12-31 15:50:33 +08:00
deprecated	Multi platform cmake support	2014-10-03 23:21:45 +01:00
editor-support	Updated the version check description.	2014-12-31 16:01:11 +08:00
math	performance improvement	2014-12-04 18:37:57 +08:00
network	Merge pull request #9727 from samuele3hu/v3_4_httpclient	2014-12-31 13:00:04 +08:00
physics	try to fix ubuntu 12.04 compile error	2014-10-10 17:27:15 +08:00
platform	Merge branch 'v3' into wp8-fix2	2014-12-30 21:25:54 -08:00
renderer	Merge pull request #9720 from dabingnn/v3_perf	2014-12-31 10:02:59 +08:00
scripting/lua-bindings	fix framework on iOS	2014-12-31 18:01:03 +08:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge pull request #9634 from andyque/fixIssue9628	2014-12-29 11:24:36 +08:00
Android.mk	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum	2014-12-26 13:42:13 +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	lua binding	2014-12-24 15:09:26 +08:00