axmol/cocos
minggo d223629477 Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture
add callback for RenderTexture::saveToFile
2014-08-13 10:05:08 +08:00
..
2d Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture 2014-08-13 10:05:08 +08:00
3d export MeshSkin as CC_DLL 2014-08-12 14:41:25 +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 #7740 from GavinThornton/v3 2014-08-13 09:39:17 +08:00
deprecated Merge branch 'v3' into v3_dll 2014-07-17 14:12:10 +08:00
editor-support fixed bone rotation isn't right 2014-08-11 19:53:51 +08: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 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step 2014-08-12 10:20:34 +08:00
platform Merge pull request #7733 from huangshiwu/v3_glviewfix 2014-08-12 09:51:27 +08:00
renderer add CC_DLL for primitive classes 2014-08-12 11:56:21 +08:00
scripting/lua-bindings [AUTO]: updating luabinding automatically 2014-08-12 02:08:16 +00:00
storage Update CMakeLists.txt for storage 2014-08-07 15:07:29 +08:00
ui add virtual destructor 2014-08-11 15:54:40 +08:00
Android.mk Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3 2014-08-11 14:37:43 +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 Squashed commit of the following: 2014-05-16 14:36:00 -07:00
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