zilongshanren 9c86d1f0f1 Merge pull request #14880 from mogemimi/fix-minor-typo ... Fix typos in comments and documentation		2016-01-14 09:58:29 +08:00
..
2d	Merge pull request #14882 from geron-cn/playableframe	2016-01-14 09:42:17 +08:00
3d	Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3	2015-12-20 22:56:33 +08:00
audio	Merge pull request #14340 from fnz/easyjni	2016-01-12 11:50:16 +08:00
base	add PlayableFrame	2016-01-12 17:21:01 +08:00
deprecated	Adds `std::nothrow` to the `new` statements	2015-12-16 14:02:55 +08:00
editor-support	Merge pull request #14880 from mogemimi/fix-minor-typo	2016-01-14 09:58:29 +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 #14340 from fnz/easyjni	2016-01-12 11:50:16 +08:00
renderer	fix scale9sprite gray state opacity issue.	2016-01-07 17:17:55 +08:00
scripting	Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist	2016-01-13 15:58:02 -08:00
storage	fixes to local storage	2015-11-27 14:28:26 +03:00
ui	Merge pull request #14712 from xpol/fix-include-for-compile-under-crystax-ndk	2016-01-12 11:56:43 +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