WenhaiLin 05522afaa1 Fixed warn		2015-06-18 14:24:52 +08:00
..
2d	Fixed warn	2015-06-18 14:24:52 +08:00
3d	Merge pull request #12363 from super626/v3	2015-06-17 17:49:39 +08:00
audio	Merge pull request #12080 from linshun/v3	2015-06-15 12:45:11 +08:00
base	Merge pull request #12349 from WenhaiLin/v3-37-NotificationNode-crashfix	2015-06-16 09:53:39 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	GBKToUTF8	2015-06-17 13:16:06 +08:00
math	Finished AutoPolygon and Sprite	2015-06-04 15:43:31 +08:00
navmesh	remove unused code, and use nullptr for pointer	2015-06-16 11:15:39 +08:00
network	Merge pull request #12174 from pajeroquan/v3	2015-06-17 15:14:36 +08:00
physics	issue #12078: added subgroup of physics 2d.	2015-06-15 10:28:37 +08:00
physics3d	Removes not-needed draws	2015-06-15 10:40:47 -07:00
platform	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon	2015-06-15 16:13:36 +08:00
renderer	Merge pull request #12361 from dabingnn/v3_androidBugForVertexAttrib	2015-06-17 09:34:47 +08:00
scripting	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-17 07:18:18 +00:00
storage	issue #12078: added storage group.	2015-05-28 15:48:08 +08:00
ui	Removes not-needed draws	2015-06-15 10:40:47 -07:00
Android.mk	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon	2015-06-15 16:13:36 +08:00
CMakeLists.txt	add clipper to cmakelist	2015-06-16 17:09:27 +08:00
cocos2d.cpp	Material uses new file format	2015-05-11 21:31:33 -07:00
cocos2d.h	Merge remote-tracking branch 'origin' into fix_spritepolygon2	2015-06-12 16:28:41 +08:00