axmol/cocos
minggo 74af3b5232 merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
..
2d Fix setPhysicsBody method 2016-05-06 09:29:57 +08:00
3d fix animate 3d bug 2016-05-09 15:21:19 +08:00
audio merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
base disable new JSB memory model by default 2016-05-11 11:10:11 +08:00
deprecated Merge pull request #14485 from cpascal/fix_libexport 2016-04-20 11:26:25 +08:00
editor-support merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
math Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
navmesh Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 2016-01-09 18:01:56 +08:00
network merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
physics Suppress warning C4800 on MSVC 2016-05-06 12:30:16 +09:00
physics3d Fix warnings about signed/unsigned mismatch 2016-04-22 12:20:05 +09:00
platform Merge pull request #15599 from Naruto/feature/fix_build_error_using_fileutils-apple 2016-05-10 12:07:16 +08:00
renderer reset UIGrayScale Shader when reload shaders 2016-04-23 13:33:22 +08:00
scripting merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
storage Fix indentation for readability 2016-04-15 04:31:19 +09:00
ui merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
Android.mk remove unsupport flags 2016-04-26 14:08:23 +08:00
CMakeLists.txt Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
cc_dummy.c Squashed commit of the following: 2016-03-02 16:51:54 -08:00
cocos2d.cpp update cocos2d-x's version to 3.11 2016-01-29 14:49:05 +08:00
cocos2d.h merge v3.11 back to v3 2016-05-04 16:02:23 +08:00