pandamicro
|
46bb4f8aae
|
Merge pull request #13149 from jianglong0156/constructedWith3D_3#12404
Constructed with3d
|
2015-08-01 21:15:08 +08:00 |
jianglong0156
|
09c3da3247
|
skip init funciton in lua physics3d.ini
|
2015-08-01 18:30:06 +08:00 |
pandamicro
|
00a3d572d1
|
Merge pull request #12899 from super626/v3
Animate3D Callback and Bug fix
|
2015-08-01 18:24:05 +08:00 |
XiaoFeng
|
09d9fcf4d6
|
Fix lua binding
|
2015-07-27 21:24:52 +08:00 |
XiaoFeng
|
e0aef73306
|
Fix lua binding
|
2015-07-27 17:31:09 +08:00 |
XiaoFeng
|
63f8b941c9
|
Fix setting file
|
2015-07-27 16:03:05 +08:00 |
XiaoFeng
|
8421ff7149
|
Disable new function bind to lua to avoid compile error
|
2015-07-27 15:09:34 +08:00 |
dualface
|
6d16d1674d
|
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1
|
2015-07-27 11:50:14 +08:00 |
pandamicro
|
08e3d8d533
|
Gen bindings for BoneNode and SkeletonNode
|
2015-07-27 09:56:55 +08:00 |
dualface
|
4c7e4c654a
|
update cocos2dx.ini for luabinding
|
2015-07-26 17:16:50 +08:00 |
zhangcheng
|
ef6ada5bf4
|
Fix cocos2dx_studio.ini format error.
|
2015-07-24 09:28:55 +08:00 |
zhangcheng
|
3945ce7a4e
|
Add ComExtensionData to luabinding.
|
2015-07-23 18:27:19 +08:00 |
zhangcheng
|
19e078da19
|
Add ComExtensionData lua binding.
|
2015-07-23 18:11:47 +08:00 |
yangxiao
|
583d82c1e8
|
ignore Animate getKeyFrameUserInfo
|
2015-07-20 11:49:30 +08:00 |
andyque
|
fc673ee502
|
Merge branch 'v3.7-release' into v3
|
2015-07-13 22:44:54 +08:00 |
pandamicro
|
15bb633adb
|
Revert "add lua-binding of EventDispacher::dispatchCustomEvent()"
|
2015-07-12 20:19:52 +08:00 |
pandamicro
|
0d9da2f500
|
Merge pull request #12773 from minggo/bind-missing-function
add lua-binding of EventDispacher::dispatchCustomEvent()
|
2015-07-11 17:17:32 +08:00 |
minggo
|
3911e1d696
|
add lua-binding of EventDispacher::dispatchCustomEvent()
|
2015-07-10 10:29:21 +08:00 |
pandamicro
|
30c79fea02
|
Add auto bindings for Frame::g|setTweenType
|
2015-07-08 17:19:30 +08:00 |
jianglong0156
|
13d00d129d
|
fix the jsb and lua ini error, ignore writeDataToFile
|
2015-07-07 14:54:31 +08:00 |
samuele3hu
|
ef1bccd926
|
Fix the error skip function error for Sprite.
|
2015-06-18 12:03:30 +08:00 |
Jacky
|
3c5ab4f518
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-17 13:04:24 +08:00 |
samuele3hu
|
2da760b655
|
Update the NavMesh test case
|
2015-06-17 09:49:31 +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 |
samuele3hu
|
1b20e463d8
|
Update the Lua binding about the Polygon and update the test case.
|
2015-06-11 14:38:38 +08:00 |
samuele3hu
|
a20681aa21
|
Add Lua-bindings for NavMesh
|
2015-06-02 18:37:57 +08:00 |
yangxiao
|
c782d63bef
|
add 3d navigation
|
2015-05-29 16:45:33 +08:00 |
samuele3hu
|
9934d73548
|
issue #12046: Add Lua bindings for material systems and related test cases.
|
2015-05-27 15:37:59 +08:00 |
samuele3hu
|
7e07fed0c9
|
Upate cocos2dx_physics3d.ini and bindings-generator submodule
|
2015-05-18 16:18:04 +08:00 |
samuele3hu
|
71595898ed
|
Update the Lua binding for Physics3D ,related test cases and the template project
|
2015-05-15 16:25:07 +08:00 |
samuele3hu
|
8db62c82f8
|
Add Lua bindings for Physics3D and related test cases
|
2015-05-15 09:28:03 +08:00 |
yangxiao
|
2391558c96
|
add physics3d support
|
2015-05-08 15:49:33 +08:00 |
andyque
|
bedd62296f
|
fix binding generator
|
2015-05-07 07:05:23 +08:00 |
samuele3hu
|
f4b57511b0
|
Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS equal to public
|
2015-04-30 17:18:12 +08:00 |
samuele3hu
|
5819159889
|
Add Lua-bindings for SpritePolygon and related test case
|
2015-04-28 18:19:57 +08:00 |
samuele3hu
|
9477e89723
|
Fix the compile error on the win32
|
2015-04-20 11:46:48 +08:00 |
samuele3hu
|
b72034a3f6
|
Add Lua bindings for WebView and related test case
|
2015-04-17 14:08:47 +08:00 |
samuele3hu
|
b2c3628aee
|
Remove useless classes configuration for Lua binding
|
2015-04-14 15:02:25 +08:00 |
samuele3hu
|
24654a4847
|
synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
|
2015-04-13 16:29:44 +08:00 |
samuele3hu
|
8896190d9b
|
Fix the bindings-generator error and add related Action Timeline test case.
|
2015-04-12 22:20:53 +08:00 |
samuele3hu
|
3a2601a1f8
|
Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 10:03:50 +08:00 |
samuele3hu
|
6c528c4a42
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test
|
2015-03-30 15:51:01 +08:00 |
samuele3hu
|
79c0258449
|
Remove useless configure for bindings-generator of Lua
|
2015-03-30 15:48:47 +08:00 |
minggo
|
d437ce3e59
|
Merge pull request #11208 from samuele3hu/v3_5_comment
Update Sprite3DCubeMap lua test case and the related bindings-generator submodule
|
2015-03-30 10:48:36 +08:00 |
samuele3hu
|
921981833e
|
Update Sprite3DCubeMap test case
|
2015-03-28 14:59:47 +08:00 |
yangxiao
|
1d08c514ee
|
do not export getBoneCurves
|
2015-03-27 09:15:45 +08:00 |
yangxiao
|
b938872621
|
lua binding
|
2015-03-04 12:58:51 +08:00 |
andyque
|
992cc52a02
|
fix new windows jenkins slave compile error
|
2015-03-02 19:43:27 +08:00 |
samuele3hu
|
3a7cbe9d67
|
Add Particle3DTest for Lua and update related configure files
|
2015-02-15 15:56:20 +08:00 |
yangxiao
|
9153dd5cc3
|
add particle to lua binding
|
2015-02-13 18:27:32 +08:00 |
samuele3hu
|
80c2e0c153
|
Add AsyncLoadSprite3D test case and update the related lua binding
|
2015-01-28 21:47:52 +08:00 |
samuele3hu
|
6208e9cba5
|
Add more test cases about 3D
|
2015-01-28 09:40:20 +08:00 |
samuele3hu
|
d74fb0e8b5
|
Update LayoutComponent Test case of UIEditTest
|
2015-01-22 10:21:38 +08:00 |
samuele3hu
|
205ead5b63
|
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
|
2015-01-21 11:48:34 +08:00 |
samuele3hu
|
666af29681
|
issue #10107: Binding AnimationInfo to lua
|
2015-01-21 10:06:48 +08:00 |
minggo
|
825f90564c
|
Merge pull request #9992 from samuele3hu/v3_4_issue9986
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 17:05:51 +08:00 |
samuele3hu
|
77912270f9
|
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 16:58:35 +08:00 |
samuele3hu
|
1d94ae4302
|
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
|
2015-01-14 13:51:09 +08:00 |
samuele3hu
|
58d946b578
|
issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
|
2015-01-05 17:10:25 +08:00 |
minggo
|
3c1978fcc3
|
Merge pull request #9611 from super626/quaternion
Rotation With Quaternion
|
2014-12-30 10:09:08 +08:00 |
yangxiao
|
de7b70f63e
|
skip Node::set/getRotationQuat
|
2014-12-25 14:55:43 +08:00 |
kaile.yin
|
1db2bf89e0
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-12-05 14:42:25 +08:00 |
kaile.yin
|
9d49f82eb9
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
Conflicts:
tools/tolua/cocos2dx.ini
|
2014-12-03 16:00:32 +08:00 |
samuele3hu
|
9900ccba4d
|
Add support to clang3.4 because of using the ndk-r10c
|
2014-12-01 11:15:56 +08:00 |
samuele3hu
|
6cf092b855
|
Add cocos2dx_csloader.ini to generate the related lua bindings
|
2014-11-27 10:22:39 +08:00 |
samuele3hu
|
222f2cbd51
|
Decrease the package size of lua_empty_test
|
2014-11-26 21:54:18 +08:00 |
youyou
|
07457a34b5
|
update lua ini files
|
2014-11-26 15:56:51 +08:00 |
samuele3hu
|
a62fa8de58
|
Skip binding nodeWithFlatBuffers of CSLoader for lua
|
2014-11-24 23:36:44 +08:00 |
yangxiao
|
4d74e7f19f
|
skip getMeshArrayByName
|
2014-10-29 10:38:13 +08:00 |
samuele3hu
|
042969ce35
|
Remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini
|
2014-10-20 16:14:24 +08:00 |
minggo
|
8218804c52
|
Merge pull request #8820 from Dhilan007/v3-audioengine-lua
[LUA]Add New AudioEngine on window
|
2014-10-18 15:11:29 +08:00 |
samuele3hu
|
3348f8300e
|
Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case
|
2014-10-18 00:13:22 +08:00 |
Dhilan007
|
81a8e80496
|
[LUA]Add New AudioEngine on window
|
2014-10-17 17:53:33 +08:00 |
samuele3hu
|
936510411b
|
Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache
|
2014-10-17 15:04:16 +08:00 |
samuele3hu
|
7198ae509c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-10-16 20:35:43 +08:00 |
samuele3hu
|
079df20541
|
Update lua bindings for Spine and related test case
|
2014-10-16 20:23:58 +08:00 |
Huabing.Xu
|
644aa19b2d
|
Merge branch 'v3' into v3_updateSpine
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-10-16 16:48:16 +08:00 |
samuele3hu
|
8b5f6ae52a
|
Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-10-16 16:04:09 +08:00 |
samuele3hu
|
b4c91f0712
|
Update the related cocosstudio lua test cases
|
2014-10-16 15:51:01 +08:00 |
samuele3hu
|
3f667fac85
|
Update the related AssetsManagerEx files and related project configure
|
2014-10-16 10:28:52 +08:00 |
Huabing.Xu
|
c12f88d63c
|
lua compiles ok-need to make it works later
|
2014-10-15 17:33:58 +08:00 |
samuele3hu
|
a0c8ffb943
|
Modify Xcode project’s configure
|
2014-10-15 14:32:11 +08:00 |
samuele3hu
|
064e159c70
|
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
|
2014-10-15 13:41:27 +08:00 |
samuele3hu
|
4a67963420
|
Update CSLoader lua-bindings and adjust project config
|
2014-10-14 23:37:00 +08:00 |
andyque
|
8a6b78c510
|
fix lua bindings
|
2014-10-14 11:24:45 +08:00 |
pipu
|
b732ce378e
|
Merge branch 'v3_pipu_protocol_buffers' into merge_test
Conflicts:
cocos/ui/UIScale9Sprite.cpp
|
2014-10-11 11:08:46 +08:00 |
pipu
|
d699b5809b
|
Modifying libprotocolbuf.a as protocolbuffer.a
|
2014-10-10 12:52:42 +08:00 |
samuele3hu
|
f97a7ae52d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-10-10 09:52:29 +08:00 |
samuele3hu
|
115d81574c
|
Add CameraTest、OBBTest and related lua bindings
|
2014-10-10 09:49:25 +08:00 |
pandamicro
|
a26e91f839
|
no message
|
2014-10-09 18:30:39 +08:00 |
yangxiao
|
d680e58f80
|
merge cocos resolve conflict
|
2014-09-30 08:32:37 +08:00 |
samuele3hu
|
6ea43a60b0
|
Update cocos2dx.ini to skip Node::setAdditionalTransform
|
2014-09-29 10:19:32 +08:00 |
samuele3hu
|
f00187d3bb
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
Conflicts:
tools/tolua/cocos2dx.ini
|
2014-09-29 09:48:35 +08:00 |
samuele3hu
|
99e1c6640e
|
Add BillBoardTest and update related bindings files
|
2014-09-29 09:43:22 +08:00 |
samuele3hu
|
6b2acf88fc
|
Modify CameraTest and update related lua-bindings files
|
2014-09-28 16:47:06 +08:00 |
samuele3hu
|
e50eaf684f
|
Add CameraTest and update related lua-bindings files
|
2014-09-28 14:31:58 +08:00 |
yangxiao
|
75e5ca30ee
|
merge cocos
|
2014-09-28 09:55:31 +08:00 |
samuele3hu
|
2ac96ed06e
|
Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement
|
2014-09-26 16:39:54 +08:00 |
samuele3hu
|
691074eb7c
|
Add Camra3DTest and update sprite3DTest
|
2014-09-26 16:00:57 +08:00 |
yangxiao
|
98d9cea774
|
merge cocos
|
2014-09-26 15:14:57 +08:00 |