Dale Stammen 272bb35246 Merge branch 'v3' into v3-wp8-fix		2015-04-08 07:29:45 -07:00
..
2d	fix wp8 compile issue	2015-04-08 18:01:56 +08:00
3d	modify getAABBRecursively	2015-04-08 16:40:04 +08:00
audio	Fix iOS 5.1.1 crash caused by interruptionHandler	2015-04-03 15:57:47 -07:00
base	Performance: Fixed lag if Director::setContentScaleFactor is called frequently	2015-04-02 23:35:56 +08:00
deprecated	Optimize Vec3	2015-04-05 13:09:50 +03:00
editor-support	Merge pull request #11336 from xiaofeng11/v3	2015-04-08 18:40:32 +08:00
math	Optimize Vec3	2015-04-05 13:09:50 +03:00
network	[ci skip]Update comments.	2015-03-27 18:26:14 +08:00
physics	Update comment for Lua	2015-03-30 15:47:47 +08:00
platform	Merge branch 'v3' into v3-wp8-fix	2015-04-08 07:29:45 -07:00
renderer	Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3	2015-04-07 14:04:57 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2015-04-08 03:52:03 +00:00
storage	[ci skip]Update comments	2015-03-24 14:12:58 +08:00
ui	Merge pull request #10909 from babcca/webview_ios_load_data_fix	2015-04-08 14:34:42 +08:00
Android.mk	use prebuilt zlib for android and mac	2015-04-07 23:20:02 +08:00
CMakeLists.txt	fix typo	2015-03-05 17:05:08 +08:00
cocos2d.cpp	[ci skip] update version	2015-04-07 10:36:38 +08:00
cocos2d.h	[ci skip] update version	2015-04-07 10:35:49 +08:00