James Chen
|
1c5cff089e
|
Merge pull request #6050 from CocosRobot/update_lua_bindings_1396001378
[AUTO]: updating luabinding automatically
|
2014-03-28 18:11:59 +08:00 |
CocosRobot
|
494321a674
|
[AUTO]: updating luabinding automatically
|
2014-03-28 10:11:08 +00:00 |
James Chen
|
581ef454eb
|
Merge pull request #6047 from samuele3hu/develop_test
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
|
2014-03-28 18:04:12 +08:00 |
samuele3hu
|
7ca207f993
|
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
|
2014-03-28 17:18:41 +08:00 |
CocosRobot
|
07d1a54a92
|
[AUTO]: updating luabinding automatically
|
2014-03-28 08:20:29 +00:00 |
CocosRobot
|
bb1b6f96fb
|
[AUTO]: updating luabinding automatically
|
2014-03-28 06:17:06 +00:00 |
CocosRobot
|
ceda1b9a9a
|
[AUTO]: updating luabinding automatically
|
2014-03-28 03:33:44 +00:00 |
CocosRobot
|
e5ff0912a7
|
[AUTO]: updating luabinding automatically
|
2014-03-27 08:43:46 +00:00 |
CocosRobot
|
8cec6b83d9
|
[AUTO]: updating luabinding automatically
|
2014-03-27 07:35:51 +00:00 |
CocosRobot
|
7a3e40dd8e
|
[AUTO]: updating luabinding automatically
|
2014-03-27 06:55:35 +00:00 |
CocosRobot
|
33d6b04fb4
|
[AUTO]: updating luabinding automatically
|
2014-03-27 05:55:07 +00:00 |
CocosRobot
|
b1859a4cac
|
[AUTO]: updating luabinding automatically
|
2014-03-27 03:10:37 +00:00 |
CocosRobot
|
8efb9ad4e0
|
[AUTO]: updating luabinding automatically
|
2014-03-26 12:09:41 +00:00 |
CocosRobot
|
ebc09373e3
|
[AUTO]: updating luabinding automatically
|
2014-03-26 10:42:58 +00:00 |
CocosRobot
|
6e86e65038
|
[AUTO]: updating luabinding automatically
|
2014-03-26 10:25:55 +00:00 |
CocosRobot
|
0140d6d3f7
|
[AUTO]: updating luabinding automatically
|
2014-03-26 06:03:04 +00:00 |
CocosRobot
|
c5d6e83673
|
[AUTO]: updating luabinding automatically
|
2014-03-25 09:30:11 +00:00 |
CocosRobot
|
bdcd6ea198
|
[AUTO]: updating luabinding automatically
|
2014-03-25 08:13:42 +00:00 |
CocosRobot
|
86f69a0b4e
|
[AUTO]: updating luabinding automatically
|
2014-03-25 07:39:29 +00:00 |
CocosRobot
|
5d2906ad8b
|
[AUTO]: updating luabinding automatically
|
2014-03-25 05:50:20 +00:00 |
chuanweizhang2013
|
1254bf8f1e
|
Merge pull request #19 from cocos2d/develop
update cocos2d-x
|
2014-03-24 12:00:30 +08:00 |
James Chen
|
832ab120aa
|
Merge pull request #5862 from samuele3hu/develop_script_mgr
closed #4452: Adds `addCustomHandler` in the ScriptHandlerMgr for Console auto test.
|
2014-03-21 16:48:53 +08:00 |
CocosRobot
|
3bd000b236
|
[AUTO]: updating luabinding automatically
|
2014-03-21 08:38:19 +00:00 |
CocosRobot
|
4721306fef
|
[AUTO]: updating luabinding automatically
|
2014-03-21 07:01:27 +00:00 |
CocosRobot
|
566c014060
|
[AUTO]: updating luabinding automatically
|
2014-03-21 06:26:33 +00:00 |
samuele3hu
|
e2ed17f69c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
|
2014-03-21 11:28:39 +08:00 |
samuele3hu
|
71f3cb7862
|
close #4452:Make `addCustomHandler` more distinct
|
2014-03-21 11:24:24 +08:00 |
James Chen
|
d5e8bde89e
|
Merge pull request #5889 from samuele3hu/develop_socket
close #4400: Use the latest version of LuaSocket and modify the related project config
|
2014-03-21 10:52:38 +08:00 |
James Chen
|
b3cfc693ca
|
Merge pull request #5887 from andyque/fix_tests_warnings
Fix warnings in cpp-tests.
|
2014-03-20 18:24:10 +08:00 |
samuele3hu
|
21a21c2d3d
|
close #4400: Update the anrroid.mk for lua-bindings
|
2014-03-20 18:09:52 +08:00 |
samuele3hu
|
11bbeb4a30
|
close #4452:Using better spelling format
|
2014-03-20 17:56:33 +08:00 |
samuele3hu
|
977ef0092b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
|
2014-03-20 17:43:28 +08:00 |
samuele3hu
|
4b25c9f62e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
|
2014-03-20 17:07:33 +08:00 |
samuele3hu
|
d3487d2d3c
|
close #4400: Use the newest version of LuaSocket for lua
|
2014-03-20 17:04:54 +08:00 |
andyque
|
cf86fd619f
|
fix lua bindings warnings
|
2014-03-20 16:48:12 +08:00 |
CocosRobot
|
0f22720da5
|
[AUTO]: updating luabinding automatically
|
2014-03-20 07:25:03 +00:00 |
andyque
|
ae3310bffb
|
Merge branch 'develop' into fix_warnings
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
|
2014-03-20 14:50:02 +08:00 |
CocosRobot
|
4b7f729154
|
[AUTO]: updating luabinding automatically
|
2014-03-20 02:21:28 +00:00 |
andyque
|
d7b3737605
|
fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings
|
2014-03-20 10:14:25 +08:00 |
samuele3hu
|
0afcf59539
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
|
2014-03-20 09:56:06 +08:00 |
samuele3hu
|
0026fc2b2a
|
close #4452:Add `addCustomHandler` in the ScriptHandlerMgr for Console auto test.
|
2014-03-20 09:54:38 +08:00 |
CocosRobot
|
0a57a5be11
|
[AUTO]: updating luabinding automatically
|
2014-03-19 10:32:42 +00:00 |
chuanweizhang2013
|
aef2ccac11
|
Merge commit 'refs/pull/5871/head' of https://github.com/cocos2d/cocos2d-x into luamerage
|
2014-03-19 18:09:06 +08:00 |
samuele3hu
|
a1ca3195ce
|
Rename `addConsoleHandler` to `addCustomHandler`
|
2014-03-19 17:28:23 +08:00 |
CocosRobot
|
f0fdcb22d3
|
[AUTO]: updating luabinding automatically
|
2014-03-19 06:14:23 +00:00 |
samuele3hu
|
a432f488bd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
|
2014-03-19 10:51:42 +08:00 |
samuele3hu
|
a91994f242
|
Add `addConsoleHandler` in the ScriptHandlerMgr for Console autotest.
|
2014-03-19 10:50:11 +08:00 |
CocosRobot
|
781ff463a2
|
[AUTO]: updating luabinding automatically
|
2014-03-19 01:56:50 +00:00 |
CocosRobot
|
fc5a34e500
|
[AUTO]: updating luabinding automatically
|
2014-03-18 07:55:30 +00:00 |
cw
|
1e551f8ca4
|
Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage
Conflicts:
templates/lua-template-runtime/src/main.lua
|
2014-03-15 10:37:26 +08:00 |
cw
|
ea9a9bceb2
|
update lua debugger
|
2014-03-15 10:34:21 +08:00 |
boyu0
|
f23db68151
|
build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.
|
2014-03-15 01:19:06 +08:00 |
CocosRobot
|
c9259bb800
|
[AUTO]: updating luabinding automatically
|
2014-03-13 13:17:32 +00:00 |
CocosRobot
|
b1becd3fae
|
[AUTO]: updating luabinding automatically
|
2014-03-13 06:51:53 +00:00 |
CocosRobot
|
6d8bc4e616
|
[AUTO]: updating luabinding automatically
|
2014-03-13 03:45:57 +00:00 |
CocosRobot
|
e93feaa068
|
[AUTO]: updating luabinding automatically
|
2014-03-12 11:41:17 +00:00 |
James Chen
|
9c980dfcfe
|
Merge pull request #5706 from dumganhar/rename-tests
Rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects. And compilation error fix after changing folder name from 'gui' to 'ui'
|
2014-03-12 15:48:29 +08:00 |
James Chen
|
eae6880599
|
Adds 'ui' include path in liblua.vcxproj
|
2014-03-12 15:44:56 +08:00 |
CocosRobot
|
31b304af26
|
[AUTO]: updating luabinding automatically
|
2014-03-12 07:43:13 +00:00 |
CocosRobot
|
41c689c545
|
[AUTO]: updating luabinding automatically
|
2014-03-12 03:31:17 +00:00 |
andyque
|
2c2a5ee38e
|
rename gui to ui
|
2014-03-12 10:46:49 +08:00 |
andyque
|
4ed33fa4c8
|
fix lua bindings
|
2014-03-11 21:36:00 +08:00 |
andyque
|
f6a9824df1
|
fix win32 compile error
|
2014-03-11 20:59:35 +08:00 |
andyque
|
df7aa27b8b
|
fix mac lua
|
2014-03-11 18:48:28 +08:00 |
andyque
|
026ef95b07
|
add lua ui binding
|
2014-03-11 18:48:27 +08:00 |
andyque
|
dcc98ef79f
|
rename cocos2dx_gui to cocos2dx_ui
|
2014-03-11 18:48:27 +08:00 |
samuele3hu
|
9a30984783
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix
|
2014-03-11 17:36:43 +08:00 |
samuele3hu
|
5c33155bc9
|
fix:Remove some warning about lua.
|
2014-03-11 17:35:09 +08:00 |
CocosRobot
|
b6ebd84534
|
[AUTO]: updating luabinding automatically
|
2014-03-11 08:38:10 +00:00 |
CocosRobot
|
725440fe3f
|
[AUTO]: updating luabinding automatically
|
2014-03-11 02:52:22 +00:00 |
CocosRobot
|
8aa11f005b
|
[AUTO]: updating luabinding automatically
|
2014-03-10 11:27:21 +00:00 |
James Chen
|
479579fadc
|
Update CMakeLists.txt, lua-tests works ok on linux now.
|
2014-03-10 02:39:54 -07:00 |
James Chen
|
e39dcd9974
|
[Linux] Updates CMakeLists.txt to re-add lua scripting support.
|
2014-03-10 17:10:08 +08:00 |
James Chen
|
fd44277e7c
|
lua-tests works again for Win32.
|
2014-03-10 17:05:35 +08:00 |
James Chen
|
6deadf34b8
|
lua-tests works again for Android.
|
2014-03-10 16:04:46 +08:00 |
James Chen
|
69bbda688b
|
lua-tests works ok for iOS / Mac, luabindings has its own project.
|
2014-03-10 15:32:48 +08:00 |
James Chen
|
650a88a8b1
|
Re-add lua bindings codes.
|
2014-03-10 14:04:58 +08:00 |
James Chen
|
c2acfea633
|
issue #4116: Delete non-scripting files.
|
2014-02-26 21:17:17 +08:00 |
CocosRobot
|
01e37a0000
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-26 03:53:49 +00:00 |
CocosRobot
|
e6104f9649
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-26 03:41:20 +00:00 |
CocosRobot
|
ef18a6edd1
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-25 03:14:40 +00:00 |
andyque
|
f88e4be4ce
|
rollback gui filename change
|
2014-02-25 10:18:45 +08:00 |
andyque
|
8359ddd4d4
|
fix lua bindings error
|
2014-02-25 10:18:45 +08:00 |
andyque
|
f92301a872
|
fix jsb munaul bindings error
|
2014-02-25 10:18:45 +08:00 |
andyque
|
bf81591b48
|
fixed #3829. change namespace gui to ui
|
2014-02-25 10:18:44 +08:00 |
James Chen
|
64ec1611a5
|
compilation error fix for win32.
|
2014-02-25 09:45:10 +08:00 |
James Chen
|
2898909130
|
Merge pull request #5444 from samuele3hu/developDynamic
issue #3956:Modifyt the mechanism of toluafix_pushusertype_ccobject to pass the real typename to lua
|
2014-02-24 15:29:23 +08:00 |
samuele3hu
|
82ee8a4abd
|
Add some omitted modifications about “cc.ref”
|
2014-02-24 10:28:55 +08:00 |
samuele3hu
|
8fa8eaf64d
|
issue #3956:Remove some unrelated modification
|
2014-02-24 10:08:00 +08:00 |
samuele3hu
|
ac88d70d58
|
issue #3956:Update the related compile file
|
2014-02-24 10:01:00 +08:00 |
samuele3hu
|
a765178a5f
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
|
2014-02-24 09:38:08 +08:00 |
samuele3hu
|
8cbe22b12b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developFix
|
2014-02-23 20:57:45 +08:00 |
samuele3hu
|
5f28e6bd72
|
Replace “cc.object” with “cc.ref” for lua binding
|
2014-02-23 20:56:49 +08:00 |
CocosRobot
|
e306c53d21
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-23 09:21:10 +00:00 |
samuele3hu
|
293ea66401
|
issue #3956:Remove the usage of “tolua.cast”
|
2014-02-21 16:22:35 +08:00 |
CocosRobot
|
2eadbefaeb
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-21 03:48:50 +00:00 |
samuele3hu
|
e436aa4022
|
issue #3956:Replace Object with Ref
|
2014-02-21 10:22:03 +08:00 |
samuele3hu
|
555ef20202
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
Conflicts:
cocos/scripting/lua/bindings/LuaBasicConversions.h
cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
|
2014-02-21 10:10:20 +08:00 |
samuele3hu
|
3532665520
|
issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object
|
2014-02-21 09:45:33 +08:00 |
CocosRobot
|
6f2f35ab7a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-20 13:11:20 +00:00 |