axmol/cocos
minggo 37655ea271 Merge pull request #15091 from mogemimi/fix-null-conversion
Fix return value of VertexAttribBinding::init()
2016-04-18 16:52:15 +08:00
..
2d Fixes warning about unused static constants. 2016-04-18 15:38:51 +08:00
3d Iterator erase pattern 2016-04-01 18:29:21 -06:00
audio Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
base remove useless warning log of stencil buffer. (#15396) 2016-04-18 15:43:54 +08:00
deprecated Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
editor-support Fixes warning about unused static constants. 2016-04-18 15:38:51 +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 std::shared_ptr<bool> -> std::shared_ptr<std::atomic<bool>> 2016-04-07 15:06:19 +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 #15096 from fnz/volume_control 2016-04-18 16:48:55 +08:00
renderer Fix return value of VertexAttribBinding::init() 2016-04-10 08:05:19 +09:00
scripting Fixes some warnings in Lua manual bindings. (#15443) 2016-04-18 16:35:50 +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