minggo 60ef01b870 Merge pull request #11394 from giginet/intersects-circle ... Implement Rect::intersectsCircle		2015-04-14 18:10:16 +08:00
..
2d	Merge pull request #11414 from likexx/patch-1	2015-04-14 10:06:09 +08:00
3d	merge cocos resolve conflict	2015-04-14 13:56:05 +08:00
audio	Merge pull request #11224 from hawkwood/patch-7	2015-04-09 18:36:07 +08:00
base	=cocos2d namespace added macros	2015-04-11 10:45:19 +03:00
deprecated	Optimize Vec3	2015-04-05 13:09:50 +03:00
editor-support	update spine runtime to v2.1.25	2015-04-14 15:23:16 +08:00
math	Implement Rect::intersectsCircle	2015-04-13 23:16:06 +09:00
network	[ci skip]Update comments.	2015-03-27 18:26:14 +08:00
physics	Physics: Fixed the rotation of physics body is wrong if the rotation for node is set before body attached.	2015-04-10 17:01:21 +08:00
platform	Merge branch 'v3' into v3-wp8-fix	2015-04-08 07:29:45 -07:00
renderer	merge cocos resolve conflict	2015-04-14 13:56:05 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2015-04-14 09:10:16 +00:00
storage	[ci skip]Update comments	2015-03-24 14:12:58 +08:00
ui	fix edge case crash	2015-04-14 15:34:15 +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-14 10:46:20 +08:00
cocos2d.h	[ci skip] update version	2015-04-07 10:35:49 +08:00