axmol/cocos
pandamicro e2568b3a6f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
Conflicts:
	tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
..
2d Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory 2016-01-28 01:12:49 +08:00
3d Refactor CCBundle3D, remove wrong use of getDataFromFile. _jsonBuffer is std::string, _binaryBuffer is Data instance now. 2016-01-15 00:55:10 +08:00
audio Remove CocosPlayClient 2016-01-18 17:58:04 +08:00
base Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory 2016-01-28 01:12:49 +08:00
deprecated Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
editor-support Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory 2016-01-28 01:12:49 +08:00
math Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
navmesh Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 2016-01-09 18:01:56 +08:00
network Replace char* with std::string in HttpRequest 2016-01-26 05:13:18 +09:00
physics Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
physics3d Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
platform Merge pull request #14891 from mogemimi/fix-extra-tokens-warning 2016-01-21 10:51:01 +08:00
renderer Removes unused code in Material::initWithFile. 2016-01-15 00:55:10 +08:00
scripting Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory 2016-01-28 01:12:49 +08:00
storage fixes to local storage 2015-11-27 14:28:26 +03:00
ui Merge pull request #14964 from zilongshanren/fix14909 2016-01-27 20:53:48 +08:00
Android.mk rename CCStencilBitsManager to StencilStateManager 2015-11-25 14:24:27 +08:00
CMakeLists.txt AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudioEngine now as wrapper of AUdioEngine, upgrade FMOD binaries 2015-11-26 22:22:05 -05:00
cocos2d.cpp fix the link error and compile error in windows and android platform 2015-12-09 20:18:37 +08:00
cocos2d.h Update version number to v3.10 2015-12-14 10:32:29 +08:00