axmol/cocos
Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-17 13:04:24 +08:00
..
2d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 2015-06-17 13:04:24 +08:00
3d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 2015-06-15 16:13:36 +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 added librecast. Updated build properties 2015-06-15 18:44:14 -07: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 #12080 from linshun/v3 2015-06-15 12:45:11 +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 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 2015-06-17 13:04:24 +08: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