axmol/cocos
pandamicro 38ded61568 Merge pull request #12670 from yangws/issue_8256
Fixbug: CCTargetedAction executes callback twice.
2015-07-03 22:34:54 +08:00
..
2d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-03 15:43:58 +08:00
3d Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 2015-07-03 10:23:49 +08:00
audio AudioEngine:Fixed play audio may fail when switch to new scene on iOS. 2015-07-01 17:19:28 +08:00
base Merge pull request #12617 from yangws/issue_8194 2015-07-02 14:42:30 +08:00
deprecated Optimize Vec2 2015-04-19 20:40:52 +03:00
editor-support Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest 2015-07-01 14:47:42 +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 pull request #12644 from WenhaiLin/v3-38-backevent-fix 2015-07-03 15:42:45 +08:00
renderer remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
scripting [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-03 10:37:33 +00:00
storage issue #12078: added storage group. 2015-05-28 15:48:08 +08:00
ui Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 2015-07-03 10:23:49 +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 engine version 2015-06-29 18:21:06 +08:00
cocos2d.h Merge remote-tracking branch 'origin' into fix_spritepolygon2 2015-06-12 16:28:41 +08:00