axmol/cocos
zilongshanren d9af70f913 Merge pull request #14600 from enhhh/enh_v3
We should not intercept touch event if scrollview's _direction is NONE
2016-01-21 10:58:20 +08:00
..
2d Merge pull request #14751 from newnon/v3_get_version_windows 2016-01-21 10:42:19 +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 Adds xml support in UIRichText 2016-01-19 20:41:31 -08:00
deprecated Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
editor-support const Data -> const Data& for function argument, performance improvement. 2016-01-15 00:55:10 +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 Fix some typos in docs 2016-01-11 19:23:05 +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 pull request #14755 from mogemimi/fix-redefinition-warning 2016-01-21 10:46:58 +08:00
storage fixes to local storage 2015-11-27 14:28:26 +03:00
ui Merge pull request #14600 from enhhh/enh_v3 2016-01-21 10:58:20 +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