Commit Graph

177 Commits

Author SHA1 Message Date
pandamicro a3c2904e7f Fix cc.DrawNode.drawPoly 2015-10-27 16:46:25 +08:00
pandamicro 7b85211cfe Remove ScriptComponent
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
江龙 9eb05707fb add custom spine skeletonAnimation test 2015-09-25 13:36:48 +08:00
pandamicro b0dc83aed8 Update bindings-generator to initialize numeric/pointer variables 2015-09-14 11:22:06 +08:00
江龙 4509a316cc add uniform conversion
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
2015-09-09 16:03:57 +08:00
jianglong0156 b19e02bdf6 Remove duplicate function definition, Add function adaptation 2015-08-17 18:18:38 +08:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
pandamicro 537927c34b Tiny improvement for bindings generator 2015-07-30 20:52:21 +08:00
pandamicro cf806913e3 Auto bind public members of AudioProfil 2015-07-30 20:19:53 +08:00
pandamicro da4e062614 Add js wrapper for audio engine 2015-07-29 20:47:28 +08:00
pandamicro 632b36fa43 Fix bindings generator for Lua 2015-07-27 10:21:18 +08:00
pandamicro 08e3d8d533 Gen bindings for BoneNode and SkeletonNode 2015-07-27 09:56:55 +08:00
pandamicro 29b9ed685f Add BoneNode/SkeletonNode/SkinNode JS bindings 2015-07-24 15:48:34 +08:00
pandamicro 7f7cf92da3 Update bindings-generator 2015-07-15 14:21:47 +08:00
pandamicro 30c79fea02 Add auto bindings for Frame::g|setTweenType 2015-07-08 17:19:30 +08:00
pandamicro deaa048521 Improve auto bindings for navmesh 2015-06-18 22:48:47 +08:00
pandamicro 4073d0397b Update bindings generator 2015-06-18 22:00:56 +08:00
pandamicro 4fa1cdc302 Update submodules 2015-06-17 15:43:35 +08:00
samuele3hu e20a35508a Update the bindings-generator 2015-06-16 11:38:16 +08:00
samuele3hu a20681aa21 Add Lua-bindings for NavMesh 2015-06-02 18:37:57 +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
joshuastray b1169c7d56 win32 and universal compile 2015-05-22 11:58:28 +08:00
samuele3hu dec9acfd87 Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule 2015-05-20 10:26:54 +08:00
zhangbin e5672b6e1f Update js bindings. 2015-04-17 17:27:47 +08:00
samuele3hu 1a9cf6f6a3 Update the bindings-generator submodule 2015-03-28 15:00:12 +08:00
samuele3hu 3dd590cf9d Update bindings-generator submodule 2015-01-21 17:18:54 +08:00
samuele3hu a3fbe04c10 issue : Update the bindings-generator submodule 2015-01-21 10:07:21 +08:00
samuele3hu 1d5350e648 Update bindings-generator submodule 2015-01-14 13:51:33 +08:00
samuele3hu ef16a460e6 Update bindings-generator submodule 2014-12-01 11:16:40 +08:00
samuele3hu aa4277ed72 Update the bindings-generator submodule 2014-11-26 18:20:22 +08:00
samuele3hu 4593b55e1a Update bindings-generator submodule 2014-10-17 14:32:24 +08:00
samuele3hu dd2ad66e41 Update bindings-generator submodule 2014-10-17 14:23:58 +08:00
samuele3hu 3a433b2cd6 Update bindings-generator submodule 2014-09-09 16:26:06 +08:00
samuele3hu b58ccc5961 Update bindings-generators submodule 2014-09-01 14:08:02 +08:00
samuele3hu 386b4a2f42 Update bindings-generator submodule 2014-07-22 11:16:40 +08:00
samuele3hu 059ecffd9c Update bindings-generator submodule 2014-07-17 21:43:10 +08:00
samuele3hu 6516039604 Update bindings-generator submodule 2014-07-17 12:56:00 +08:00
samuele3hu 2baf860669 Update bindings-generator submodule 2014-07-17 09:56:35 +08:00
samuele3hu fca4b1dbd8 Update bindings-generaotr submoudle 2014-07-09 18:31:35 +08:00
samuele3hu bf3e0cb132 Update ini configure and bindings-generator submodule 2014-07-08 15:17:46 +08:00
samuele3hu 148039fbfb Update bindings-generator submodule 2014-06-29 18:53:35 +08:00
samuele3hu 32c355dca4 Add VideoPlayer Lua bindings and update bindings-generator submodule 2014-06-26 16:19:22 +08:00
samuele3hu ca56aaa0d8 Update bindings-generator submodule 2014-06-25 16:23:26 +08:00
samuele3hu 6319a3d646 Update bindings-generator submodule 2014-06-24 11:09:36 +08:00
samuele3hu 7de04210c2 Update bindings-generator submodule 2014-06-23 10:27:06 +08:00
minggo bfed48f0ff revert binding-generators to correct commit 2014-06-19 17:42:50 +08:00
minggo 6d80de181a revert binding-generators to correct commit 2014-06-19 17:39:14 +08:00
samuele3hu 477816e883 update bindings-generator submodule 2014-06-19 14:42:09 +08:00
samuele3hu 15d070f7fc Update submodule 2014-06-18 11:50:24 +08:00
samuele3hu 919524cf89 Update controller.lua for lua-tests and bindings-generator submoudle 2014-06-05 14:39:09 +08:00
samuele3hu b6cc477832 Update submodule 2014-05-27 14:25:18 +08:00
samuele3hu 270ddf0354 Update submodule 2014-05-26 18:25:23 +08:00
samuele3hu 2d65f9bc6f issue #5255:Add Sprite3D test cases for Lua 2014-05-20 18:09:04 +08:00
samuele3hu 5a14b1d67b fix compile error and synchronizate the UI change for Lua 2014-05-15 15:39:15 +08:00
samuele3hu 3fb53e39ea Update bindings-generator submodule 2014-05-07 11:06:58 +08:00
samuele3hu f122f3894c Update the bindings-generator 2014-05-07 10:52:49 +08:00
samuele3hu 0ce2a38f17 Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test 2014-05-06 13:59:16 +08:00
samuele3hu d3670644bf Fix compile error for Lua 2014-04-28 14:04:37 +08:00
James Chen 82333e357e Updates bindings-generator to the latest version. 2014-04-09 15:44:07 +08:00
samuele3hu b68f6bf65e fix the error about `draw` of GLNode and modify the related test cases 2014-04-03 17:02:14 +08:00
samuele3hu 674bce677d update `bindings-generator` submoudle 2014-03-26 12:56:29 +08:00
samuele3hu 3b2a5274ea Update `bindings-generator` submodule 2014-03-20 10:12:04 +08:00
samuele3hu 309422f791 update `bindings-generator` submodule 2014-03-18 10:36:37 +08:00
James Chen 7cff033b55 Updates bindings-generator. 2014-03-14 23:04:05 +08:00
samuele3hu a30ce6cfc5 Update `bindings-generator` submodule 2014-03-13 14:47:00 +08:00
samuele3hu 108928e1a7 Update `bindings-generator` submodule and add auto-binding for the `RichText` 2014-03-13 14:31:07 +08:00
James Chen 0f9ff45778 Re-add bindings-generator submodule. 2014-03-10 17:46:30 +08:00
James Chen c2acfea633 issue : Delete non-scripting files. 2014-02-26 21:17:17 +08:00
James Chen 5e6130c92c issue : Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
samuele3hu 7bf7637f76 issue #3956:update the submodule 2014-02-10 15:20:34 +08:00
James Chen 25c7c68cd2 Updates bindings-generator. 2014-01-26 16:20:10 +08:00
James Chen 26125f4e26 closed : Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
Please refer to http://www.cocos2d-x.org/issues/3858.
2014-01-26 14:41:27 +08:00
lihex 2dc9958475 issue , Should check ndk architechture. 2014-01-23 15:27:00 +08:00
lihex f9b2ead623 Update docs. 2014-01-23 14:14:07 +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
lihex b2a1cd90eb issue , Minor fix & update submodule. 2014-01-22 10:58:02 +08:00
samuele3hu 508d786fa7 issue #3626:Update the submodule 2014-01-17 10:19:58 +08:00
samuele3hu d086f7a259 issue #3626:Add the deprecated support for the tolua.cast 2014-01-17 10:19:57 +08:00
Dhilan007 3cab3e5df3 update bindings-generator submodule 2014-01-07 17:19:29 +08:00
James Chen 31188710a0 Updates Bindings-generator. 2013-12-26 22:14:48 +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
samuele3hu 9cf45a292b Delete some annotated statement about spine and add some reserve manual lua binding functions 2013-12-25 16:42:40 +08:00
James Chen d6850c363a Updates Bindings-generator. 2013-12-23 22:00:11 +08:00
James Chen 46cc91be3b Updates bindings-generator, skips to bind override functions. 2013-12-23 16:41:17 +08:00
James Chen 55ff96df3a closed : Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding.
Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()),
We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
2013-12-20 17:13:09 +08:00
James Chen 6aa8b779f0 Updates submodule reference of Bindings-generator, it supports to bind std::vector<std::string> ,std::vector<int>, cocos2d::Map<std::string, T> now. 2013-12-19 20:16:18 +08:00
James Chen c14754b720 Updates submodule of bindings-generator. 2013-12-19 11:50:45 +08:00
samuele3hu 55830c3023 Add support for unsigned short 2013-12-18 13:47:59 +08:00
Dhilan007 0414926b52 add API for transform unsigned short 2013-12-17 18:17:04 +08:00
James Chen 464054d251 Updates Bindings-generator. 2013-12-16 13:01:20 +08:00
samuele3hu 1ed8d108f7 issue #2790:Update binding-generator 2013-12-10 15:21:21 +08:00
samuele3 c2e7299d8f Issue #2790:Add more conversion functions to support templates containers 2013-12-10 11:21:30 +08:00
James Chen b5978eeee6 issue : Bindings-generator supports binding Vector<T> and some bug fixes. 2013-12-06 16:46:19 +08:00
James Chen 216f8743b0 closed : Updates bindings-generator. 2013-11-27 14:04:53 +08:00
James Chen 03005173b1 issue : Updates bindings-generator. 2013-11-26 15:45:09 +08:00
samuele3 cb51df7d65 Update bindings-generator 2013-11-12 17:31:24 +08:00
samuele3 18bc96096c Resolve some warning and modify uint32_t to long 2013-11-12 17:18:51 +08:00
samuele3 fa1a5c3735 Add conversion config for long type 2013-11-10 11:03:27 +08:00
samuele3 d4dbc7a442 Add conversion config for long type 2013-11-10 09:21:33 +08:00
samuele3 b445f0824a issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples 2013-11-05 15:09:51 +08:00