Kenneth Chan 80df88d2cf Add missing bindings to setBlendFunc for various classes ... Conflicts: cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp		2014-01-02 16:21:35 +08:00
..
2d	fix crash related to not support the z length modifier for size_t on vs	2013-12-31 16:32:16 +08:00
audio	openal context not destroy correctly on mac and ios	2013-12-30 08:37:36 +08:00
base	Merge pull request #4696 from dumganhar/warning-fix	2013-12-27 01:56:47 -08:00
editor-support	change interface	2014-01-02 11:07:31 +08:00
gui	Merge pull request #4781 from dumganhar/js-ui-test	2014-01-01 22:44:25 -08:00
math/kazmath	Merge branch 'develop' into arm64	2013-11-04 15:02:35 -08:00
network	HttpClient don't have to be inherited from Object, its a singeton, ok?	2014-01-02 15:47:38 +08:00
physics	fixed #3517, make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment	2013-12-26 23:55:05 +08:00
scripting	Add missing bindings to setBlendFunc for various classes	2014-01-02 16:21:35 +08:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00