samuele3hu
|
079df20541
|
Update lua bindings for Spine and related test case
|
2014-10-16 20:23:58 +08:00 |
CocosRobot
|
4a084a4ebc
|
[AUTO]: updating luabinding automatically
|
2014-10-16 09:55:07 +00:00 |
minggo
|
064f0d9042
|
Merge pull request #8708 from dabingnn/v3_updateSpine
V3 update spine
|
2014-10-16 17:50:07 +08:00 |
CocosRobot
|
c4985c45e4
|
[AUTO]: updating luabinding automatically
|
2014-10-16 08:55:11 +00: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 |
CocosRobot
|
2bfad920ce
|
[AUTO]: updating luabinding automatically
|
2014-10-16 04:01:10 +00:00 |
samuele3hu
|
3f667fac85
|
Update the related AssetsManagerEx files and related project configure
|
2014-10-16 10:28:52 +08:00 |
Anton Sokolchenko
|
4f1430d25d
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2014-10-15 16:36:18 +03:00 |
Anton Sokolchenko
|
41b51168d0
|
CMake fix for template projects
|
2014-10-15 16:33:58 +03:00 |
Huabing.Xu
|
c12f88d63c
|
lua compiles ok-need to make it works later
|
2014-10-15 17:33:58 +08:00 |
samuele3hu
|
6c79ce50d2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
tests/lua-tests/src/mainMenu.lua
|
2014-10-15 15:07:30 +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
|
a95e391756
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
|
2014-10-15 11:24:27 +08:00 |
samuele3hu
|
70aa62a365
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-10-15 02:09:12 +08:00 |
CocosRobot
|
64a7ef9173
|
[AUTO]: updating luabinding automatically
|
2014-10-14 18:01:12 +00:00 |
samuele3hu
|
5b4e81aa3a
|
Update Android.mk for libluacocos2d
|
2014-10-15 00:25:12 +08:00 |
samuele3hu
|
3e9900c40d
|
Update win32 project config
|
2014-10-15 00:08:52 +08:00 |
samuele3hu
|
4a67963420
|
Update CSLoader lua-bindings and adjust project config
|
2014-10-14 23:37:00 +08:00 |
samuele3hu
|
735e86788e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
|
2014-10-14 21:36:44 +08:00 |
samuele3hu
|
3b4fbd8fff
|
Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes
|
2014-10-14 21:34:55 +08:00 |
minggo
|
abd2687cf5
|
Merge pull request #8683 from dualface/update_lua_template_runtime
update lua-template
|
2014-10-14 17:01:19 +08:00 |
dualface
|
cee999ebbb
|
update lua-template-default, lua-template-runtime, fix same proj problems.
|
2014-10-14 16:55:38 +08:00 |
CocosRobot
|
51e714bdae
|
[AUTO]: updating luabinding automatically
|
2014-10-14 06:32:12 +00:00 |
pipu
|
7dc837338e
|
Deleting cocos/scripting/lua-bindings/script/cocostudio
|
2014-10-13 16:34:31 +08:00 |
pipu
|
fc8be6f0ff
|
Reverting cocos/scripting/lua-bindings/auto
|
2014-10-13 13:06:42 +08:00 |
pipu
|
9503253a17
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
|
2014-10-12 17:44:28 +08:00 |
CocosRobot
|
971d3a6653
|
[AUTO]: updating luabinding automatically
|
2014-10-11 08:12:44 +00:00 |
pipu
|
9ba51a1909
|
Reverting cocos/scripting/lua-bindings/auto/*.*
|
2014-10-11 13:49:56 +08:00 |
pipu
|
8b61c4677f
|
Deleting cocos/scripting/lua-bindings/auto/*.*
|
2014-10-11 12:09:11 +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 |
dualface
|
20cbbfdbe5
|
update luabinding scripts
|
2014-10-11 02:51:58 +08:00 |
dualface
|
68f71b3df4
|
do not load deprecated Lua API from luabinding of modules
|
2014-10-10 23:59:41 +08:00 |
minggo
|
4d084496a3
|
Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP
added LuaStack::loadChunksFromZIP()
|
2014-10-10 22:14:55 +08:00 |
CocosRobot
|
53cde3f3b2
|
[AUTO]: updating luabinding automatically
|
2014-10-10 08:39:46 +00: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 |
CocosRobot
|
70a2195ccf
|
[AUTO]: updating luabinding automatically
|
2014-10-08 09:53:11 +00:00 |
SunLightJuly
|
763b54e5cb
|
added LuaStack::loadChunksFromZIP()
|
2014-10-08 17:30:14 +08:00 |
CocosRobot
|
a96a2a992d
|
[AUTO]: updating luabinding automatically
|
2014-09-30 07:13:25 +00:00 |
SunLightJuly
|
c108616a01
|
standardized codes
|
2014-09-30 13:17:03 +08:00 |
SunLightJuly
|
4ba19791ed
|
fixed bug in Cocos2dxLuaLoader
|
2014-09-30 13:11:39 +08:00 |
CocosRobot
|
50a06a13ad
|
[AUTO]: updating luabinding automatically
|
2014-09-29 10:11:17 +00:00 |
samuele3hu
|
87fccd7881
|
Remove manaul lua-bindings for Armature::getOffsetPoints
|
2014-09-29 10:37:19 +08:00 |
samuele3hu
|
cb38f6bd5b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-09-29 10:27:46 +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 |
CocosRobot
|
fd9ed15d6d
|
[AUTO]: updating luabinding automatically
|
2014-09-29 01:25:31 +00:00 |
minggo
|
9511f0deb5
|
Merge pull request #8130 from yestein/v3
Add Cocostudio Armature getOffsetPoints API for Lua
|
2014-09-28 16:48:37 +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 |
CocosRobot
|
021d21a2a7
|
[AUTO]: updating luabinding automatically
|
2014-09-26 15:37:17 +00: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 |
CocosRobot
|
963c02eb3d
|
[AUTO]: updating luabinding automatically
|
2014-09-26 05:45:33 +00:00 |
samuele3hu
|
38530772ae
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-09-25 15:26:03 +08:00 |
samuele3hu
|
3e5638fe91
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_lua
|
2014-09-25 15:17:55 +08:00 |
samuele3hu
|
23fb2062c9
|
Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector
|
2014-09-25 15:05:42 +08:00 |
CocosRobot
|
7192681618
|
[AUTO]: updating luabinding automatically
|
2014-09-25 06:50:06 +00:00 |
samuele3hu
|
2cc48d1f81
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-09-25 10:40:31 +08:00 |
yestein
|
b19b2c5786
|
replace tab to 4 spaces
|
2014-09-24 15:14:47 +08:00 |
yestein
|
72c5d77273
|
Add Cocostudio Armature getOffsetPoints API for Lua
|
2014-09-24 11:20:36 +08:00 |
Dhilan007
|
077ffb2b43
|
update lua binding
|
2014-09-22 15:54:35 +08:00 |
samuele3hu
|
f0608a6d70
|
Update lua bindings for Mesh and add a Sprite3DHitTest
|
2014-09-22 15:29:38 +08:00 |
CocosRobot
|
7920ff425b
|
[AUTO]: updating luabinding automatically
|
2014-09-18 03:05:04 +00:00 |
CocosRobot
|
9b5d47c61e
|
[AUTO]: updating luabinding automatically
|
2014-09-17 03:35:46 +00:00 |
CocosRobot
|
b37659a448
|
[AUTO]: updating luabinding automatically
|
2014-09-16 09:16:17 +00:00 |
Dhilan007
|
9942206c53
|
move AudioEngine in cocos2d:experimental namespace
|
2014-09-16 10:22:25 +08:00 |
CocosRobot
|
526c28bea9
|
[AUTO]: updating luabinding automatically
|
2014-09-15 15:21:18 +00:00 |
minggo
|
7bb391ce55
|
Merge pull request #8033 from Dhilan007/v3-audio903
Lua bindings of AudioEngine.
|
2014-09-15 13:43:27 +08:00 |
CocosRobot
|
8c7eb81271
|
[AUTO]: updating luabinding automatically
|
2014-09-15 01:50:32 +00:00 |
minggo
|
788f3c5c38
|
Merge pull request #8025 from andyque/fixEditBoxLuaBinding
fix Editbox lua binding
|
2014-09-15 09:36:36 +08:00 |
Dhilan007
|
51c19d4b06
|
update project for lua bindings of AudioEngine
|
2014-09-14 23:17:39 +08:00 |
Dhilan007
|
cf2a60898f
|
Lua bindings of AudioEngine.
|
2014-09-14 22:54:04 +08:00 |
andyque
|
02d2282b83
|
add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox
|
2014-09-12 17:07:06 +08:00 |
andyque
|
d4b2e8d154
|
remove deprecated warning
|
2014-09-12 17:06:13 +08:00 |
CocosRobot
|
29f9cbfd6a
|
[AUTO]: updating luabinding automatically
|
2014-09-12 08:15:54 +00:00 |
huangshiwu
|
8922121ed1
|
Deprecate DrawPrimitives and enhance DrawNode --make some modify
|
2014-09-12 07:33:34 +08:00 |
huangshiwu
|
d9634057ab
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
|
2014-09-11 16:41:54 +08:00 |
huangshiwu
|
fb1d47900c
|
Deprecate DrawPrimitives and enhance DrawNode
|
2014-09-11 15:39:56 +08:00 |
CocosRobot
|
434d4fbfdd
|
[AUTO]: updating luabinding automatically
|
2014-09-11 07:11:40 +00:00 |
Ricardo Quesada
|
e46fa14be9
|
Fixes Xcode 6 warnings
|
2014-09-10 12:01:35 -07:00 |
CocosRobot
|
0e49107514
|
[AUTO]: updating luabinding automatically
|
2014-09-10 01:52:43 +00:00 |
Ricardo Quesada
|
0ead7b6307
|
Squashed commit of the following:
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
|
2014-09-09 12:18:31 -07:00 |
andyque
|
6a4397a3eb
|
change toolset from 12.0 to 4.0
|
2014-09-09 15:57:21 +08:00 |
CocosRobot
|
ed8835d262
|
[AUTO]: updating luabinding automatically
|
2014-09-09 06:43:49 +00:00 |
minggo
|
2ba6e73212
|
Merge pull request #7966 from CocosRobot/update_lua_bindings_1410231097
[AUTO]: updating luabinding automatically
|
2014-09-09 14:20:16 +08:00 |
minggo
|
9373d096e8
|
Merge pull request #7969 from andyque/fixUI
deprecated ui::TextField getStringValue and setText, use getString and
|
2014-09-09 14:18:07 +08:00 |
andyque
|
83e14259ad
|
deprecated ui::TextField getStringValue and setText, use getString and
setString instead
|
2014-09-09 13:59:35 +08:00 |
CocosRobot
|
a2dcb71a24
|
[AUTO]: updating luabinding automatically
|
2014-09-09 02:53:20 +00:00 |
CocosRobot
|
af6b6bb7b9
|
[AUTO]: updating luabinding automatically
|
2014-09-09 02:32:49 +00:00 |
Ricardo Quesada
|
33a4cd396d
|
Adds missing xcshared data for missing projects
|
2014-09-05 14:32:14 -07:00 |
samuele3hu
|
6209530e66
|
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
|
2014-09-05 09:39:43 +08:00 |
samuele3hu
|
8c2ab3a4e7
|
Add manual lua bindings for GLView::getAllTouches
|
2014-09-04 22:12:59 +08:00 |
minggo
|
6539ff293d
|
Merge pull request #7940 from andyque/fixVs2013CompileError
Fix vs2013 compile error
|
2014-09-04 13:41:15 +08:00 |
minggo
|
99f3b371ed
|
Merge pull request #7744 from lite3/customguireader
GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua
|
2014-09-04 10:53:00 +08:00 |
samuele3hu
|
45f08d54cb
|
Fix the member name error in the `vec4_to_luaval `
|
2014-09-03 15:07:31 +08:00 |