axmol/cocos
minggo 29df93c5e4 Merge pull request #15458 from WenhaiLin/v3-0419
Fixed crash and actions may not have been executed.
2016-04-19 18:25:00 +08:00
..
2d Fixed crash and actions may not have been executed. 2016-04-19 16:11:54 +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 #15231 from SteveKChiu/v3 2016-04-18 17:54:14 +08:00
deprecated Use decltype and std::remove_pointer to avoid side effect warnings. 2016-04-18 16:07:48 +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 #14843 from cezheng/fix/ios_downloader_crashes_with_storage_path_containing_spaces 2016-04-19 13:46:02 +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 #15198 from perminovVS/v3-dev-wrong-log-detect-image-type 2016-04-19 11:00:55 +08:00
renderer Merge pull request #15451 from xpol/fixes-format-warnings 2016-04-19 10:21:10 +08:00
scripting Merge pull request #15450 from mogemimi/fix-deprecation-warning 2016-04-19 16:51:52 +08:00
storage Fix indentation for readability 2016-04-15 04:31:19 +09:00
ui Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08: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