axmol/cocos
zilongshanren 36668071bb Merge pull request #14986 from GuoLunHao/v3_version
update cocos2d-x's version to 3.11
2016-02-01 14:28:14 +08:00
..
2d fixed documentation for better reading clarity 2016-01-27 11:42:25 +10: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 Mark equals() functions as const 2016-01-22 06:09:27 +09:00
deprecated Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
editor-support Merge pull request #14888 from xiaofeng11/v3_actiontimeline 2016-01-21 15:35:30 +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 Fixes indent. 2016-01-27 13:43:55 +08:00
renderer Removes unused code in Material::initWithFile. 2016-01-15 00:55:10 +08:00
scripting [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-28 04:01:53 +00:00
storage fixes to local storage 2015-11-27 14:28:26 +03:00
ui Merge pull request #14940 from mxenabled/stop_auto_scroll 2016-02-01 14:27:55 +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 update cocos2d-x's version to 3.11 2016-01-29 14:49:05 +08:00
cocos2d.h update cocos2d-x's version to 3.11 2016-01-29 14:49:05 +08:00