CocosRobot
5e273da0ec
[AUTO]: updating luabinding automatically
2015-01-21 09:33:26 +00:00
CocosRobot
4f7b6608c4
[AUTO]: updating luabinding automatically
2015-01-21 06:46:49 +00:00
CocosRobot
b31b22491d
[AUTO]: updating luabinding automatically
2015-01-21 05:44:30 +00:00
minggo
08d392dd5f
Merge pull request #10132 from samuele3hu/v3_4_issue9537
...
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
2015-01-21 13:39:29 +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
CocosRobot
8f099c7f0d
[AUTO]: updating luabinding automatically
2015-01-21 03:09:35 +00:00
minggo
abc6511ceb
Merge pull request #10125 from samuele3hu/v3_4_issue9537
...
issue #10107 : Binding AnimationInfo to lua
2015-01-21 11:02:11 +08:00
CocosRobot
2f75d56c9b
[AUTO]: updating luabinding automatically
2015-01-21 02:10:47 +00:00
samuele3hu
666af29681
issue #10107 : Binding AnimationInfo to lua
2015-01-21 10:06:48 +08:00
CocosRobot
dae3e365ed
[AUTO]: updating luabinding automatically
2015-01-21 01:36:21 +00:00
CocosRobot
9a15610983
[AUTO]: updating luabinding automatically
2015-01-20 08:17:36 +00:00
CocosRobot
37dcdacc7f
[AUTO]: updating luabinding automatically
2015-01-20 07:38:26 +00:00
samuele3hu
cc732743da
Add macro judgement for CC_PLATFORM_MAC
2015-01-19 13:58:03 +08:00
htl
5a87908344
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
2015-01-19 09:38:34 +08:00
dualface
d39b1b7e58
fix ResolutionPolicy support
2015-01-16 18:04:13 +08:00
samuele3hu
4601331dee
Update the luaval_to_int32 conversional function to get correct value
2015-01-16 09:50:22 +08:00
htl
ecbef0c45c
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
2015-01-15 16:14:52 +08:00
dualface
3edd78d6c3
add SHOW_ALL support for Lua framework
2015-01-15 12:01:27 +08:00
CocosRobot
97aee8cef0
[AUTO]: updating luabinding automatically
2015-01-14 09:19:31 +00: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
CocosRobot
e69497c7c0
[AUTO]: updating luabinding automatically
2015-01-14 08:26:14 +00:00
samuele3hu
c026aa82f9
Add CC_DEPRECATED_ATTRIBUTE flag
2015-01-14 15:09:37 +08:00
samuele3hu
951324a230
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820
...
Conflicts:
cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
2015-01-14 13:58:12 +08:00
samuele3hu
1d94ae4302
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
2015-01-14 13:51:09 +08:00
CocosRobot
b134f74db4
[AUTO]: updating luabinding automatically
2015-01-14 03:43:27 +00:00
minggo
1bb4c12b1d
Merge pull request #9948 from samuele3hu/v3_4_fix_bug
...
issue #9886 : fix the number conversion error when passing 0x80000000
2015-01-13 14:11:49 +08:00
samuele3hu
203d20161c
issue #9886 : fix the number conversion error when passing 0x80000000
2015-01-13 10:02:09 +08:00
minggo
eb74647210
Merge pull request #9933 from SunLightJuly/support_func_call_chain
...
Support func call chain
2015-01-13 09:35:12 +08:00
SunLightJuly
4d2a425450
fixed typo
2015-01-13 01:02:04 +08:00
CocosRobot
93d1d9c940
[AUTO]: updating luabinding automatically
2015-01-12 12:08:54 +00:00
pipu
d9adda89c2
Update cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_csloader_manual.cpp
2015-01-12 16:51:50 +08:00
SunLightJuly
3a64d723de
modified lua_cocos2dx_Node_setRotationQuat() to to support chain call
2015-01-12 15:21:21 +08:00
SunLightJuly
a902df93c6
modified the manual binding files to support functions call chain
2015-01-12 15:12:01 +08:00
Edward Zhou
c2929a30d5
fix compile error
2015-01-11 23:01:13 +08:00
Edward Zhou
5bd9e7f1a7
support to loading folder structured lua(a.k.a normal zip file) for luaLoadChunksFromZIP
2015-01-11 22:57:14 +08:00
htl
0cf63712e9
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
2015-01-09 10:02:45 +08:00
yinjimmy
bdac739541
Fix: executeScriptFile can not load .luac file when .lua is not exist
2015-01-09 04:18:41 +08:00
CocosRobot
6b67f55ab5
[AUTO]: updating luabinding automatically
2015-01-08 06:32:36 +00:00
CocosRobot
822c38b129
[AUTO]: updating luabinding automatically
2015-01-08 02:40:40 +00:00
Huabing.Xu
b5f8666caf
Merge pull request #9855 from huangshiwu/v3_XmlHttpRequest
...
Fix XmlHttpRequestTest parsing error of response header on iOS platform
2015-01-08 10:28:34 +08:00
htl
240b43891a
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
2015-01-08 10:20:56 +08:00
Huabing.Xu
0f0e54a00b
Merge pull request #9839 from yinjimmy/bugfix_executeScriptFile
...
Compatibility code for executeScriptFile
2015-01-08 09:26:47 +08:00
yinjimmy
70e0874add
Compatibility code for executeScriptFile
2015-01-08 09:01:39 +08:00
huangshiwu
be02233815
Fix XmlHttpRequestTest parsing error of response header on iOS platform
2015-01-08 00:23:27 +08:00
CocosRobot
9253ae99bc
[AUTO]: updating luabinding automatically
2015-01-07 09:50:54 +00:00
minggo
c229ee0060
Merge pull request #9831 from CocosRobot/update_lua_bindings_1420600634
...
[AUTO]: updating luabinding automatically
2015-01-07 17:24:14 +08:00
htl
66dd8bb449
modify float convert to unsigned int
2015-01-07 16:03:46 +08:00
yinjimmy
7d430742f1
Merge branch 'bugfix_executeScriptFile' into combine
2015-01-07 15:33:15 +08:00
yinjimmy
cbf9741dfd
Compatibility code for executeScriptFile
2015-01-07 15:23:58 +08:00
htl
3d2aa30aa7
modify trans lua value to fontdefinition error
2015-01-07 15:18:56 +08:00
htl
194fa09f30
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
2015-01-07 14:14:52 +08:00
htl
e1fd472df1
modify texture format name
2015-01-07 14:11:48 +08:00
CocosRobot
54c75337c5
[AUTO]: updating luabinding automatically
2015-01-07 03:19:27 +00:00
minggo
fbf565fd59
Merge pull request #9798 from samuele3hu/v3_4_packagesize
...
issue #9796 : Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
2015-01-07 11:14:22 +08:00
CocosRobot
f83daed2cf
[AUTO]: updating luabinding automatically
2015-01-07 02:27:01 +00: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
htl
c4cc6b5c34
modify event register function name
2015-01-05 14:19:27 +08:00
htl
f82404f9c9
modify node register event interface
2015-01-05 14:02:29 +08:00
dualface
432bdf3541
fix framework on iOS
2014-12-31 18:01:03 +08:00
minggo
bbfa7a9183
Merge pull request #9753 from samuele3hu/v3_4_httpclient
...
Resolve the bug that requiring lua scrip did not consider the module dependent
2014-12-31 16:48:33 +08:00
samuele3hu
54d376db01
Resolve the bug that requiring lua scrip did not consider the module dependent
2014-12-31 16:28:14 +08:00
CocosRobot
2e1d8b4e42
[AUTO]: updating luabinding automatically
2014-12-31 08:15:01 +00:00
CocosRobot
3614f716ae
[AUTO]: updating luabinding automatically
2014-12-31 06:23:33 +00:00
samuele3hu
6bad549285
Resolve the require file errror
2014-12-31 13:43:47 +08:00
minggo
70a29a8470
Merge pull request #9709 from htlxyz/v3_origin
...
modify widget interface for lua
2014-12-30 18:32:20 +08:00
htl
dce4383357
modify widget interface for lua
2014-12-30 16:45:26 +08:00
CocosRobot
f4fbf51905
[AUTO]: updating luabinding automatically
2014-12-30 08:30:45 +00:00
CocosRobot
5b8492770e
[AUTO]: updating luabinding automatically
2014-12-30 07:49:45 +00:00
CocosRobot
ed7823c08b
[AUTO]: updating luabinding automatically
2014-12-30 03:52:26 +00:00
minggo
3c1978fcc3
Merge pull request #9611 from super626/quaternion
...
Rotation With Quaternion
2014-12-30 10:09:08 +08:00
CocosRobot
75436db583
[AUTO]: updating luabinding automatically
2014-12-29 05:51:45 +00:00
dualface
653b15b4b8
add UIWidget support, fix typo
2014-12-29 13:37:20 +08:00
dualface
40acc98f14
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates
2014-12-29 10:58:42 +08:00
dualface
954f170e9e
remove chinese comments
2014-12-29 10:44:16 +08:00
minggo
67ae66a90e
Merge pull request #9663 from dualface/update_lua_corelib
...
update lua corelib
2014-12-29 10:30:50 +08:00
CocosRobot
35774cc0f6
[AUTO]: updating luabinding automatically
2014-12-29 02:07:20 +00:00
CocosRobot
4172e7ad7f
[AUTO]: updating luabinding automatically
2014-12-29 01:49:00 +00:00
minggo
b01b25e17e
Merge pull request #9558 from super626/frustum
...
Frustum Culling
2014-12-29 09:43:14 +08:00
dualface
8d99d8a78e
fix typo
2014-12-29 05:47:37 +08:00
dualface
9684d6e164
update corelib
2014-12-29 05:41:13 +08:00
dualface
74daae1c39
update framework
2014-12-29 01:58:16 +08:00
dualface
cc3021467f
add more usable functions
2014-12-27 15:31:31 +08:00
dualface
46a0ad11ac
update lua corelib
2014-12-27 11:59:14 +08:00
CocosRobot
f8b1b34025
[AUTO]: updating luabinding automatically
2014-12-26 08:10:13 +00:00
yangxiao
b0a6720cb2
reset auto lua, fix #9515
2014-12-26 15:52:27 +08:00
yangxiao
25ce54b43b
reset
2014-12-26 15:46:45 +08:00
lvlong
f592671df6
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
2014-12-26 13:42:13 +08:00
CocosRobot
a30d606fe6
[AUTO]: updating luabinding automatically
2014-12-26 02:40:22 +00:00
CocosRobot
ff37578611
[AUTO]: updating luabinding automatically
2014-12-26 01:32:36 +00:00
lvlong
75d2deb2c8
revert
2014-12-25 15:25:19 +08:00
lvlong
3f91957e79
revert
2014-12-25 15:21:53 +08:00
yangxiao
04e273e245
bind setRotationQuat
2014-12-25 14:54:20 +08:00
CocosRobot
6b15f4edcb
[AUTO]: updating luabinding automatically
2014-12-25 06:14:03 +00:00
minggo
9643b87ed0
Merge pull request #9173 from 2youyouo2/v3
...
improve ActionTimeline api
2014-12-25 14:06:02 +08:00
lvlong
a4a108f766
fix lua binding again!!
2014-12-25 14:04:41 +08:00
minggo
2ca143959b
Merge pull request #9620 from yinjimmy/LuaStackExecuteScriptFile
...
execute script with full file path
2014-12-25 13:45:46 +08:00
youyou
f678d1027c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-25 12:09:31 +08:00
CocosRobot
381be0f6f0
[AUTO]: updating luabinding automatically
2014-12-24 09:41:09 +00:00
lvlong
4d1ca0966c
lua binding
2014-12-24 15:09:26 +08:00
CocosRobot
a5d3e8361b
[AUTO]: updating luabinding automatically
2014-12-24 06:42:09 +00:00
kaile.yin
942abfc654
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +08:00
yinjimmy
24648db2b5
execute script with full file path
2014-12-24 02:18:29 +08:00
CocosRobot
864b924dfb
[AUTO]: updating luabinding automatically
2014-12-23 06:49:30 +00:00
CocosRobot
facf9a1a66
[AUTO]: updating luabinding automatically
2014-12-23 04:05:21 +00:00
CocosRobot
34e1bce6c3
[AUTO]: updating luabinding automatically
2014-12-22 08:02:05 +00:00
kaile.yin
b924dafe83
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-22 11:14:31 +08:00
CocosRobot
9ffacb3f78
[AUTO]: updating luabinding automatically
2014-12-17 10:38:03 +00:00
samuele3hu
5c20885ad1
Synchronize the KeyCode Enum to Lua
2014-12-17 11:27:01 +08:00
CocosRobot
189e386846
[AUTO]: updating luabinding automatically
2014-12-16 10:44:15 +00:00
CocosRobot
3d327deb6d
[AUTO]: updating luabinding automatically
2014-12-16 02:14:01 +00:00
samuele3hu
5d3008d6ac
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
2014-12-11 09:51:18 +08:00
samuele3hu
4b43fab3e6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-12-09 21:03:01 +08:00
CocosRobot
b0aacdc287
[AUTO]: updating luabinding automatically
2014-12-09 10:34:49 +00:00
samuele3hu
7e8da62ebc
Add Websocket support for Mac platform
2014-12-09 18:29:20 +08:00
kaile.yin
cb509aa69f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-09 13:33:39 +08:00
CocosRobot
e510f24663
[AUTO]: updating luabinding automatically
2014-12-08 10:14:41 +00:00
youyou
04f870edb5
update head file
2014-12-05 10:08:48 +08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
CocosRobot
0c54f8f7a0
[AUTO]: updating luabinding automatically
2014-12-04 02:11:58 +00:00
kaile.yin
b4612447f3
change tab to 4 space
2014-12-03 16:12:44 +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
minggo
0d1baf4037
Merge pull request #9327 from samuele3hu/v3_manual_bindings
...
Add more useful trace back info when got invalid arguments by calling functions
2014-12-03 14:17:16 +08:00
samuele3hu
1da44b0897
Add more useful trace back info when got invalid arguments by calling functions
2014-12-01 15:53:41 +08:00
samuele3hu
802ba311d6
Fix the error that SpritePerformanceTest lua does’t work
2014-11-28 11:54:38 +08:00
CocosRobot
f0c31172b8
[AUTO]: updating luabinding automatically
2014-11-27 13:39:15 +00:00
minggo
dcc517e8d4
Merge pull request #9267 from samuele3hu/v3_strip
...
Adjust binding structure to decrease the package size of lua_empty_test
2014-11-27 20:21:06 +08:00
samuele3hu
ed573149dd
Resolve the project setting error on the platforms
2014-11-27 19:42:32 +08:00
CocosRobot
36a5a170d2
[AUTO]: updating luabinding automatically
2014-11-27 02:55:33 +00:00
samuele3hu
dc00158d72
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip
2014-11-27 10:44:56 +08:00
CocosRobot
3ed78b820e
[AUTO]: updating luabinding automatically
2014-11-27 02:02:29 +00:00
samuele3hu
9fbf87c6db
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip
2014-11-26 21:59:57 +08:00
samuele3hu
222f2cbd51
Decrease the package size of lua_empty_test
2014-11-26 21:54:18 +08:00
minggo
51b4736740
Merge pull request #9149 from samuele3hu/v3_compile_binary
...
Resolve the bugs that XmlHttpRequest would truncate binary data
2014-11-26 20:05:21 +08:00
CocosRobot
39c2c8a2cb
[AUTO]: updating luabinding automatically
2014-11-26 03:20:28 +00:00
CocosRobot
0f14dee924
[AUTO]: updating luabinding automatically
2014-11-26 02:56:12 +00:00
Vladimir Timofeev
a562c70c73
Merge remote-tracking branch 'origin/v3' into cmake-linux-mac-fixes
...
* origin/v3:
Update CHANGELOG
Update AUTHORS
fixed typo
Updates definition of Complete.
[AUTO][ci skip]: updating cocos2dx_files.json
Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
Skip binding nodeWithFlatBuffers of CSLoader for lua
2014-11-25 15:24:07 +03:00
Shrimpz
ac666d1e6d
fixed typo
2014-11-25 15:51:25 +08:00
Vladimir Timofeev
782e3bcd01
cmake: Add correct _POSIX_C_SOURCE and _BSD_SOURCE (linux) defines when build luasocket, so all types and func properly defined
2014-11-24 17:24:45 +03:00
Vladimir Timofeev
3dadcf4aea
As we have --std=c99 in CMAKE_C_FLAGS, to expose some macros and functions we should declare feature-check-marco...
...
Define _DARWIN_C_SOURCE should enable all mac os non standard extensions.
2014-11-24 17:24:11 +03:00
CocosRobot
7dc623fcab
[AUTO]: updating luabinding automatically
2014-11-24 07:24:39 +00:00
Vladimir Timofeev
9dfa26e0ec
Quick and dirty fix after my error. This defines fix build on linux with fresh gcc, but broke on mac
2014-11-20 23:20:02 +03:00
Vladimir Timofeev
012a152406
Fix build of luasocket on linux
2014-11-20 13:49:59 +03:00
Vladimir Timofeev
a689fc4c7e
sync with upstream
...
Conflicts:
CMakeLists.txt
2014-11-20 12:19:00 +03:00
CocosRobot
e52ee603ac
[AUTO]: updating luabinding automatically
2014-11-20 03:41:28 +00:00
Vladimir Timofeev
2bf77c10e8
Fix build on mingw again, disable USE_PREBUILT_LIBS with mingw (mingw can not link this libs). Eliminate some Find* modules, we can tune prebuilts without modify their code.
2014-11-19 03:28:41 +03:00
samuele3hu
78ef234e8f
Resolve the bugs that XmlHttpRequest would truncate binary data
2014-11-18 16:02:38 +08:00
samuele3hu
02f46b46e3
Merge branch 'v3' of https://github.com/dantezhu/cocos2d-x into v3_compile_binary
2014-11-18 13:58:14 +08:00
Vladimir Timofeev
b5266e95bf
mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still)
2014-11-17 01:42:04 +03:00
minggo
906316df62
Merge pull request #8985 from samuele3hu/v3_new_spine
...
Fix error that the type judgment of lua value would parse string —> int or int —> string
2014-11-13 18:59:19 +08:00
samuele3hu
a3dbd010db
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-11-13 13:42:46 +08:00
samuele3hu
1d1d004c3a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-11-12 17:46:13 +08:00
dantezhu
e8d234a32a
fix lua http download binary data's bug
2014-11-10 17:11:30 +08:00
CocosRobot
a908c391b0
[AUTO]: updating luabinding automatically
2014-11-09 15:33:08 +00:00
minggo
e7d5e79e88
Merge pull request #8998 from aeonmine/v3
...
fix memory leak cocos studiov2.0 engine v3.3
2014-11-09 23:24:16 +08:00
CocosRobot
aae2fd9e2a
[AUTO]: updating luabinding automatically
2014-11-07 02:38:01 +00:00
samuele3hu
76ab86674e
Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES on the android
2014-11-06 14:32:03 +08:00
CocosRobot
13f9073e22
[AUTO]: updating luabinding automatically
2014-11-05 05:44:02 +00:00
峰 正博
29779a4604
modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte);
2014-11-04 11:51:00 +09:00
samuele3hu
08d6b0dcff
Fix the type judgment of lua value would parse string —> int or int —> string
2014-10-31 17:50:59 +08:00
CocosRobot
9592b1f661
[AUTO]: updating luabinding automatically
2014-10-31 02:44:25 +00:00
minggo
baff367c94
Merge pull request #8918 from dumganhar/iss8843-drawpoint
...
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-27 11:38:11 +08:00
CocosRobot
0ef3887497
[AUTO]: updating luabinding automatically
2014-10-24 13:55:25 +00:00
James Chen
dd6bb0b3eb
Uses reference in for loop inside ccvector_std_string_to_luaval
2014-10-23 10:18:09 +08:00
samuele3hu
2f9dbb7142
Update cocos2d basic lua files and LabelTestNew.lua
2014-10-21 15:56:38 +08:00
minggo
65f007f5ff
Merge pull request #8857 from zhongfq/patch-2
...
fix memory leak when add listener to ui object
2014-10-21 13:57:07 +08:00
minggo
6313f9a622
Merge pull request #8868 from samuele3hu/v3_new_spine
...
Update LuaMinXmlHttpRequest and remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini
2014-10-21 09:33:40 +08:00
CocosRobot
e02558e391
[AUTO]: updating luabinding automatically
2014-10-20 10:17:27 +00:00
samuele3hu
20bcafa143
Fix the bug that callbacks aren’t triggered when response failed
2014-10-20 17:43:04 +08:00
samuele3hu
38b462100b
Update LuaMinXmlHttpRequest.h/.cpp
2014-10-20 16:05:13 +08:00
CocosRobot
5e09b1e3b1
[AUTO]: updating luabinding automatically
2014-10-20 06:06:43 +00:00
Eric Zhong
2206e4edb8
fix memory leak when add listener to ui object
2014-10-20 11:20:53 +08:00
samuele3hu
1195960ea7
Fix the bug in the tolua_cocos2dx_GLProgram_setUniformLocationF32
2014-10-20 10:22:44 +08:00
minggo
c1128a227d
Merge pull request #8847 from samuele3hu/v3_new_spine
...
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
2014-10-19 20:10:12 +08:00
samuele3hu
634d42775e
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
2014-10-19 17:00:05 +08:00
CocosRobot
96d709aff3
[AUTO]: updating luabinding automatically
2014-10-18 07:36:54 +00: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
Dhilan007
5ca3483dd8
fixed compile error
2014-10-18 13:44:19 +08:00
Dhilan007
c9bc80f831
Fix compile error
2014-10-18 13:03:28 +08:00
samuele3hu
6502beaf95
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-18 00:14:53 +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
CocosRobot
20781825f2
[AUTO]: updating luabinding automatically
2014-10-17 14:56:22 +00:00
Dhilan007
81a8e80496
[LUA]Add New AudioEngine on window
2014-10-17 17:53:33 +08:00
minggo
d241e568b0
Merge pull request #8788 from samuele3hu/v3_new_spine
...
Update the deprecated Func and update bindings-generator
2014-10-17 16:35:51 +08:00
samuele3hu
936510411b
Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache
2014-10-17 15:04:16 +08:00
samuele3hu
14f91ea9f6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-17 14:38:07 +08:00
CocosRobot
e8373e9b41
[AUTO]: updating luabinding automatically
2014-10-17 06:28:36 +00:00
samuele3hu
066d94530c
Update the Deprecated Func
2014-10-17 14:15:30 +08:00
minggo
7138933344
Merge pull request #8760 from samuele3hu/v3_new_spine
...
Update lua bindings for Spine and related test case
2014-10-17 13:43:26 +08:00
samuele3hu
71f7520732
Fix win32 compile error
2014-10-17 10:19:41 +08:00
minggo
b4867bf6e5
Merge pull request #8715 from iSevenDays/v3
...
CMakes support for Mac Os X & iOS
2014-10-16 21:16:02 +08:00
samuele3hu
4d75c977ca
Remove useless binding code for SkeletonAnimation
2014-10-16 20:53:40 +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
c5f19c20ca
Add SpineConstants.lua
2014-10-16 20:24:47 +08:00
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
andyque
2e27a6865f
update project to vs2013
2014-09-03 14:10:38 +08:00
CocosRobot
ffb36d577e
[AUTO]: updating luabinding automatically
2014-09-03 03:29:43 +00:00
minggo
eee9ac626a
Merge pull request #7815 from andyque/mergeExtensionEditBox
...
merge extension EditBox to ui module
2014-09-03 11:25:10 +08:00
lite3
6ff1289aed
fix compile error on Xcode
2014-09-02 20:26:21 +08:00
andyque
dafbf28283
fix release mode compile error
2014-09-02 16:42:23 +08:00
andyque
fadfa87afd
fix vs2013 compile error
2014-09-02 16:42:04 +08:00
andyque
a429959e65
fix lua compile error
2014-09-02 01:31:02 -07:00
lite3
5d935c2cea
fix compile error on android
2014-09-02 16:16:36 +08:00
CocosRobot
dc15287ac3
[AUTO]: updating luabinding automatically
2014-09-02 05:45:07 +00:00
lite3
74d8bf6f27
fix
2014-09-02 10:51:17 +08:00
lite3
6d462c5013
fix ccs.CustomGUIReader not in ccs table
2014-08-30 12:23:03 +08:00
Ricardo Quesada
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
Ricardo Quesada
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
lite3
3872ee9b59
add CustomGUIReader for lua
2014-08-29 18:50:21 +08:00
CocosRobot
cdc41711f6
[AUTO]: updating luabinding automatically
2014-08-29 10:38:25 +00:00
minggo
826e1018cb
fix conflict
2014-08-29 16:55:09 +08:00
CocosRobot
3b3747d518
[AUTO]: updating luabinding automatically
2014-08-29 08:12:40 +00:00
minggo
1dcdbca4e0
revert lua-bindings
2014-08-29 15:54:20 +08:00
minggo
e4920ffdea
fix conflict
2014-08-29 15:45:21 +08:00
minggo
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
CocosRobot
ebe75e702a
[AUTO]: updating luabinding automatically
2014-08-28 08:58:52 +00:00
CocosRobot
31a9997922
[AUTO]: updating luabinding automatically
2014-08-28 02:15:00 +00:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
samuele3hu
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
samuele3hu
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
samuele3hu
893e0b0a08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-25 11:45:29 +08:00
minggo
7ece79e7d3
Merge pull request #7867 from CocosRobot/update_lua_bindings_1408933963
...
[AUTO]: updating luabinding automatically
2014-08-25 11:01:27 +08:00
CocosRobot
5db16cdc23
[AUTO]: updating luabinding automatically
2014-08-25 02:34:32 +00:00
samuele3hu
c495e5266a
Remove useless win32 module project and adjust the related project setting
2014-08-25 09:59:50 +08:00
samuele3hu
1126e950b2
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the win32 platform and adjust the related test cases
2014-08-25 09:52:48 +08:00
samuele3hu
281da9f1d7
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
samuele3hu
25aab05b1f
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the android platform
2014-08-25 09:48:14 +08:00
minggo
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
minggo
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
CocosRobot
899e0a4182
[AUTO]: updating luabinding automatically
2014-08-22 11:25:33 +00:00
samuele3hu
70cba1f64a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
cocos/Android.mk
2014-08-22 14:01:17 +08:00
samuele3hu
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
andyque
13003fe0a6
add deprecated options for ui, add Scale9Sprite bindings
2014-08-22 11:56:13 +08:00
minggo
cdd67be77a
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
2014-08-19 15:29:40 +08:00
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
cocoscodeide
0b301d6602
Merge pull request #5 from cocos2d/v3
...
update cocos2d-x
2014-05-13 17:59:18 +08:00
CocosRobot
7ad48b632a
[AUTO]: updating luabinding automatically
2014-05-13 07:03:12 +00:00
CocosRobot
bf6ed6eb8b
[AUTO]: updating luabinding automatically
2014-05-13 03:39:46 +00:00
CocosRobot
16b31e3157
[AUTO]: updating luabinding automatically
2014-05-12 08:14:14 +00:00
CocosRobot
5c735e5277
[AUTO]: updating luabinding automatically
2014-05-12 05:44:32 +00:00
Huabing.Xu
bbac0be9a6
add deprecated alias cc.VERTEX_ATTRIB_TEX_COORDS
2014-05-09 22:04:19 -07:00
CocosRobot
f0c240f885
[AUTO]: updating luabinding automatically
2014-05-10 03:47:56 +00:00
Ricardo Quesada
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
chuanweizhang2013
d502e41af4
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into codeidev3
...
Conflicts:
templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
2014-05-09 14:28:14 +08:00
Ricardo Quesada
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
Ricardo Quesada
8f2ba467ff
Yeahhhhhh
...
it is working
2014-05-08 12:34:26 -07:00
cocoscodeide
6efaa2fe8f
Merge pull request #2 from chuanweizhang2013/v3luaruntime
...
modify luadebug and adjust code file
2014-05-08 22:09:06 +08:00
chuanweizhang2013
8f7cb74dd1
fixed debug
2014-05-08 16:02:55 +08:00
minggo
a8d728ffc9
Merge pull request #6610 from zawasp/vs2013project
...
upgrade win32 projects for Visual Studio 2013
2014-05-08 15:40:02 +08:00
CocosRobot
119ef29a87
[AUTO]: updating luabinding automatically
2014-05-08 06:03:37 +00:00
CocosRobot
7aff750381
[AUTO]: updating luabinding automatically
2014-05-08 03:19:36 +00:00
Mircea Rila
b66b4c6f1d
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
...
remove C4005 warnings after upgrading projects
2014-05-07 17:41:04 +03:00