samuele3hu
|
1b20e463d8
|
Update the Lua binding about the Polygon and update the test case.
|
2015-06-11 14:38:38 +08:00 |
CocosRobot
|
94a47fabcf
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-11 06:16:36 +00:00 |
VisualSJ
|
2d12d6a295
|
Plist file parsing (action-2.x.js)
|
2015-06-11 11:14:10 +08:00 |
VisualSJ
|
3306c7b072
|
Fixed control LayoutComponent positioning bug
|
2015-06-08 15:41:33 +08:00 |
CocosRobot
|
4fc0366e4d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-08 06:21:14 +00:00 |
VisualSJ
|
060ab85f22
|
Fixed UIText color settings bug
|
2015-06-08 13:58:08 +08:00 |
CocosRobot
|
835e56e80a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 23:13:03 +00:00 |
CocosRobot
|
9178eeca73
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 08:11:21 +00:00 |
CocosRobot
|
9e3fa92803
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 01:51:34 +00:00 |
pandamicro
|
e0eff26674
|
Fix component function execution issue in JSB
|
2015-06-05 00:03:21 +08:00 |
pandamicro
|
25e047eb41
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into skipComponentFns
|
2015-06-04 23:29:45 +08:00 |
CocosRobot
|
8865bd488e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-04 12:52:41 +00:00 |
pandamicro
|
af756c50dc
|
Merge pull request #12184 from pandamicro/v3
Fix issue that __JSDownloaderDelegator::onError get called twice
|
2015-06-04 20:42:35 +08:00 |
pandamicro
|
e75dee6e7c
|
Remove C++ invocation functions of Component
|
2015-06-04 20:10:10 +08:00 |
pandamicro
|
2da754dcf2
|
Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode
Add onEnter and onExit of components to CCNode's onEnter and onExit function
|
2015-06-04 18:39:52 +08:00 |
pandamicro
|
ba1191f98f
|
Merge pull request #12132 from pandamicro/v3_origin
cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread
|
2015-06-04 17:51:11 +08:00 |
VisualSJ
|
a91fdd6b8e
|
Synchronization studio parser - (fixed: resPath and custom easing animation)
|
2015-06-04 16:59:42 +08:00 |
VisualSJ
|
587bd475e9
|
Synchronization studio parser - (fixed: resPath and custom easing animation)
|
2015-06-04 16:23:06 +08:00 |
pandamicro
|
2c168130ed
|
Fix jsbinding calls for CCComponent
|
2015-06-04 15:59:05 +08:00 |
pandamicro
|
83f7f30c1c
|
Fix issue that __JSDownloaderDelegator::onError get called twice
|
2015-06-04 15:03:20 +08:00 |
pandamicro
|
9c23126d9e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-06-04 13:14:34 +08:00 |
CocosRobot
|
76b151c281
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-03 20:25:32 +00:00 |
samuele3hu
|
0cccd6e765
|
Fix compile error on the Linux and update the test cases
|
2015-06-03 18:12:21 +08:00 |
samuele3hu
|
a20681aa21
|
Add Lua-bindings for NavMesh
|
2015-06-02 18:37:57 +08:00 |
jianglong0156
|
ac71777e97
|
add webview and videoplayer protect contidition.
|
2015-06-02 13:50:55 +08:00 |
jianglong0156
|
c46fea1f7a
|
Merge branch 'v3' into videoplayer
|
2015-06-02 11:26:48 +08:00 |
pandamicro
|
4c6f67fd7e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
tools/bindings-generator
web
|
2015-06-02 10:12:22 +08:00 |
pandamicro
|
fdec552ed7
|
Fix cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread and improve Downloader
|
2015-06-02 10:08:13 +08:00 |
江龙
|
a8b640f751
|
add videoplayer project
|
2015-06-02 09:04:15 +08:00 |
CocosRobot
|
3a1b52cafd
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-05-29 06:31:00 +00:00 |
CocosRobot
|
892816de3a
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-29 05:46:22 +00:00 |
jianglong0156
|
722b6b1baf
|
add video player binding files
|
2015-05-29 11:39:47 +08:00 |
子龙山人
|
a968bc2d15
|
Merge pull request #12062 from jianglong0156/jsWebviewTest
Js webview test
|
2015-05-29 11:35:30 +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
|
ab124978aa
|
web view can not run in mac, remove it from project file
|
2015-05-28 14:46:29 +08:00 |
jianglong0156
|
379f536330
|
improve test case, remove the invalid testcase
|
2015-05-28 14:02:07 +08:00 |
jianglong0156
|
1dbaa5bb11
|
fix error log output
|
2015-05-28 11:56:07 +08:00 |
子龙山人
|
001614a9c5
|
Merge pull request #11908 from flashjay/patch-1
fix: luaLoadChunksFromZIP should just remove .lua or .luac extension
|
2015-05-28 10:58:46 +08:00 |
jianglong0156
|
c0b42fdfec
|
modify addEventListener to setEventListener
|
2015-05-28 10:12:58 +08:00 |
子龙山人
|
6f16965b06
|
Merge pull request #12060 from CocosRobot/update_lua_bindings_1432717405
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 22:43:28 +08:00 |
pandamicro
|
37f2d84675
|
Merge pull request #12056 from musikov/v3-jsb-cccolor-fix
cc.Color() and cc.color() don't replace 0 alpha with 255 no more
|
2015-05-27 21:31:29 +08:00 |
jianglong0156
|
7402295205
|
improve event key
|
2015-05-27 18:02:01 +08:00 |
jianglong0156
|
2dd7b9575b
|
iOS project add web view project
|
2015-05-27 17:53:50 +08:00 |
CocosRobot
|
3bf58ab401
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 09:08:33 +00:00 |
子龙山人
|
b8fd5ba290
|
Merge pull request #12052 from CocosRobot/update_lua_bindings_1432713396
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 16:59:50 +08:00 |
Mykyta Usikov
|
355381e0d8
|
cc.Color() and cc.color() don't replace 0 alpha with 255 no more
|
2015-05-27 11:25:04 +03:00 |
CocosRobot
|
3851e8356e
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 08:00:53 +00:00 |
samuele3hu
|
9934d73548
|
issue #12046: Add Lua bindings for material systems and related test cases.
|
2015-05-27 15:37:59 +08:00 |
jianglong0156
|
83f34c23d8
|
fixed the code error
|
2015-05-27 15:22:03 +08:00 |
jianglong0156
|
579f122cb1
|
add webview jsb eventType
|
2015-05-27 15:11:12 +08:00 |
jianglong0156
|
521ce15cb6
|
add webview autobindings. modify webtest. adapt the web interface
|
2015-05-27 11:46:26 +08:00 |
CocosRobot
|
824456b073
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-26 21:56:01 +00: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 |
CocosRobot
|
7fa68d9b3a
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-25 08:37:59 +00:00 |
minggo
|
203203a92d
|
Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2
upgrade rapidjson to 1.0.2
|
2015-05-25 15:18:15 +08:00 |
andyque
|
81070a5299
|
fix lua project compile error
|
2015-05-25 13:42:54 +08:00 |
andyque
|
81d562803b
|
upgrade rapidjson to 1.0.2
|
2015-05-25 11:43:03 +08:00 |
samuele3hu
|
074216bef9
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
Conflicts:
templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
tests/lua-tests/src/mainMenu.lua
|
2015-05-24 22:46:05 +08:00 |
CocosRobot
|
f18b8bfd95
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-22 06:55:54 +00:00 |
minggo
|
698428e0a1
|
Merge pull request #11971 from joshuastray/physics
Physics3d js binding
|
2015-05-22 14:42:34 +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 |
CocosRobot
|
59807629d9
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-22 02:04:38 +00:00 |
joshuastray
|
342734e3b5
|
Merge remote-tracking branch 'upstream/v3' into physics
|
2015-05-21 21:15:42 +08:00 |
joshuastray
|
83237b8dbd
|
add physics3d js manual binding and tests
|
2015-05-21 18:05:49 +08:00 |
andyque
|
03e8f16a8a
|
add vs2015 support
|
2015-05-21 13:55:01 +08:00 |
CocosRobot
|
ad301891f0
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-21 02:46:49 +00:00 |
minggo
|
69b6c9a3e5
|
Merge pull request #11906 from samuele3hu/v3_check
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
|
2015-05-21 10:35:38 +08:00 |
CocosRobot
|
cb6abaa14c
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-21 01:52:51 +00:00 |
Dale Stammen
|
3523173594
|
removed CC_PLATFORM_WP8
|
2015-05-20 07:58:39 -07:00 |
joshuastray
|
712ba4f64c
|
add physics3d auto binding
|
2015-05-20 10:36:26 +08:00 |
HuaYang Huang
|
acb29ed5a8
|
fix: luaLoadChunksFromZIP should just remove .lua or .luac extension
last version may filter modules like 'framework.luaj', 'framework.luaoc'
|
2015-05-20 10:36:05 +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 |
CocosRobot
|
61aad4581a
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-19 23:02:24 +00:00 |
minggo
|
38773e2164
|
Merge pull request #11869 from samuele3hu/v3_updateccs
Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua
|
2015-05-19 09:26:09 +08:00 |
samuele3hu
|
349f9bde11
|
Fix the compile error in the release mode
|
2015-05-18 17:43:20 +08:00 |
CocosRobot
|
3e08ec4c11
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-18 07:04:27 +00:00 |
CocosRobot
|
9572de26d4
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-18 05:43:08 +00:00 |
samuele3hu
|
da2314b00a
|
Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua
|
2015-05-18 09:41:35 +08:00 |
minggo
|
2dbe375380
|
Merge pull request #11868 from joshuastray/bullet-preprocessor-macro
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
|
2015-05-18 09:33:00 +08:00 |
joshuastray
|
ead74ac89e
|
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
|
2015-05-17 23:11:17 +08:00 |
unknown
|
91432f0ddf
|
fixed include paths for arm builds
|
2015-05-15 15:35:36 -07:00 |
samuele3hu
|
71595898ed
|
Update the Lua binding for Physics3D ,related test cases and the template project
|
2015-05-15 16:25:07 +08:00 |
Dale Stammen
|
46c69c7793
|
added ignore warning 4996 to hide the 200 deprecated warnings in libcocos2d-jsb
|
2015-05-14 19:00:53 -07:00 |
samuele3hu
|
fa63471c0a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
Conflicts:
tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
|
2015-05-15 09:31:53 +08:00 |
samuele3hu
|
8db62c82f8
|
Add Lua bindings for Physics3D and related test cases
|
2015-05-15 09:28:03 +08:00 |
minggo
|
0a3e6338f1
|
Merge pull request #11834 from pandamicro/v3_origin
Sync fixes in Cocos2d-JS
|
2015-05-14 13:38:18 +08:00 |
pandamicro
|
4146a6edf4
|
Fix incorrect property of cc.Texture2D
|
2015-05-14 10:41:10 +08:00 |
pandamicro
|
2685df73f2
|
Fix spine crash issue
|
2015-05-14 10:40:37 +08:00 |
CocosRobot
|
006f9fcd36
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-14 02:30:32 +00:00 |
CocosRobot
|
6bf984f3d3
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-13 08:11:34 +00:00 |
minggo
|
5e87bd307b
|
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
Add support for visual studio 2015.
|
2015-05-13 09:37:12 +08:00 |
pandamicro
|
3190d0e5fb
|
Add localStorage.clear test case
|
2015-05-12 19:02:22 +08:00 |
pandamicro
|
c7f3c2fa8b
|
Fix Scale9Sprite's inheritance issue triggered by its constructor
|
2015-05-12 18:04:01 +08:00 |
pandamicro
|
ef0854545b
|
Fix cc.EventMouse constants issue
|
2015-05-12 18:02:36 +08:00 |
pandamicro
|
c9ee849a2c
|
Add localStorage.clear in JSB
|
2015-05-12 18:02:14 +08:00 |
WenhaiLin
|
e53a977439
|
Add support for visual studio 2015.
|
2015-05-12 16:46:09 +08:00 |
CocosRobot
|
dbb51e2367
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-12 05:59:42 +00:00 |
minggo
|
cdfce7fcae
|
Merge pull request #11791 from CocosRobot/update_lua_bindings_1431407875
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-12 13:51:32 +08:00 |
minggo
|
398d36b58a
|
Merge pull request #11788 from joshuastray/spritepolygon
SpritePolygon binding and tests for js
|
2015-05-12 13:46:22 +08:00 |
CocosRobot
|
a7fb56de69
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-12 05:23:45 +00: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 |
CocosRobot
|
e325a3b746
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-11 08:33:55 +00:00 |
CocosRobot
|
b5e9986d17
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-11 02:00:41 +00:00 |
minggo
|
bf93289718
|
Merge pull request #11751 from samuele3hu/v3_7_remove_vs2012
Remove vs2012 support in v3
|
2015-05-08 14:11:13 +08:00 |
minggo
|
14cebf7150
|
Merge pull request #11750 from CocosRobot/update_lua_bindings_1431050321
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-08 10:42:31 +08:00 |
minggo
|
d587ffd5c0
|
Merge pull request #11736 from samuele3hu/v3_7_js
issue 10411:Bug in Physics manual Lua binding
|
2015-05-08 10:04:55 +08:00 |
CocosRobot
|
4195c4b250
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-08 02:03:02 +00:00 |
minggo
|
09ddf15b9f
|
Merge pull request #11740 from joshuastray/fix-debu
fix jsb debugger bug
|
2015-05-08 09:29:40 +08:00 |
Jialong Zhai
|
be923b5901
|
fix jsb debugger bug
|
2015-05-07 18:24:30 +08:00 |
samuele3hu
|
23e4e0d4e3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
|
2015-05-07 16:21:03 +08:00 |
samuele3hu
|
0d53065476
|
issue 10411:Bug in Physics manual Lua binding
|
2015-05-07 16:15:24 +08:00 |
andyque
|
db95034798
|
fix android compile error
|
2015-05-07 10:37:19 +08:00 |
samuele3hu
|
cc4fe9b746
|
Modify the configuration about js-tests.
|
2015-05-06 10:52:23 +08:00 |
CocosRobot
|
8470ab606b
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-06 01:07:26 +00:00 |
samuele3hu
|
f1b5729183
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
|
2015-05-05 16:14:57 +08:00 |
samuele3hu
|
037c17fe5d
|
Remove vs2012 support in v3
|
2015-05-05 16:11:26 +08:00 |
CocosRobot
|
534868368e
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-05 05:48:55 +00:00 |
CocosRobot
|
6ef35d48ae
|
[AUTO]: updating luabinding automatically
|
2015-05-05 03:31:53 +00:00 |
minggo
|
5a7cf31663
|
Merge pull request #11682 from CocosRobot/update_lua_bindings_1430789665
[AUTO]: updating luabinding automatically
|
2015-05-05 11:17:06 +08:00 |
zhangbin
|
b4f2d94109
|
Update js bindings & js tests.
|
2015-05-05 10:50:19 +08:00 |
CocosRobot
|
4414536612
|
[AUTO]: updating luabinding automatically
|
2015-05-05 01:36:54 +00:00 |
CocosRobot
|
2b916b3b80
|
[AUTO]: updating luabinding automatically
|
2015-04-30 06:56:36 +00:00 |
minggo
|
4acd231f89
|
merge v3.6
|
2015-04-30 13:46:08 +08:00 |
CocosRobot
|
1f02af4a94
|
[AUTO]: updating luabinding automatically
|
2015-04-28 12:21:56 +00:00 |
samuele3hu
|
5819159889
|
Add Lua-bindings for SpritePolygon and related test case
|
2015-04-28 18:19:57 +08:00 |
samuele3hu
|
c801d1868c
|
Update Sprite3DTest and VideoPlayerTest about Lua
|
2015-04-28 11:27:50 +08:00 |
CocosRobot
|
a7edda72f5
|
[AUTO]: updating luabinding automatically
|
2015-04-27 09:47:08 +00:00 |
CocosRobot
|
09a6cc19b7
|
[AUTO]: updating luabinding automatically
|
2015-04-27 07:48:42 +00:00 |
CocosRobot
|
09cddb4d4b
|
[AUTO]: updating luabinding automatically
|
2015-04-27 02:25:05 +00:00 |
minggo
|
c500d6b0a7
|
Merge pull request #11588 from WenhaiLin/v3-jsb
[js-tests]Fixed crash.
|
2015-04-27 10:20:07 +08:00 |
Danut Chereches
|
5f692962b9
|
fixed 'seperate' typo
issue #8408
|
2015-04-25 00:02:39 +03:00 |
WenhaiLin
|
5e5cd5faa1
|
[js-tests]Fixed crash on Win32/Universal.
|
2015-04-24 17:12:46 +08:00 |
zhangbin
|
61cf0ad28b
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
|
2015-04-23 15:46:19 +08:00 |
zhangbin
|
dcca32bd82
|
Update the CMakeLists & the remote url of submodule js-bindings.
|
2015-04-23 14:23:19 +08:00 |
CocosRobot
|
30ccbe3526
|
[AUTO]: updating luabinding automatically
|
2015-04-21 10:29:17 +00:00 |
zhangbin
|
8abd2269bd
|
Update js bindings.
|
2015-04-21 11:46:00 +08:00 |
zhangbin
|
6ee624796a
|
Merge branch 'v3-jsb' of github.com:natural-law/cocos2d-x into v3-jsb
|
2015-04-20 18:09:57 +08:00 |
zhangbin
|
a1b5fa5a8e
|
Solve the error in js template.
|
2015-04-20 18:09:39 +08:00 |
CocosRobot
|
87e29db218
|
[AUTO]: updating luabinding automatically
|
2015-04-20 05:40:58 +00:00 |
samuele3hu
|
9477e89723
|
Fix the compile error on the win32
|
2015-04-20 11:46:48 +08:00 |
samuele3hu
|
4f22a1470b
|
Update the project setting
|
2015-04-20 10:11:39 +08:00 |
WenhaiLin
|
dc768dbd8c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge
|
2015-04-20 10:06:48 +08:00 |
samuele3hu
|
067ad6ad60
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2
Conflicts:
cocos/scripting/lua-bindings/proj.android/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
|
2015-04-20 10:05:02 +08:00 |
minggo
|
e133f81226
|
Merge pull request #11482 from samuele3hu/v3_remove_useless
[ci skip]Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B
|
2015-04-17 17:54:53 +08:00 |
minggo
|
768d2bdb48
|
Merge pull request #11481 from andyque/remove-all-lz-in-android
remove system zlib dependency since we use our own prebuilt version
|
2015-04-17 17:49:14 +08:00 |
samuele3hu
|
9aadc2a993
|
Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B,
|
2015-04-17 17:40:28 +08:00 |
zhangbin
|
e5672b6e1f
|
Update js bindings.
|
2015-04-17 17:27:47 +08:00 |
andyque
|
d3a06de6d6
|
remove system zlib dependency since we use our own prebuilt version of
zlib now.
|
2015-04-17 17:24:33 +08:00 |
samuele3hu
|
b300701ec4
|
Remove the reference of quick module
|
2015-04-17 15:52:45 +08:00 |
zhangbin
|
b8b49a387e
|
Update the js template.
|
2015-04-17 14:59:12 +08:00 |
samuele3hu
|
b72034a3f6
|
Add Lua bindings for WebView and related test case
|
2015-04-17 14:08:47 +08:00 |
zhangbin
|
1f491cf656
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
Conflicts:
build/cocos2d-wp8.sln
|
2015-04-16 17:04:07 +08:00 |
CocosRobot
|
f1bd23aa32
|
[AUTO]: updating luabinding automatically
|
2015-04-16 02:19:38 +00:00 |
zhangbin
|
3641451c47
|
Update the submodule js-bindings & update solution files for js-bindings.
|
2015-04-15 13:58:41 +08:00 |
CocosRobot
|
66fcba02b1
|
[AUTO]: updating luabinding automatically
|
2015-04-14 09:10:16 +00:00 |
CocosRobot
|
0e4a209241
|
[AUTO]: updating luabinding automatically
|
2015-04-14 08:44:30 +00:00 |
zhangbin
|
8c2413aa54
|
Add submodule js-bindings & html5.
|
2015-04-14 15:20:46 +08:00 |
CocosRobot
|
a0a6b9cda4
|
[AUTO]: updating luabinding automatically
|
2015-04-14 02:12:05 +00:00 |
minggo
|
bc34554bd9
|
Merge pull request #11407 from samuele3hu/v3_studio2
Synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
|
2015-04-13 18:22:18 +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 |
CocosRobot
|
698a75e17f
|
[AUTO]: updating luabinding automatically
|
2015-04-13 05:44:29 +00:00 |
CocosRobot
|
bd3b978c89
|
[AUTO]: updating luabinding automatically
|
2015-04-10 10:18:33 +00:00 |
CocosRobot
|
15f22d936f
|
[AUTO]: updating luabinding automatically
|
2015-04-10 07:27:51 +00:00 |
samuele3hu
|
9bf2a920b4
|
Update the Lua bindings for terrain and TerrainTest.lua
|
2015-04-09 13:41:52 +08:00 |
CocosRobot
|
22da4c4832
|
[AUTO]: updating luabinding automatically
|
2015-04-09 03:50:13 +00:00 |
tangziwen
|
176532eef4
|
update Terrain Lua binding
|
2015-04-09 10:01:40 +08:00 |
CocosRobot
|
58ca1b7911
|
[AUTO]: updating luabinding automatically
|
2015-04-08 03:52:03 +00:00 |
minggo
|
4bcfcb1d09
|
Merge pull request #11320 from samuele3hu/v3_terrain
#issue 10819:Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 11:45:46 +08:00 |
CocosRobot
|
4bcf6b7b67
|
[AUTO]: updating luabinding automatically
|
2015-04-08 02:04:07 +00:00 |
samuele3hu
|
3a2601a1f8
|
Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 10:03:50 +08:00 |
minggo
|
50fa15c0cd
|
Merge pull request #11301 from samuele3hu/v3_lua_jit
Add luajit support for iOS 64bit devices and related test cases
|
2015-04-07 18:17:09 +08:00 |
samuele3hu
|
a64e90d469
|
Update the related project setting for Luajit and related test cases
|
2015-04-06 22:41:34 +08:00 |
CocosRobot
|
e20a747138
|
[AUTO]: updating luabinding automatically
|
2015-04-03 07:53:06 +00:00 |
samuele3hu
|
826fe4cf31
|
Update the Xcode project setting for luajit
|
2015-04-02 10:07:31 +08:00 |
CocosRobot
|
dfc2390659
|
[AUTO]: updating luabinding automatically
|
2015-04-02 01:51:14 +00:00 |
CocosRobot
|
17a80b0c54
|
[AUTO]: updating luabinding automatically
|
2015-04-01 02:59:47 +00:00 |
CocosRobot
|
46f32142c7
|
[AUTO]: updating luabinding automatically
|
2015-03-31 10:26:49 +00:00 |
CocosRobot
|
00792e98a3
|
[AUTO]: updating luabinding automatically
|
2015-03-31 04:01:57 +00:00 |
samuele3hu
|
921981833e
|
Update Sprite3DCubeMap test case
|
2015-03-28 14:59:47 +08:00 |
samuele3hu
|
f54512a618
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment
|
2015-03-27 15:59:05 +08:00 |
samuele3hu
|
bb225d052e
|
Update comments of some header files
|
2015-03-27 15:27:08 +08:00 |
CocosRobot
|
4785e6e383
|
[AUTO]: updating luabinding automatically
|
2015-03-27 05:46:01 +00:00 |
minggo
|
8691602b81
|
Merge pull request #11185 from samuele3hu/v3_5_comment
[ci skip]Update comments of some header files
|
2015-03-27 11:35:11 +08:00 |
samuele3hu
|
a1b054911c
|
Update comments of some header files
|
2015-03-27 11:13:28 +08:00 |
CocosRobot
|
c73602a523
|
[AUTO]: updating luabinding automatically
|
2015-03-27 02:26:35 +00:00 |
CocosRobot
|
a4e633a299
|
[AUTO]: updating luabinding automatically
|
2015-03-26 16:17:35 +00:00 |
samuele3hu
|
e0bde0f789
|
Update comments of some header files
|
2015-03-26 22:07:44 +08:00 |
CocosRobot
|
f43b666929
|
[AUTO]: updating luabinding automatically
|
2015-03-26 02:44:28 +00:00 |
minggo
|
f9589d166d
|
Merge pull request #11161 from samuele3hu/v3_5_comment
Update comments of some header files
|
2015-03-26 10:37:41 +08:00 |
minggo
|
fae951d928
|
Merge pull request #11150 from samuele3hu/v3_5_test
[ci skip]Update comments of some header files
|
2015-03-26 10:00:11 +08:00 |
samuele3hu
|
1bea6a52a2
|
Update comments of some header files
|
2015-03-25 18:54:33 +08:00 |
yinjimmy
|
75a7927bad
|
Load all lua module as default
|
2015-03-25 16:35:11 +08:00 |
CocosRobot
|
1ced296b58
|
[AUTO]: updating luabinding automatically
|
2015-03-25 03:59:57 +00:00 |
minggo
|
1f4d7c598f
|
Merge pull request #11126 from samuele3hu/v3_5_test
[ci skip]Update comments of some header files
|
2015-03-25 09:53:28 +08:00 |
samuele3hu
|
f3890d3bb3
|
Update comments of some header files
|
2015-03-24 21:52:56 +08:00 |
samuele3hu
|
020b3ba5cb
|
Update comments of some header files
|
2015-03-24 21:46:18 +08:00 |