Commit Graph

222 Commits

Author SHA1 Message Date
joshuastray 00dd854578 add material system tests for js 2015-05-18 10:44:15 +08:00
joshuastray 7a4ca3fe6a add new files to project 2015-05-12 10:40:51 +08:00
joshuastray 234f4db8a0 add SpritePolygon binding && js tests 2015-05-11 17:04:23 +08:00
samuele3hu 2385e68f72 Update the ini files for js binding 2015-05-07 13:00:57 +08:00
samuele3hu 243da71082 Update the project configure of js-tests and js-template on the win32 platform 2015-05-07 11:38:43 +08:00
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
zhangbin e5672b6e1f Update js bindings. 2015-04-17 17:27:47 +08:00
zhangbin 3641451c47 Update the submodule js-bindings & update solution files for js-bindings. 2015-04-15 13:58:41 +08:00
zhangbin ea86978ce2 Add js-bindings generator tools. 2015-04-14 11:01:07 +08:00
James Chen c2acfea633 issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
andyque f92301a872 fix jsb munaul bindings error 2014-02-25 10:18:45 +08:00
samuele3hu e2596bce8b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
Conflicts:
	tools/tojs/cocos2dx.ini
	tools/tolua/cocos2dx.ini
2014-02-20 17:20:51 +08:00
samuele3hu 75e1ccf84c close #4094:Modify EGLViewProtocol —> GLViewProtocol and EGLView—> GLView in the cocos2d.ini for js binding-generator 2014-02-20 15:24:06 +08:00
James Chen 5164f2bb19 issue #4058: Removes cpp_namespace section in cocos2dx.ini. 2014-02-20 11:09:40 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
James Chen c7b1ab4525 Merge pull request #5362 from ucchen/develop
closed #4037: fix copy-paste error, all spxxx_to_jsval use lower case;
2014-02-14 14:17:33 +08:00
ucchen 185ed86214 fix copy-paste error, all spxxx_to_jsval use lower case and add missing data structs getAttachment; 2014-02-14 13:24:56 +08:00
James Chen acefa4e237 Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343 2014-02-14 09:33:42 +08:00
ucchen 2c961bdfbf add spine manual binding; 2014-02-13 11:01:54 +08:00
Éloi Rivard 79e3c05ef1 Minor debugging messages and guards.
Dependencies installation is skipped on linux distributions that does not use .deb package format.
2014-02-13 01:25:23 +01:00
lihex 69bc32a21d Fix path on use 32bit windows ndk 2014-02-11 10:02:59 +08:00
James Chen c97b6cb197 Uses genbindings.py instead of genbindings.sh and genbindings.bat. 2014-02-10 18:30:22 +08:00
lihex b06d54f706 issue #3781, use custom python executeable if PYTHON_BIN defined 2014-02-10 12:50:23 +08:00
lihex 1fbde6d8d5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue#3781 2014-02-10 10:43:16 +08:00
lihex 4be97c1ed8 issue #3781, use python script instead. 2014-02-10 10:36:37 +08:00
James Chen 952cd1d836 ComController needs to be `extend`ed. Updates cocos2dx_studio.ini. 2014-01-26 14:42:17 +08:00
James Chen f1ffb0b753 [JSB] cc.Node.setLocalZOrder -> cc.Node.setZOrder. 2014-01-24 15:02:14 +08:00
James Chen 87980456a9 Merge pull request #5180 from lihex/issue#3781
Should check ndk architechture.
2014-01-23 00:13:23 -08:00
lihex 2dc9958475 issue #3781, Should check ndk architechture. 2014-01-23 15:27:00 +08:00
James Chen f43f3c770b Merge pull request #5179 from lihex/issue#3781
Update docs for bindings-generator.
2014-01-22 22:35:40 -08:00
lihex f9b2ead623 Update docs. 2014-01-23 14:14:07 +08:00
James Chen 91511840a1 Merge pull request #5175 from lihex/issue#3781
Fix the path.
2014-01-22 20:20:08 -08:00
lihex b9331a06f9 issue #3781, Fix the path. 2014-01-23 12:08:27 +08:00
James Chen 9292d92f63 Merge pull request #5143 from pandamicro/develop
closed #3806: SAXParser was supported with manual binding in JSB
2014-01-22 19:50:15 -08:00
lihex ecdd64a889 issue #3781, Don't set a default PYTHON_ROOT & NDK_ROOT for user on Windows. 2014-01-23 10:48:03 +08:00
pandamicro 913360e526 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-22 22:32:44 +08:00
pandamicro d6df71cc11 Fixed #3806: Change parameters to const & 2014-01-22 22:31:26 +08:00
lihex b2a1cd90eb issue #3781, Minor fix & update submodule. 2014-01-22 10:58:02 +08:00
lihex 40f5c31a50 issue #3781, Undefine the __MINGW32__ macro to fix the script error on windows 2014-01-21 18:32:27 +08:00
pandamicro 3de7ed93f9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Conflicts:
	cocos/scripting/javascript/bindings/cocos2d_specifics.cpp
2014-01-21 18:18:32 +08:00
pandamicro a467fe3244 Fixed #3806: SAXParser supported with manual binding in JSB 2014-01-21 18:12:12 +08:00
lihex 56654c0ffb issue #3781, js not generate cocos2dx physics now. 2014-01-21 18:09:21 +08:00
lihex 1a6b36184d issue #3781, Add windows bat script. 2014-01-21 17:48:49 +08:00
lihex a392a709cd issue #3781: Fix the variable name. 2014-01-21 17:40:20 +08:00
lihex 0109ebd707 issue #3781, Update genbinding script to fit new bindings-generator. 2014-01-21 16:53:07 +08:00
James Chen 2e7516c582 Merge pull request #5041 from Dhilan007/develop_label
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF  to reduce parameters and make this interface more easily to use.
2014-01-15 18:37:40 -08:00
Ricardo Quesada b3f306e742 Ignore getFullPathCache() in FileUtils 2014-01-14 18:30:51 -08:00
Dhilan007 69c004108b issue#3630:Adjust some method for more easily create and change type. 2014-01-11 22:33:07 +08:00
James Chen b07acb6c12 [JSB] Supports cc.ScrollView.extend, cc.TableView.extend, cc.TableViewCell. 2014-01-07 22:17:22 +08:00
James Chen e25c4b5f4d [JSB] Armature should be able to be extended in JS. 2014-01-07 20:55:07 +08:00