axmol/cocos
andyque 3d97ddc739 Merge branch 'v3' into addWebView
Conflicts:
	cocos/ui/Android.mk
2014-08-27 14:08:16 +08:00
..
2d Merge pull request #7887 from super626/v3 2014-08-27 13:39:13 +08:00
3d Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
audio Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
base Merge pull request #7879 from dabingnn/v3_fixLabelStatus 2014-08-26 14:51:08 +08:00
deprecated one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
editor-support Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
math - added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file) 2014-08-15 13:20:37 +03:00
network Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
physics one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
platform Merge branch 'v3' into addWebView 2014-08-27 14:08:16 +08:00
renderer 2d cull only for default camera 2014-08-27 12:09:23 +08:00
scripting/lua-bindings Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
storage/local-storage one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
ui Merge branch 'v3' into addWebView 2014-08-27 14:08:16 +08:00
Android.mk Merge branch 'v3' into addWebView 2014-08-27 14:08:16 +08:00
CMakeLists.txt improve test case and make program more robust 2014-08-27 08:02:22 +08:00
cocos2d-prefix.pch Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d.cpp update version 2014-08-22 11:48:14 +08:00
cocos2d.h Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00