Commit Graph

305 Commits

Author SHA1 Message Date
jianglong0156 13d00d129d fix the jsb and lua ini error, ignore writeDataToFile 2015-07-07 14:54:31 +08:00
andyque dce583db93 fix jsb bindings error 2015-07-01 18:28:22 +08:00
江龙 91bc19fb29 Merge branch 'v3_origin' into navmesh
Conflicts:
	tests/js-tests/src/Physics3DTest/Physics3DTest.js
2015-06-18 23:50:19 +08:00
pandamicro deaa048521 Improve auto bindings for navmesh 2015-06-18 22:48:47 +08:00
pandamicro 10a8adad53 Change physics3d api to jsb namespace 2015-06-18 20:39:40 +08:00
jianglong0156 85c40b6580 Merge pull request from pandamicro/physics3d
Physics3d
2015-06-18 14:54:32 +08:00
pandamicro 3ffc0e6be6 Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d 2015-06-18 09:20:37 +08:00
pandamicro a94b49bdef Add nav mesh bindings 2015-06-17 23:41:12 +08:00
pandamicro 85e8a407b1 Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3
# Conflicts:
#	tests/js-tests/project/Classes/AppDelegate.cpp
#	tools/tojs/genbindings.py
2015-06-17 19:58:24 +08:00
samuele3hu 683812d817 Update Physics3D test for js. 2015-06-17 18:50:55 +08:00
jianglong0156 897b5fd0e9 add navmesh test project file and binding file 2015-06-17 18:37:19 +08:00
WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/2d/libcocos2d.vcxproj.filters
	tools/cocos2d-console
	web
2015-06-15 16:13:36 +08:00
pandamicro 0216d05eee Merge pull request from super626/navigation2
3D Navigation
2015-06-15 13:39:05 +08:00
pandamicro 032f231ed4 Add bindings for AutoPolygon and PolygonInfo 2015-06-13 11:14:57 +08:00
pandamicro c3aba0392d Update auto conversion for sprite polygon 2015-06-12 13:00:49 +08:00
pandamicro 25a25776ce Add macro_judgement to physics3d auto bindings 2015-06-10 19:39:29 +08:00
yangxiao d50c1823d4 merge cocos 2015-06-05 14:25:37 +08:00
pandamicro e473da38cb Skip C++ invocation functions of Component 2015-06-04 20:05:30 +08:00
yangxiao 8b5333a5c9 Merge branch 'newcode' into navigation2 2015-06-04 12:44:39 +08:00
yangxiao 3d4606921b merge cocos 2015-06-02 14:27:31 +08:00
yangxiao c782d63bef add 3d navigation 2015-05-29 16:45:33 +08:00
jianglong0156 8b52563a8a add videoplayer config ini and fix the url bug 2015-05-29 11:10:39 +08:00
jianglong0156 9a62d06091 add video player test and auto bindings 2015-05-28 18:10:07 +08:00
jianglong0156 50fc2de39d remove 3d ext ini 2015-05-27 18:36:00 +08:00
jianglong0156 bdbb15530b improve commit and web submodule 2015-05-27 18:30:28 +08:00
jianglong0156 521ce15cb6 add webview autobindings. modify webtest. adapt the web interface 2015-05-27 11:46:26 +08:00
jianglong0156 7820610f13 Merge branch 'modifyTestResource' into jsWebviewTest
Conflicts:
	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
	tests/js-tests/project.json
	tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
	tools/tojs/genbindings.py
2015-05-26 17:49:17 +08:00
andyque a651deb93c remove dos2unix tools in js genbindings 2015-05-25 18:11:19 +08:00
joshuastray b1169c7d56 win32 and universal compile 2015-05-22 11:58:28 +08:00
joshuastray 1366f615dd mac && ios works 2015-05-22 10:43:37 +08:00
joshuastray 83237b8dbd add physics3d js manual binding and tests 2015-05-21 18:05:49 +08:00
joshuastray 712ba4f64c add physics3d auto binding 2015-05-20 10:36:26 +08:00
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
jianglong0156 80326aa40e add webiew jsb code 2015-05-12 10:30: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 : 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 : Removes cpp_namespace section in cocos2dx.ini. 2014-02-20 11:09:40 +08:00
James Chen 5e6130c92c issue : Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
James Chen c7b1ab4525 Merge pull request from ucchen/develop
closed : 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 , 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 , 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 from
Should check ndk architechture.
2014-01-23 00:13:23 -08:00
lihex 2dc9958475 issue , Should check ndk architechture. 2014-01-23 15:27:00 +08:00
James Chen f43f3c770b Merge pull request from
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 from
Fix the path.
2014-01-22 20:20:08 -08:00
lihex b9331a06f9 issue , Fix the path. 2014-01-23 12:08:27 +08:00
James Chen 9292d92f63 Merge pull request from pandamicro/develop
closed : SAXParser was supported with manual binding in JSB
2014-01-22 19:50:15 -08:00
lihex ecdd64a889 issue , 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 : Change parameters to const & 2014-01-22 22:31:26 +08:00
lihex b2a1cd90eb issue , Minor fix & update submodule. 2014-01-22 10:58:02 +08:00
lihex 40f5c31a50 issue , 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 : SAXParser supported with manual binding in JSB 2014-01-21 18:12:12 +08:00
lihex 56654c0ffb issue , js not generate cocos2dx physics now. 2014-01-21 18:09:21 +08:00
lihex 1a6b36184d issue , Add windows bat script. 2014-01-21 17:48:49 +08:00
lihex a392a709cd issue : Fix the variable name. 2014-01-21 17:40:20 +08:00
lihex 0109ebd707 issue , Update genbinding script to fit new bindings-generator. 2014-01-21 16:53:07 +08:00
James Chen 2e7516c582 Merge pull request 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
James Chen 322cf0d233 Fixing CocoStudio bindings error. 2014-01-04 12:11:10 +08:00
Dhilan007 b6e676caa4 fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp. 2014-01-03 23:03:48 +08:00
Dhilan007 b4d392dc38 update js binding for studio change. 2014-01-03 21:33:48 +08:00
minggo d345139a08 fix compiling errors 2014-01-02 21:53:18 +08:00
James Chen 3e044cf90e Updates tools/tojs/cocos2dx_gui.ini. target_namespace from ccs to ccii. 2014-01-02 14:22:00 +08:00
James Chen 591740253d [GUI] Updates scripting binding configure file. 2014-01-01 21:32:54 +08:00
James Chen cf006df9ff closed : Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
chengstory bd8f32e1a6 fixed fixes failed to build android. 2013-12-27 06:33:42 +08:00
chengstory d9ba53f9a9 o my god. 2013-12-26 17:55:46 +08:00
James Chen 5dfb7f321a Compilation fixes after merge PR https://github.com/cocos2d/cocos2d-x/pull/4669 2013-12-26 16:03:30 +08:00
James Chen df690e8f8b Updates bindings config files. 2013-12-26 12:50:37 +08:00
James Chen 538da31773 Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings. 2013-12-25 11:18:14 +08:00
James Chen d33b2c41c7 Merge branch 'develop' into data-refactor
Conflicts:
	tools/tolua/cocos2dx.ini
2013-12-24 16:24:17 +08:00
James Chen 05f6a5b09b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test 2013-12-23 22:05:20 +08:00
James Chen 3327614a99 Binds Node::setAnchorPoint manually. 2013-12-23 21:54:02 +08:00
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
James Chen b3cc7d7e68 Bindings-generator skips Node::setContentSize. Binds it manually. 2013-12-23 20:25:11 +08:00