axmol/cocos
pandamicro 6110700615 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend 2015-07-23 15:25:33 +08:00
..
2d Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have small errors 2015-07-23 11:01:51 +08:00
3d Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
audio Fixed compile error 2015-07-10 14:43:28 +08:00
base Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
deprecated Optimize Vec2 2015-04-19 20:40:52 +03:00
editor-support fix tons of warnings 2015-07-15 12:04:48 +08:00
math Finished AutoPolygon and Sprite 2015-06-04 15:43:31 +08:00
navmesh fix tons of warnings 2015-07-15 12:04:48 +08:00
network refine NSLog in HttpAsynConnection in release mode. 2015-07-17 14:23:51 +08:00
physics Circle shape debug draw bug 2015-06-23 15:50:42 +02:00
physics3d Removes not-needed draws 2015-06-15 10:40:47 -07:00
platform Merge pull request #12762 from yangws/issue_10759 2015-07-21 10:47:55 +08:00
renderer remove EMSCRIPTEN related code 2015-07-16 14:15:41 +08:00
scripting Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend 2015-07-23 15:25:33 +08:00
storage issue #12078: added storage group. 2015-05-28 15:48:08 +08:00
ui Merge pull request #12885 from zilongshanren/add-jumpToPage-api 2015-07-22 15:01:57 +08:00
Android.mk Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 22:00:57 +08:00
CMakeLists.txt add clipper to cmakelist 2015-06-16 17:09:27 +08:00
cocos2d.cpp Update versions and docs for v3.7 2015-07-16 16:53:43 +08:00
cocos2d.h Merge remote-tracking branch 'origin' into fix_spritepolygon2 2015-06-12 16:28:41 +08:00