axmol/cocos
samuele3hu b17ce5c1d0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_tip 2014-08-29 13:57:19 +08:00
..
2d Merge pull request #7906 from Teivaz/v3_WP8 2014-08-29 10:03:25 +08:00
3d Merge pull request #7892 from Dhilan007/v3-androidmk 2014-08-28 10:16:39 +08:00
audio Merge pull request #7892 from Dhilan007/v3-androidmk 2014-08-28 10:16:39 +08:00
base Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
deprecated Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
editor-support Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_tip 2014-08-29 13:57:19 +08:00
math - added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file) 2014-08-15 13:20:37 +03:00
network Merge pull request #7892 from Dhilan007/v3-androidmk 2014-08-28 10:16:39 +08:00
physics Merge pull request #7900 from minggo/setposition-optimize 2014-08-28 14:31:54 +08:00
platform add web view javascript support 2014-08-29 11:50:08 +08:00
renderer Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
scripting/lua-bindings [AUTO]: updating luabinding automatically 2014-08-28 08:58:52 +00:00
storage/local-storage Adjust android.mk for cocos2d and related module 2014-08-27 23:26:08 +08:00
ui rename webview to UIWebView 2014-08-29 11:28:28 +08:00
Android.mk Adjust android.mk for cocos2d and related module 2014-08-27 23:26:08 +08:00
CMakeLists.txt fix linux 2014-08-29 11:53:39 +08:00
cocos2d-prefix.pch add cocos2d.h into pre-compiled header 2014-08-26 16:45:24 +08: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