axmol/cocos
pandamicro d155d42c0e Merge pull request #12617 from yangws/issue_8194
Fixbug :EventDispatcher wrong dispatch order
2015-07-02 14:42:30 +08:00
..
2d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest 2015-07-01 14:58:06 +08:00
3d Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest 2015-07-01 14:47:42 +08:00
audio AudioEngine:Fixed play audio may fail(error code:-1) on iOS 2015-06-30 15:38:24 +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 Merged changes from "Vibrate support in v4" into v3 branch. 2015-06-26 01:02:44 +02:00
renderer remove unused variable 2015-06-25 15:05:21 +08:00
scripting Merge pull request #12598 from shinhirota/v3 2015-07-01 11:34:03 +08:00
storage issue #12078: added storage group. 2015-05-28 15:48:08 +08:00
ui Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest 2015-07-01 14:47:42 +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 2015-06-19 09:56:19 +08:00
cocos2d.h Merge remote-tracking branch 'origin' into fix_spritepolygon2 2015-06-12 16:28:41 +08:00