axmol/cocos
fnz 8c691430c1 conflicts resolved 2015-11-27 13:19:10 +03:00
..
2d fix alphaThreshold undefined issue 2015-11-25 18:27:38 +08:00
3d fix terrain ray trace bug when there is offset 2015-11-24 15:13:52 +08:00
audio conflicts resolved 2015-11-27 13:19:10 +03:00
base conflicts resolved 2015-11-27 13:19:10 +03:00
deprecated fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
editor-support Merge pull request #14379 from mogemimi/fix-deprecated-warnings 2015-11-17 11:19:07 +08:00
math Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
navmesh fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
network Remove duplicated code by introduce a private doSetResponseCallback. 2015-11-18 17:52:24 +08:00
physics Removed PhysicsBody::update from PhysicsWorld 2015-11-02 14:18:21 +01:00
physics3d Fix typos in documentation 2015-10-23 16:59:51 +09:00
platform conflicts resolved 2015-11-27 13:19:10 +03:00
renderer Merge pull request #14471 from super626/v3 2015-11-27 11:33:07 +08:00
scripting [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-26 06:02:24 +00:00
storage updates to JniHelper, refactoring of existing JNI calls 2015-11-27 12:00:33 +03:00
ui conflicts resolved 2015-11-27 13:19:10 +03:00
Android.mk rename CCStencilBitsManager to StencilStateManager 2015-11-25 14:24:27 +08:00
CMakeLists.txt add UIEditBox support linux platform. 2015-09-18 17:11:58 +08:00
cocos2d.cpp Update version number & RELEASE_NOTES.md, prepare 3.9 release 2015-11-06 18:38:09 +08:00
cocos2d.h Remove condition macro check. 2015-11-24 19:17:38 +08:00