axmol/cocos
zilongshanren 5ef1c92420 Merge pull request #14609 from zilongshanren/fixLabelClampIssue
fix horizontal clamp and shrink issue
2015-12-07 19:45:19 +08:00
..
2d Merge pull request #14609 from zilongshanren/fixLabelClampIssue 2015-12-07 19:45:19 +08:00
3d Merge pull request #14574 from super626/v3 2015-12-04 17:38:56 +08:00
audio Merge pull request #14476 from cesarpachon/linuxAudioEngine 2015-11-28 14:27:15 +08:00
base Merge pull request #14528 from xiaofeng11/v3_3dtouch 2015-12-03 22:21:48 -08:00
deprecated Fix typos in documentation 2015-12-03 21:03:00 +09:00
editor-support Bug fix for ActionNode in CocosStudio, please don't use weak reference. 2015-12-07 15:06:50 +08:00
math Fix typos in documentation 2015-12-03 21:03:00 +09:00
navmesh fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
network Merge pull request #14542 from pandemosth/issue_14539 2015-12-03 18:47:17 +08:00
physics no message 2015-11-27 23:33:20 +10:00
physics3d Fix typos in documentation 2015-10-23 16:59:51 +09:00
platform Merge pull request #14409 from xiaofeng11/v3_combine_opengl 2015-12-03 23:03:40 -08:00
renderer Merge branch 'v3' into js_more_conversions 2015-12-04 19:01:20 -08:00
scripting [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-07 03:30:43 +00:00
storage issue #12078: added storage group. 2015-05-28 15:48:08 +08:00
ui revert error changes 2015-12-07 16:21:12 +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 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