axmol/cocos
minggo e0ef4d16d3 Merge pull request #7724 from cpascal/fix_ime
Fix a correct onGLFWCharCallback
2014-08-11 16:18:59 +08:00
..
2d Merge pull request #7729 from andyque/fixCascadedColor 2014-08-11 15:33:36 +08:00
3d remove DrawNode3D 2014-08-08 15:06:45 +08:00
audio Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix 2014-08-07 11:58:01 +08:00
base Merge pull request #7702 from super626/v3_merge 2014-08-08 15:56:38 +08:00
deprecated Merge branch 'v3' into v3_dll 2014-07-17 14:12:10 +08:00
editor-support Make CMake More Robust 2014-08-06 15:43:19 +01:00
math add Quaternion::ZERO 2014-07-31 18:36:30 +08:00
network Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-07 14:02:50 +08:00
physics fix typo 2014-08-08 16:56:48 +08:00
platform Fix a correct onGLFWCharCallback 2014-08-10 01:42:21 +09:00
renderer Make CMake More Robust 2014-08-06 15:43:19 +01:00
scripting/lua-bindings Merge pull request #7720 from samuele3hu/v3_module 2014-08-11 15:01:28 +08:00
storage Update CMakeLists.txt for storage 2014-08-07 15:07:29 +08:00
ui fixed Widget's Children reload textures change RGBA issue 2014-08-11 15:04:00 +08:00
Android.mk remove DrawNode3D 2014-08-08 15:06:45 +08:00
CMakeLists.txt Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-07 14:02:50 +08:00
cocos2d-prefix.pch
cocos2d.cpp add missed CC_DLL for cocos2dVersion function 2014-08-11 15:50:48 +08:00
cocos2d.h remove DrawNode3D 2014-08-08 15:06:45 +08:00