CocosRobot
|
4236e89245
|
[AUTO]: updating luabinding automatically
|
2014-08-18 15:26:32 +00:00 |
CocosRobot
|
85d505b427
|
[AUTO]: updating luabinding automatically
|
2014-08-18 14:47:35 +00:00 |
samuele3hu
|
91fd40dd3a
|
Add a newline for some files
|
2014-08-18 15:27:54 +08:00 |
samuele3hu
|
2d8ae3a917
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_3d_module
|
2014-08-18 15:08:04 +08:00 |
samuele3hu
|
e0168c373c
|
Add manual lua bindings for 3d and adjust related test case on different platform
|
2014-08-18 15:04:32 +08:00 |
CocosRobot
|
bdfc48b127
|
[AUTO]: updating luabinding automatically
|
2014-08-15 07:44:57 +00:00 |
CocosRobot
|
24f0e8aada
|
[AUTO]: updating luabinding automatically
|
2014-08-15 07:23:17 +00:00 |
minggo
|
3f2fccb999
|
Merge pull request #7771 from samuele3hu/v3_3_module
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
|
2014-08-14 18:33:53 +08:00 |
samuele3hu
|
85ad4241a0
|
Modify Xcode project setting
|
2014-08-14 11:10:52 +08:00 |
CocosRobot
|
6467dcaa57
|
[AUTO]: updating luabinding automatically
|
2014-08-14 02:17:25 +00:00 |
minggo
|
d76724b6aa
|
Merge pull request #7773 from CocosRobot/update_lua_bindings_1407980273
[AUTO]: updating luabinding automatically
|
2014-08-14 09:43:08 +08:00 |
CocosRobot
|
7a99220aad
|
[AUTO]: updating luabinding automatically
|
2014-08-14 01:39:44 +00:00 |
minggo
|
f1ae73bf30
|
Merge pull request #7766 from samuele3hu/v3_3_fix
Add release_print lua binding
|
2014-08-14 09:35:16 +08:00 |
samuele3hu
|
032f5ea781
|
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
|
2014-08-14 00:06:28 +08:00 |
CocosRobot
|
df7c0ae1cb
|
[AUTO]: updating luabinding automatically
|
2014-08-13 06:42:14 +00:00 |
samuele3hu
|
8ab7647b54
|
Add release_print lua bindings
|
2014-08-13 10:27:06 +08:00 |
CocosRobot
|
cbbe7b9c60
|
[AUTO]: updating luabinding automatically
|
2014-08-12 02:08:16 +00:00 |
minggo
|
43a3603a8b
|
Merge pull request #7720 from samuele3hu/v3_module
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
|
2014-08-11 15:01:28 +08:00 |
samuele3hu
|
3c3c05204f
|
Split files in lua-bindings/script into different module and adjust related project
|
2014-08-11 12:54:30 +08:00 |
samuele3hu
|
47c034af5d
|
Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure
|
2014-08-11 10:25:40 +08:00 |
CocosRobot
|
3d222ab73a
|
[AUTO]: updating luabinding automatically
|
2014-08-11 01:31:04 +00:00 |
samuele3hu
|
2dacbf6f26
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
|
2014-08-08 16:59:33 +08:00 |
samuele3hu
|
8919ebc011
|
Add build all lualibs target for iOS and Mac
|
2014-08-08 16:08:24 +08:00 |
CocosRobot
|
aa68a63757
|
[AUTO]: updating luabinding automatically
|
2014-08-08 02:49:17 +00:00 |
samuele3hu
|
201b33b465
|
Set intermediate directory for related lua bindings projects on win32 platform
|
2014-08-08 09:40:13 +08:00 |
samuele3hu
|
53eb0345a5
|
Remove useless library for cocos2d_lua_bindings
|
2014-08-07 16:15:42 +08:00 |
CocosRobot
|
91b297b085
|
[AUTO]: updating luabinding automatically
|
2014-08-07 02:40:46 +00:00 |
CocosRobot
|
f47d11cce0
|
[AUTO]: updating luabinding automatically
|
2014-08-06 09:14:13 +00:00 |
samuele3hu
|
497847f7e8
|
Reset cpp-tests/cpp-empty-tests Mac build configure to ‘debug’ and delete some auto-bindings files.
|
2014-08-06 14:46:30 +08:00 |
samuele3hu
|
0daa30419b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
tools/tolua/cocos2dx.ini
|
2014-08-06 00:37:19 +08:00 |
samuele3hu
|
6f763917a7
|
Delte liblua project for win32 and adjust cocos2d-win32 project
|
2014-08-06 00:26:02 +08:00 |
samuele3hu
|
4d4d5374df
|
Delete Android.mk for cocos_lua_static
|
2014-08-06 00:18:56 +08:00 |
samuele3hu
|
99c52f0102
|
Split module for Linux on Lua and adjust related test cases
|
2014-08-06 00:15:44 +08:00 |
samuele3hu
|
d86a37110d
|
Split module for win32 and adjust related test cases
|
2014-08-05 19:46:13 +08:00 |
CocosRobot
|
24da61e443
|
[AUTO]: updating luabinding automatically
|
2014-08-05 05:35:12 +00:00 |
samuele3hu
|
da18657f4f
|
Add module Android.mk config and adjust related test cases
|
2014-08-05 13:29:54 +08:00 |
CocosRobot
|
f3e2ebf215
|
[AUTO]: updating luabinding automatically
|
2014-08-05 03:57:51 +00:00 |
CocosRobot
|
8dd1be5172
|
[AUTO]: updating luabinding automatically
|
2014-08-05 02:05:02 +00:00 |
samuele3hu
|
cd0c82f8b7
|
Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates
|
2014-08-04 17:11:57 +08:00 |
samuele3hu
|
e5f9c1b488
|
Adjust common script and related test cases
|
2014-08-04 15:22:07 +08:00 |
samuele3hu
|
6f4cafcc1b
|
Add module register functions and adjust iOS and Mac test cases
|
2014-08-04 09:39:42 +08:00 |
CocosRobot
|
fda11428bf
|
[AUTO]: updating luabinding automatically
|
2014-08-01 07:53:19 +00:00 |
CocosRobot
|
26c76f5cf1
|
[AUTO]: updating luabinding automatically
|
2014-08-01 04:02:13 +00:00 |
samuele3hu
|
a47e52b5bc
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-07-31 15:22:46 +08:00 |
samuele3hu
|
9666f1ad7f
|
Split luabindings module to some independent modules
|
2014-07-31 15:20:23 +08:00 |
CocosRobot
|
095d4ed3c5
|
[AUTO]: updating luabinding automatically
|
2014-07-31 05:49:25 +00:00 |
andyque
|
98ef180ca8
|
add default value to luaval_to_ulong
|
2014-07-29 15:59:49 +08:00 |
andyque
|
cfe7e57561
|
fix binding generator can nott regonize unsigned long arguments
|
2014-07-29 15:48:12 +08:00 |
Huabing.Xu
|
aaa65dcae4
|
Merge branch 'v3' into v3_windowChangeModule
|
2014-07-29 10:20:23 +08:00 |
Huabing.Xu
|
4a4f05c827
|
change cocos2d to libcocos2d for windows
|
2014-07-28 20:55:58 +08:00 |
minggo
|
bf6e706ab9
|
fix xcode project setting
|
2014-07-28 15:37:00 +08:00 |
CocosRobot
|
12042bfd9d
|
[AUTO]: updating luabinding automatically
|
2014-07-28 03:38:12 +00:00 |
minggo
|
31af102f26
|
Merge pull request #7532 from lite3/object_to_luaval
replace dynamic_cast to std::is_base_of
|
2014-07-25 23:11:55 +08:00 |
samuele3hu
|
1d055fe6e6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_retain
|
2014-07-25 09:44:52 +08:00 |
samuele3hu
|
e51cb57c53
|
Fix the a error in the `ccmap_string_key_to_luaval` functions
|
2014-07-25 09:44:17 +08:00 |
CocosRobot
|
8cc0a2eea3
|
[AUTO]: updating luabinding automatically
|
2014-07-24 14:23:49 +00:00 |
CocosRobot
|
283d727b76
|
[AUTO]: updating luabinding automatically
|
2014-07-23 06:21:31 +00:00 |
samuele3hu
|
0a6af2f758
|
Add more useful tip for error log
|
2014-07-23 13:44:57 +08:00 |
samuele3hu
|
6d678ce443
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_conversion
|
2014-07-23 11:57:56 +08:00 |
samuele3hu
|
91fc288fbe
|
Add more useful tip for error log
|
2014-07-23 11:57:17 +08:00 |
CocosRobot
|
c8c17b68df
|
[AUTO]: updating luabinding automatically
|
2014-07-22 09:11:18 +00:00 |
samuele3hu
|
aa0308a7c8
|
Add more useful tip for error log
|
2014-07-22 11:16:16 +08:00 |
samuele3hu
|
5e773edb28
|
Merge branch 'more_details_for_conversion_error_msg' of https://github.com/edwardzhou/cocos2d-x into v3_conversion
|
2014-07-21 16:01:56 +08:00 |
lite3
|
d66d9b02de
|
replace dynamic_cast to std::is_base_of
|
2014-07-21 14:37:46 +08:00 |
CocosRobot
|
30b00dadd8
|
[AUTO]: updating luabinding automatically
|
2014-07-21 03:57:41 +00:00 |
edwardzhou
|
bf4143b5a3
|
show detail class & function name on conversion error
|
2014-07-21 09:39:41 +08:00 |
minggo
|
aef1e01ce5
|
Merge pull request #7518 from natural-law/android-dependencies
Android dependencies
|
2014-07-18 17:57:42 +08:00 |
samuele3hu
|
b482a5e971
|
Use relative path in the cocos2dxLuaLoader for showing useless msg when lua script trigger errors
|
2014-07-17 23:53:36 +08:00 |
CocosRobot
|
8ea5083e32
|
[AUTO]: updating luabinding automatically
|
2014-07-17 14:20:04 +00:00 |
CocosRobot
|
ffaa0d9c04
|
[AUTO]: updating luabinding automatically
|
2014-07-17 13:26:35 +00:00 |
samuele3hu
|
10d498e1ae
|
Fix type judgment error.
|
2014-07-17 16:41:09 +08:00 |
CocosRobot
|
aabfdfebed
|
[AUTO]: updating luabinding automatically
|
2014-07-17 07:46:20 +00:00 |
samuele3hu
|
db18530d63
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-17 14:58:50 +08:00 |
samuele3hu
|
e975b0d5f9
|
Update experimental lua bindings、related test cases and project setting
|
2014-07-17 14:54:34 +08:00 |
CocosRobot
|
fda93df648
|
[AUTO]: updating luabinding automatically
|
2014-07-17 06:12:42 +00:00 |
samuele3hu
|
ab0fe54d32
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-17 14:11:15 +08:00 |
samuele3hu
|
eb8d1d70f7
|
Update the FastTileMapTest and VideoPlayerTest
|
2014-07-17 12:55:28 +08:00 |
samuele3hu
|
6f109f330f
|
Update the related Lua bindings for experimental
|
2014-07-17 12:54:50 +08:00 |
CocosRobot
|
9217589b9f
|
[AUTO]: updating luabinding automatically
|
2014-07-17 03:04:08 +00:00 |
minggo
|
ab3a394d08
|
Merge pull request #7472 from CocosRobot/update_lua_bindings_1405563998
[AUTO]: updating luabinding automatically
|
2014-07-17 10:29:18 +08:00 |
CocosRobot
|
e72fffe5c9
|
[AUTO]: updating luabinding automatically
|
2014-07-17 02:28:34 +00:00 |
minggo
|
54da8be54f
|
Merge pull request #7467 from ntotani/fix-lua-accelerometer
fix enabled to interval
|
2014-07-17 10:23:45 +08:00 |
samuele3hu
|
b782814b4b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-16 22:08:48 +08:00 |
CocosRobot
|
af231d78db
|
[AUTO]: updating luabinding automatically
|
2014-07-16 13:02:27 +00:00 |
Naoyuki Totani
|
cd025158f6
|
fix enabled to interval
|
2014-07-16 19:10:05 +09:00 |
samuele3hu
|
1b2d389011
|
Update ListViewEventType for Lua
|
2014-07-16 17:18:01 +08:00 |
zhangbin
|
7e7c3a1e55
|
Merge branch 'v3' into android-dependencies
|
2014-07-16 13:49:20 +08:00 |
samuele3hu
|
a6c30bc495
|
Update bindings-generator config files and manual bindings files to fix the compile warning
|
2014-07-15 17:38:56 +08:00 |
minggo
|
a59a86df0a
|
Merge pull request #7439 from boyu0/merge_arm64_lib_to_fat_lib
merge iOS arm64 libs to fat libs, change the project setting.
|
2014-07-15 16:57:10 +08:00 |
boyu0
|
8400ce2e84
|
fix error.
|
2014-07-15 14:14:35 +08:00 |
boyu0
|
812ad7cd5b
|
fix lua compile error in xcode6 beta3
|
2014-07-15 14:10:36 +08:00 |
samuele3hu
|
55e77d8fd2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-15 11:34:57 +08:00 |
samuele3hu
|
7757df222a
|
Add bit extend module
|
2014-07-14 18:26:39 +08:00 |
CocosRobot
|
1ef1a809b5
|
[AUTO]: updating luabinding automatically
|
2014-07-14 08:53:13 +00:00 |
samuele3hu
|
4cb6c1c74f
|
Add lua bindings for TextureCache::addImageAsync and update the related test cases
|
2014-07-14 16:05:48 +08:00 |
zhangbin
|
272146cfb6
|
Solve the error when compiling lua projects on android.
|
2014-07-14 09:48:16 +08:00 |
CocosRobot
|
87aaf7dcef
|
[AUTO]: updating luabinding automatically
|
2014-07-11 09:48:20 +00:00 |
samuele3hu
|
01c3f2a4ed
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/tolua/cocos2dx.ini
|
2014-07-11 16:44:59 +08:00 |
samuele3hu
|
d1bd21b1db
|
Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0
|
2014-07-11 16:17:51 +08:00 |
samuele3hu
|
d9291031cd
|
Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0
|
2014-07-11 16:10:42 +08:00 |
samuele3hu
|
54970c109f
|
Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0
|
2014-07-11 15:34:21 +08:00 |
minggo
|
41c267fdb7
|
Merge pull request #7400 from CocosRobot/update_lua_bindings_1405057491
[AUTO]: updating luabinding automatically
|
2014-07-11 13:52:38 +08:00 |
CocosRobot
|
563386a777
|
[AUTO]: updating luabinding automatically
|
2014-07-11 05:46:37 +00:00 |
minggo
|
72f8ab8483
|
Merge pull request #7395 from samuele3hu/v3_controller
Add Lua bindings for controller and related test case project
|
2014-07-11 13:39:30 +08:00 |
CocosRobot
|
20c4e6530d
|
[AUTO]: updating luabinding automatically
|
2014-07-11 04:07:14 +00:00 |
samuele3hu
|
2cbe262842
|
Add newline for some files
|
2014-07-11 12:00:43 +08:00 |
samuele3hu
|
77a82731a5
|
Remove auto bindings files for controller
|
2014-07-11 11:57:40 +08:00 |
samuele3hu
|
9b9713073e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
|
2014-07-11 11:55:10 +08:00 |
samuele3hu
|
dd76ae93f6
|
Update controller lua binding and related test cases
|
2014-07-11 11:52:05 +08:00 |
samuele3hu
|
caae8392d4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/scripting/lua-bindings/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
tools/tolua/genbindings.py
|
2014-07-10 22:42:09 +08:00 |
CocosRobot
|
c205bd0806
|
[AUTO]: updating luabinding automatically
|
2014-07-10 14:10:03 +00:00 |
minggo
|
e876065d3e
|
Merge pull request #7229 from samuele3hu/v3_VideoPlayer
Add VideoPlayer Lua bindings and update bindings-generator submodule
|
2014-07-10 22:04:46 +08:00 |
CocosRobot
|
af460a1530
|
[AUTO]: updating luabinding automatically
|
2014-07-10 02:03:40 +00:00 |
samuele3hu
|
2bc1cd0486
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
Conflicts:
cocos/scripting/lua-bindings/script/Cocos2dConstants.lua
|
2014-07-09 22:31:05 +08:00 |
samuele3hu
|
243fa49c09
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
|
2014-07-09 18:08:09 +08:00 |
samuele3hu
|
3546c131dd
|
Add Lua bindings for controller and related test case project
|
2014-07-09 18:05:02 +08:00 |
CocosRobot
|
ae12030745
|
[AUTO]: updating luabinding automatically
|
2014-07-09 05:42:06 +00:00 |
minggo
|
0f7968de89
|
Merge pull request #7339 from super626/v3
fix android, add 3d files to cocos2d.h and remove unused resources
|
2014-07-08 22:09:50 +08:00 |
CocosRobot
|
5838370b31
|
[AUTO]: updating luabinding automatically
|
2014-07-08 10:05:47 +00:00 |
yangxiao
|
ae97d6ebc6
|
Bone conflict
|
2014-07-08 15:48:55 +08:00 |
samuele3hu
|
521f805219
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/bindings-generator
tools/tolua/cocos2dx_physics.ini
|
2014-07-08 14:57:19 +08:00 |
samuele3hu
|
7095298735
|
Add manual lua binding for Node::enumerateChildren
|
2014-07-08 14:22:05 +08:00 |
samuele3hu
|
a1615123a3
|
Fix some type conversion error
|
2014-07-08 12:01:35 +08:00 |
CocosRobot
|
4c1da7d89a
|
[AUTO]: updating luabinding automatically
|
2014-07-06 13:05:59 +00:00 |
minggo
|
a942aae84f
|
Merge pull request #7316 from cocoscodeide/v3
lua runtime template 1.2
|
2014-07-04 18:33:36 +08:00 |
samuele3hu
|
4725388646
|
Remove useless codes
|
2014-07-04 16:43:33 +08:00 |
samuele3hu
|
3b23b0c1ff
|
Remove useless codes
|
2014-07-04 16:30:22 +08:00 |
samuele3hu
|
85dd2e55bf
|
Add Lua bindings for utils and CaptureScreen test case
|
2014-07-04 16:24:00 +08:00 |
chuanweizhang2013
|
b88b5e4c3d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-07-03 11:13:59 +08:00 |
boyu0
|
35ff23fa6d
|
support for Xcode6 iphone 5s simulator
|
2014-07-02 15:16:06 +08:00 |
samuele3hu
|
1271c1b62e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-02 14:29:33 +08:00 |
samuele3hu
|
2aee9ed35d
|
Add the Lua bindings for FastTMXTileMap and FastTMXLayer,then add related test cases
|
2014-07-02 14:26:56 +08:00 |
CocosRobot
|
2821a23640
|
[AUTO]: updating luabinding automatically
|
2014-07-02 02:15:26 +00:00 |
samuele3hu
|
1bc0397644
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
|
2014-07-01 09:47:41 +08:00 |
chuanweizhang2013
|
4481149a30
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-06-30 17:53:46 +08:00 |
CocosRobot
|
774c851dcb
|
[AUTO]: updating luabinding automatically
|
2014-06-30 09:45:03 +00:00 |
CocosRobot
|
bb9df773a9
|
[AUTO]: updating luabinding automatically
|
2014-06-29 09:28:33 +00:00 |
CocosRobot
|
afe11ca435
|
[AUTO]: updating luabinding automatically
|
2014-06-29 08:45:14 +00:00 |
chuanweizhang2013
|
a8f4dcb59f
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-06-28 18:10:17 +08:00 |
samuele3hu
|
67423e0dd2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bu_fix
|
2014-06-27 18:00:34 +08:00 |
samuele3hu
|
318e39a6d2
|
Fix the bug that lua-tests can’t be loaded in iOS64bit device and Linux
|
2014-06-27 17:58:59 +08:00 |
CocosRobot
|
9393777c22
|
[AUTO]: updating luabinding automatically
|
2014-06-27 08:31:17 +00:00 |
samuele3hu
|
6ec93b3575
|
Remove some auto lua binding files by mistake
|
2014-06-27 14:58:18 +08:00 |
samuele3hu
|
b1d07f2711
|
Add VideoPlayer Test for Lua
|
2014-06-27 13:56:39 +08:00 |
samuele3hu
|
b3da322920
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-06-26 16:21:09 +08:00 |
samuele3hu
|
32c355dca4
|
Add VideoPlayer Lua bindings and update bindings-generator submodule
|
2014-06-26 16:19:22 +08:00 |
CocosRobot
|
57513d4c2e
|
[AUTO]: updating luabinding automatically
|
2014-06-26 03:10:44 +00:00 |
samuele3hu
|
c892939968
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_SceneReader
|
2014-06-26 09:52:41 +08:00 |
samuele3hu
|
3bd195d4ef
|
Add Lua binding for ActionTimeline related and related test cases
|
2014-06-26 09:51:32 +08:00 |
CocosRobot
|
755b907e69
|
[AUTO]: updating luabinding automatically
|
2014-06-25 09:36:50 +00:00 |
CocosRobot
|
68649695b2
|
[AUTO]: updating luabinding automatically
|
2014-06-25 09:17:16 +00:00 |
samuele3hu
|
5f63514d6b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_focus
|
2014-06-25 15:15:05 +08:00 |
samuele3hu
|
3a0e750926
|
Add deprecated support for lua binding of `getSize` and `setSize` of Widget
|
2014-06-25 15:13:08 +08:00 |
samuele3hu
|
5c765f6883
|
Add coco studio ui focus test cases for Lua
|
2014-06-25 15:08:59 +08:00 |
CocosRobot
|
515f967f96
|
[AUTO]: updating luabinding automatically
|
2014-06-25 06:17:41 +00:00 |
chuanweizhang2013
|
ac539131e2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-06-25 11:39:17 +08:00 |
CocosRobot
|
2cd212b1b0
|
[AUTO]: updating luabinding automatically
|
2014-06-24 10:48:02 +00:00 |
CocosRobot
|
879862b993
|
[AUTO]: updating luabinding automatically
|
2014-06-24 02:35:55 +00:00 |
samuele3hu
|
50f82ce1d0
|
Fix compile error for lua bindings in the different platforms
|
2014-06-24 10:12:32 +08:00 |
samuele3hu
|
a339afb2c0
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
|
2014-06-23 17:53:41 +08:00 |
samuele3hu
|
b23e1384f6
|
Update the implementation of Lua bindings for `lua_cocos2dx_ListView_addScrollViewEventListener`
|
2014-06-23 17:42:04 +08:00 |
chuanweizhang2013
|
7f75b58acf
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
Conflicts:
templates/lua-template-runtime/cocos-project-template.json
|
2014-06-23 17:30:33 +08:00 |
samuele3hu
|
9126608138
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bug_fix
|
2014-06-23 17:30:24 +08:00 |
samuele3hu
|
dce4c8a0a8
|
Add Lua bindings for `addScrollViewEventListener` of `ui.ListView` and related test cases
|
2014-06-23 17:29:56 +08:00 |
minggo
|
7ef217ee4d
|
Merge pull request #7168 from andyque/fixListView
fix addEventListener hidden problem
|
2014-06-23 17:20:56 +08:00 |
andyque
|
dcc650a6f8
|
fix android compile error
|
2014-06-23 17:04:59 +08:00 |
samuele3hu
|
0d7c453878
|
Fix the error that lua binding for create function of Sequence would lead to endless loop
|
2014-06-23 16:38:35 +08:00 |
andyque
|
93319f3a3b
|
fix lua ui binding compile error
|
2014-06-23 14:56:41 +08:00 |
zhangbin
|
ec62f05b12
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-20 10:51:13 +08:00 |
zhangbin
|
0019d9a061
|
Optimize the win32 projects configuration.
|
2014-06-20 10:50:43 +08:00 |
CocosRobot
|
a3bee308f6
|
[AUTO]: updating luabinding automatically
|
2014-06-19 13:24:36 +00:00 |
minggo
|
190d6d4859
|
Merge pull request #7136 from CocosRobot/update_lua_bindings_1403162482
[AUTO]: updating luabinding automatically
|
2014-06-19 20:56:10 +08:00 |
gin0606
|
3ae8e29ce5
|
Add new line at the end of a file to *.h
|
2014-06-19 20:45:49 +09:00 |
gin0606
|
bf4f30d14b
|
Add new line at the end of a file to *.cpp
|
2014-06-19 20:45:24 +09:00 |
chuanweizhang2013
|
be8775e314
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-06-19 17:23:36 +08:00 |
CocosRobot
|
c638cb8816
|
[AUTO]: updating luabinding automatically
|
2014-06-19 07:22:49 +00:00 |
samuele3hu
|
3a350e11ae
|
Add Lua binding for Animation3D and Animate3D ,and add related test case
|
2014-06-19 14:05:38 +08:00 |
zhangbin
|
1b056b6c49
|
Remove the debug symbols for release mode in xcode projects.
Modify the template of lua runtime.
|
2014-06-18 17:06:56 +08:00 |
CocosRobot
|
155638f2de
|
[AUTO]: updating luabinding automatically
|
2014-06-18 06:10:38 +00:00 |
CocosRobot
|
d58d36d1c8
|
[AUTO]: updating luabinding automatically
|
2014-06-18 03:44:06 +00:00 |
minggo
|
246d6f12c9
|
Merge pull request #7047 from samuele3hu/v3_keypad_fix
Resolve the compile warning for Lua bindings project
|
2014-06-18 11:29:54 +08:00 |
CocosRobot
|
22e1d69f9f
|
[AUTO]: updating luabinding automatically
|
2014-06-17 13:24:08 +00:00 |
CocosRobot
|
657b90422d
|
[AUTO]: updating luabinding automatically
|
2014-06-17 05:53:04 +00:00 |
CocosRobot
|
30c91729eb
|
[AUTO]: updating luabinding automatically
|
2014-06-16 02:49:38 +00:00 |
samuele3hu
|
9b3b6c0e53
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-13 14:39:11 +08:00 |
samuele3hu
|
5b6330d59b
|
Add more conversion functions and manual binding functions
|
2014-06-13 14:10:08 +08:00 |
chuanweizhang2013
|
2eac73cde3
|
add protobuf win32
|
2014-06-13 11:19:04 +08:00 |
samuele3hu
|
27a3a46d62
|
Modify the implemetation of `LuaStack::executeScriptFile`
|
2014-06-12 15:39:59 +08:00 |
samuele3hu
|
5bdecadd70
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix
|
2014-06-12 14:09:00 +08:00 |
samuele3hu
|
c2288936db
|
Remove `handleStudioEventListener` of LuaEngine
|
2014-06-12 13:50:52 +08:00 |
samuele3hu
|
6c7b538ee1
|
Add deprecated support for the related UI addEventListener functions
|
2014-06-12 12:02:22 +08:00 |
samuele3hu
|
379db53673
|
Reconstruct the _sendRequest function of LuaMinXmlHttpRequest
|
2014-06-12 11:24:46 +08:00 |
samuele3hu
|
5349125ad0
|
Reconstruct the addEventListener for cocostudio ui control
|
2014-06-12 10:10:37 +08:00 |
samuele3hu
|
108c0d0da9
|
Modify ini files for bindings-generator to fix the compile warning
|
2014-06-12 10:08:58 +08:00 |
CocosRobot
|
818c478224
|
[AUTO]: updating luabinding automatically
|
2014-06-11 02:30:38 +00:00 |
samuele3hu
|
4ce2d7f193
|
Update values of KeyCode used in the Lua to fix related error
|
2014-06-11 10:10:11 +08:00 |
samuele3hu
|
46e5b72827
|
Add a log
|
2014-06-10 16:56:07 +08:00 |
samuele3hu
|
5aec5d4a83
|
Update `LuaStack::executeScriptFile` to support template project loading lua or luac files
|
2014-06-10 16:47:32 +08:00 |
samuele3hu
|
5a80b4da2e
|
Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget
|
2014-06-10 11:30:39 +08:00 |
CocosRobot
|
e2630f915d
|
[AUTO]: updating luabinding automatically
|
2014-06-09 07:30:49 +00:00 |
CocosRobot
|
e1a43d8ac4
|
[AUTO]: updating luabinding automatically
|
2014-06-09 07:20:59 +00:00 |
CocosRobot
|
638f7f12c5
|
[AUTO]: updating luabinding automatically
|
2014-06-09 03:15:50 +00:00 |
CocosRobot
|
c604c09069
|
[AUTO]: updating luabinding automatically
|
2014-06-09 01:46:34 +00:00 |
CocosRobot
|
b749d0b5ca
|
[AUTO]: updating luabinding automatically
|
2014-06-05 07:06:07 +00:00 |
samuele3hu
|
373d4dfb1a
|
Replace `log` with `CCLOG`
|
2014-06-05 14:49:02 +08:00 |
minggo
|
366beedbb2
|
Merge pull request #6955 from samuele3hu/v3_fix
Add xxtea encrypt support for lua and update the console submodule
|
2014-06-05 11:49:40 +08:00 |
CocosRobot
|
0010ed2e44
|
[AUTO]: updating luabinding automatically
|
2014-06-05 03:01:43 +00:00 |
Ricardo Quesada
|
0c2f8ed401
|
Lua compiles and runs
|
2014-06-04 09:26:39 -07:00 |
Ricardo Quesada
|
79ebc546f8
|
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
|
2014-06-04 09:19:22 -07:00 |
minggo
|
700b0f7320
|
Merge pull request #6966 from kicktheken/v3
fix layout constant syntax error
|
2014-06-04 14:12:52 +08:00 |
minggo
|
b174481645
|
Merge pull request #6967 from ntotani/fix-lua-binding-release-build
fix lua-binding release build
|
2014-06-04 14:06:29 +08:00 |
CocosRobot
|
a70d6628a7
|
[AUTO]: updating luabinding automatically
|
2014-06-04 05:58:29 +00:00 |
samuele3hu
|
c785d64ba1
|
Adjust the xxtea directory structure and modify configs files for platforms
|
2014-06-04 11:50:04 +08:00 |
Kenneth Chan
|
d7fcf39386
|
fix layout constant syntax error
|
2014-06-03 20:26:59 -07:00 |
Naoyuki Totani
|
c7597e5396
|
surround tolua_isnumber with debug flug
|
2014-06-04 12:17:43 +09:00 |
samuele3hu
|
e1310e2660
|
Adjust the xxtea directory structure and modify some grammar expressions
|
2014-06-04 09:59:29 +08:00 |
samuele3hu
|
b91d8255bd
|
Add xxtea encrypt support for lua and update the console submodule
|
2014-06-03 09:55:57 +08:00 |
Ricardo Quesada
|
1b8d0d88df
|
Adds setNormalizedPosition()
Changes in `visit()` were done in order to do it
in a robust and fast way.
|
2014-05-30 16:42:05 -07:00 |
CocosRobot
|
e1ab346e70
|
[AUTO]: updating luabinding automatically
|
2014-05-27 06:31:18 +00:00 |
CocosRobot
|
9e9cab9e53
|
[AUTO]: updating luabinding automatically
|
2014-05-27 02:21:22 +00:00 |
CocosRobot
|
3245aeedd4
|
[AUTO]: updating luabinding automatically
|
2014-05-26 05:44:22 +00:00 |
CocosRobot
|
bff5fdfdda
|
[AUTO]: updating luabinding automatically
|
2014-05-26 01:58:46 +00:00 |
minggo
|
399571f542
|
Merge pull request #6892 from samuele3hu/v3_fix
Update the OpenGL lua binding and related test case
|
2014-05-23 07:37:49 -05:00 |
samuele3hu
|
3bd196f077
|
Update the openGL lua binding and related test case
|
2014-05-23 19:12:30 +08:00 |
cocoscodeide
|
5e198aaae2
|
Merge pull request #26 from cocos2d/v3
update cocos2d-x
|
2014-05-23 12:46:42 +08:00 |
CocosRobot
|
293ced84c2
|
[AUTO]: updating luabinding automatically
|
2014-05-23 03:12:39 +00:00 |
CocosRobot
|
0ab8624d2f
|
[AUTO]: updating luabinding automatically
|
2014-05-22 08:08:54 +00:00 |
chuanweizhang2013
|
111840f37b
|
add play ui
|
2014-05-22 11:52:49 +08:00 |
CocosRobot
|
f734cc3f7b
|
[AUTO]: updating luabinding automatically
|
2014-05-20 11:46:42 +00:00 |
samuele3hu
|
a2ebe428da
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-20 18:11:28 +08:00 |
samuele3hu
|
2d65f9bc6f
|
issue #5255:Add Sprite3D test cases for Lua
|
2014-05-20 18:09:04 +08:00 |
CocosRobot
|
33d8973277
|
[AUTO]: updating luabinding automatically
|
2014-05-20 06:44:06 +00:00 |
CocosRobot
|
2c47eae1a0
|
[AUTO]: updating luabinding automatically
|
2014-05-20 04:10:28 +00:00 |
CocosRobot
|
9f9b0bc426
|
[AUTO]: updating luabinding automatically
|
2014-05-19 03:16:40 +00:00 |
CocosRobot
|
a7485bb4e9
|
[AUTO]: updating luabinding automatically
|
2014-05-18 22:18:07 +00:00 |
CocosRobot
|
844cc9bcef
|
[AUTO]: updating luabinding automatically
|
2014-05-17 03:20:49 +00:00 |
Ricardo Quesada
|
0f67247325
|
Squashed commit of the following:
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
|
2014-05-16 14:36:00 -07:00 |
minggo
|
e3f2c3985d
|
Merge pull request #6777 from boyu0/physics_rollback_for_lua
Roll back lua PhysicsTest.
|
2014-05-16 21:55:52 +08:00 |
minggo
|
bf2250a67a
|
Merge pull request #6738 from cocoscodeide/v3
update template project lua
|
2014-05-16 18:10:10 +08:00 |
boyu0
|
74335a92f7
|
Roll back lua PhysicsTest.
|
2014-05-16 17:19:02 +08:00 |
samuele3hu
|
6f6cfba21b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-15 16:57:08 +08:00 |
samuele3hu
|
cde4e4811b
|
Update some GuiConstants and resubmission pr#6361.
|
2014-05-15 16:54:55 +08:00 |
CocosRobot
|
44c6c4d542
|
[AUTO]: updating luabinding automatically
|
2014-05-15 08:18:44 +00:00 |
samuele3hu
|
5a14b1d67b
|
fix compile error and synchronizate the UI change for Lua
|
2014-05-15 15:39:15 +08:00 |
CocosRobot
|
7b45fc90a8
|
[AUTO]: updating luabinding automatically
|
2014-05-14 17:16:02 +00:00 |
Ricardo Quesada
|
dc711643cd
|
Squashed commit of the following:
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
|
2014-05-14 10:07:09 -07:00 |
CocosRobot
|
6f6d233ea5
|
[AUTO]: updating luabinding automatically
|
2014-05-14 09:52:20 +00:00 |
samuele3hu
|
ee4e5e4800
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-14 14:45:15 +08:00 |
samuele3hu
|
534ad2aafb
|
fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value
|
2014-05-14 14:43:10 +08:00 |
CocosRobot
|
20c50ef189
|
[AUTO]: updating luabinding automatically
|
2014-05-14 02:03:18 +00:00 |