axmol/cocos
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
..
2d Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
3d Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
audio Compiles in Win32 2014-09-09 18:07:24 -07:00
base merge cocos 2014-09-10 10:28:59 +08:00
deprecated Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
editor-support Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
math Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
network Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
physics Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
platform Android properties back to 10 2014-09-09 18:46:47 -07:00
renderer merge cocos 2014-09-10 10:28:59 +08:00
scripting/lua-bindings [AUTO]: updating luabinding automatically 2014-09-10 01:52:43 +00:00
storage/local-storage Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
ui compiles on wp8 2014-09-09 18:22:11 -07:00
Android.mk Merge branch 'v3' into addChipmunkStaticLib 2014-09-10 10:00:15 +08:00
CMakeLists.txt modify linux cmakelist 2014-09-09 22:59:55 -07:00
cocos2d-prefix.pch add cocos2d.h into pre-compiled header 2014-08-26 16:45:24 +08:00
cocos2d.cpp Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
cocos2d.h merge cocos 2014-09-10 10:28:59 +08:00