axmol/cocos
yangxiao c65e5d6872 simplify shader, bath sprite3D render 2014-06-23 19:08:26 +08:00
..
2d Merge branch 'newcode' into v3 2014-06-20 22:55:27 +08:00
3d simplify shader, bath sprite3D render 2014-06-23 19:08:26 +08:00
audio Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
base CCLOGINFO compilation fix 2014-06-19 20:59:08 +04:00
deprecated CCLOGINFO compilation fix 2014-06-19 20:59:08 +04:00
editor-support Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
math Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
network Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
physics closed #4944: fixed bug: physics engine crashes occasionally when remove bodies at physics contact callback. 2014-05-21 16:07:49 +08:00
platform CCLOGINFO compilation fix 2014-06-19 20:59:08 +04:00
renderer simplify shader, bath sprite3D render 2014-06-23 19:08:26 +08:00
scripting/lua-bindings Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
storage Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
ui Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
Android.mk change speed 2014-06-17 13:45:58 +08:00
CMakeLists.txt Squashed commit of the following: 2014-05-18 14:49:16 -07:00
cocos2d-prefix.pch Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d.cpp [ci skip] 2014-06-17 18:42:10 +08:00
cocos2d.h change ActionTimeline to cocostudio ActionTimeline folder 2014-06-13 18:51:32 +08:00