5 Commits

Author	SHA1	Message	Date
pandamicro	fc19435123	Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory ... Conflicts: cocos/base/ccConfig.h cocos/scripting/js-bindings/manual/ScriptingCore.cpp cocos/scripting/js-bindings/manual/ScriptingCore.h cocos/scripting/js-bindings/script/jsb_prepare.js	2016-01-18 16:40:00 +08:00
Ricardo Quesada	692c0f8a0e	adds tvOS support ... Ported tests: - js-tests - cpp-tsts - lua-tests - game-controller tests all of them working, but most of the tests can't be navigated since they expect a controller.	2015-12-28 15:59:36 -08:00
pandamicro	6c2fd67d08	Update auto bindings	2015-12-21 00:14:51 +08:00
WenhaiLin	a3f363735e	Refine lua/js binding tool	2015-09-19 00:08:15 +08:00
jianglong0156	8b52563a8a	add videoplayer config ini and fix the url bug	2015-05-29 11:10:39 +08:00