axmol/cocos
minggo 2c75a4cf39 Merge pull request #15480 from mogemimi/remove-unary-operator
Remove incorrect unary operator to fix warnings
2016-04-21 15:42:29 +08:00
..
2d Merge pull request #15480 from mogemimi/remove-unary-operator 2016-04-21 15:42:29 +08:00
3d Update CCSprite3D.cpp 2016-04-19 10:11:29 +08:00
audio Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
base Merge pull request #14547 from colajam93/fix-linux-clang-build 2016-04-21 15:38:53 +08:00
deprecated Merge pull request #14485 from cpascal/fix_libexport 2016-04-20 11:26:25 +08:00
editor-support Merge pull request #15453 from mogemimi/add-missing-dllexport 2016-04-19 10:26:58 +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 pull request #14321 from pandemosth/socketIO_issue_14287 2016-04-21 14:28:21 +08:00
physics fix: use chipmunk v6.2 API whenever possible 2016-04-07 16:22:49 -07:00
physics3d Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
platform Merge pull request #13950 from Almax27/patch-4 2016-04-21 14:56:01 +08:00
renderer Merge pull request #15451 from xpol/fixes-format-warnings 2016-04-19 10:21:10 +08:00
scripting [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-21 07:07:41 +00:00
storage Fix indentation for readability 2016-04-15 04:31:19 +09:00
ui Merge pull request #15289 from m-yukio/feature/richtext_xml_refactor 2016-04-20 20:05:29 -07:00
Android.mk Removed unnecessary search paths. 2016-03-22 16:04:12 +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 Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00