zhangbin 1f491cf656 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb ... Conflicts: build/cocos2d-wp8.sln		2015-04-16 17:04:07 +08:00
..
2d	added Windows Image Component support for Windows 8.1 Universal App	2015-04-15 09:19:38 -07:00
3d	merge cocos resolve conflict	2015-04-14 13:56:05 +08:00
audio	removed WP8 project files	2015-04-15 07:13:54 -07:00
base	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb	2015-04-16 17:04:07 +08:00
deprecated	Optimize Vec3	2015-04-05 13:09:50 +03:00
editor-support	Merge pull request #11455 from xiaofeng11/v3	2015-04-16 14:37:22 +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' of github.com:cocos2d/cocos2d-x into v3-jsb	2015-04-16 17:04:07 +08:00
renderer	merge cocos resolve conflict	2015-04-14 13:56:05 +08:00
scripting	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb	2015-04-16 17:04:07 +08:00
storage	[ci skip]Update comments	2015-03-24 14:12:58 +08:00
ui	Merge pull request #11458 from andyque/fix-a-side-effect-of-button-memory-optimization	2015-04-16 16:15:25 +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