CocosRobot
dfc2390659
[AUTO]: updating luabinding automatically
2015-04-02 01:51:14 +00:00
CocosRobot
17a80b0c54
[AUTO]: updating luabinding automatically
2015-04-01 02:59:47 +00:00
CocosRobot
46f32142c7
[AUTO]: updating luabinding automatically
2015-03-31 10:26:49 +00:00
CocosRobot
00792e98a3
[AUTO]: updating luabinding automatically
2015-03-31 04:01:57 +00:00
samuele3hu
921981833e
Update Sprite3DCubeMap test case
2015-03-28 14:59:47 +08:00
samuele3hu
f54512a618
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment
2015-03-27 15:59:05 +08:00
samuele3hu
bb225d052e
Update comments of some header files
2015-03-27 15:27:08 +08:00
CocosRobot
4785e6e383
[AUTO]: updating luabinding automatically
2015-03-27 05:46:01 +00:00
minggo
8691602b81
Merge pull request #11185 from samuele3hu/v3_5_comment
...
[ci skip]Update comments of some header files
2015-03-27 11:35:11 +08:00
samuele3hu
a1b054911c
Update comments of some header files
2015-03-27 11:13:28 +08:00
CocosRobot
c73602a523
[AUTO]: updating luabinding automatically
2015-03-27 02:26:35 +00:00
CocosRobot
a4e633a299
[AUTO]: updating luabinding automatically
2015-03-26 16:17:35 +00:00
samuele3hu
e0bde0f789
Update comments of some header files
2015-03-26 22:07:44 +08:00
CocosRobot
f43b666929
[AUTO]: updating luabinding automatically
2015-03-26 02:44:28 +00:00
minggo
f9589d166d
Merge pull request #11161 from samuele3hu/v3_5_comment
...
Update comments of some header files
2015-03-26 10:37:41 +08:00
minggo
fae951d928
Merge pull request #11150 from samuele3hu/v3_5_test
...
[ci skip]Update comments of some header files
2015-03-26 10:00:11 +08:00
samuele3hu
1bea6a52a2
Update comments of some header files
2015-03-25 18:54:33 +08:00
yinjimmy
75a7927bad
Load all lua module as default
2015-03-25 16:35:11 +08:00
CocosRobot
1ced296b58
[AUTO]: updating luabinding automatically
2015-03-25 03:59:57 +00:00
minggo
1f4d7c598f
Merge pull request #11126 from samuele3hu/v3_5_test
...
[ci skip]Update comments of some header files
2015-03-25 09:53:28 +08:00
samuele3hu
f3890d3bb3
Update comments of some header files
2015-03-24 21:52:56 +08:00
samuele3hu
020b3ba5cb
Update comments of some header files
2015-03-24 21:46:18 +08:00
CocosRobot
08919a1445
[AUTO]: updating luabinding automatically
2015-03-24 08:35:26 +00:00
CocosRobot
9d886cc5f2
[AUTO]: updating luabinding automatically
2015-03-24 03:25:31 +00:00
minggo
73a3051417
Merge pull request #11087 from CocosRobot/update_lua_bindings_1427121273
...
[AUTO]: updating luabinding automatically
2015-03-24 09:49:54 +08:00
CocosRobot
0fb2aeb2b2
[AUTO]: updating luabinding automatically
2015-03-23 14:37:03 +00:00
CocosRobot
9f17ed6bed
[AUTO]: updating luabinding automatically
2015-03-23 08:32:54 +00:00
CocosRobot
ef631d743c
[AUTO]: updating luabinding automatically
2015-03-23 03:20:47 +00:00
CocosRobot
fd7ac235ce
[AUTO]: updating luabinding automatically
2015-03-21 04:55:48 +00:00
samuele3hu
865aa886a9
Update comments of some header files
2015-03-20 14:39:33 +08:00
CocosRobot
7ea110134c
[AUTO]: updating luabinding automatically
2015-03-20 04:53:00 +00:00
CocosRobot
7da412a4e1
[AUTO]: updating luabinding automatically
2015-03-19 14:17:17 +00:00
CocosRobot
21e46efb00
[AUTO]: updating luabinding automatically
2015-03-19 12:30:15 +00:00
minggo
8075cc1602
Merge pull request #10986 from samuele3hu/v3_5_comment
...
[ci skip]Update comments of some header files
2015-03-19 20:01:43 +08:00
minggo
5601eed02f
Merge pull request #10987 from samuele3hu/v3_5_f_bug
...
issue #10875 : fix a lua bindings bug for GLProgram::setUniformLocationF32
2015-03-19 19:59:28 +08:00
samuele3hu
5a5acc624a
issue #10875 : fix a lua bindings bug for GLProgram::setUniformLocationF32
2015-03-19 17:31:57 +08:00
samuele3hu
31b34ddf77
Update comments of some header files
2015-03-19 16:45:53 +08:00
CocosRobot
0afd385412
[AUTO]: updating luabinding automatically
2015-03-19 08:29:09 +00:00
CocosRobot
f2c49b3311
[AUTO]: updating luabinding automatically
2015-03-19 03:55:42 +00:00
CocosRobot
b7881eab88
[AUTO]: updating luabinding automatically
2015-03-18 14:02:42 +00:00
CocosRobot
9df3f57e0d
[AUTO]: updating luabinding automatically
2015-03-17 06:28:14 +00:00
minggo
f7d5a16734
Merge pull request #10873 from konopka/fix_compiler_override_warnings
...
Fix compiler override warnings
2015-03-17 10:38:19 +08:00
CocosRobot
a3ddd92307
[AUTO]: updating luabinding automatically
2015-03-16 07:11:12 +00:00
CocosRobot
7a4e727ee2
[AUTO]: updating luabinding automatically
2015-03-16 06:53:18 +00:00
Martin Konopka
2c80b6ae3a
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-15 00:10:08 +01:00
Martin Konopka
cd12d08a52
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-14 19:33:15 +01:00
Nite Luo
cfa1f0c84f
Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
...
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
2015-03-13 21:12:35 -07:00
SunLightJuly
6871e30b8d
define __G__TRACKBACK__ in cocos.init
2015-03-13 16:39:36 +08:00
CocosRobot
2f0eb6712d
[AUTO]: updating luabinding automatically
2015-03-13 07:15:34 +00:00
CocosRobot
fa2fe74986
[AUTO]: updating luabinding automatically
2015-03-13 06:19:29 +00:00
Martin Konopka
350b81501d
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
...
Initialization follows the order of declaration, not the order of the initialization list.
2015-03-12 23:47:58 +01:00
CocosRobot
e079216248
[AUTO]: updating luabinding automatically
2015-03-11 02:45:36 +00:00
CocosRobot
1f78b18d22
[AUTO]: updating luabinding automatically
2015-03-09 02:27:14 +00:00
yangxiao
8137b01f23
merge cocos
2015-03-06 18:31:57 +08:00
Jacky
c38c4a1373
fixed source coding error.
2015-03-04 18:15:05 +08:00
yangxiao
ea7dfe1147
lua test
2015-03-04 10:42:08 +08:00
CocosRobot
93c2b48779
[AUTO]: updating luabinding automatically
2015-03-03 15:15:43 +00:00
CocosRobot
84fb4094fc
[AUTO]: updating luabinding automatically
2015-02-28 03:23:08 +00:00
CocosRobot
8a310c09c0
[AUTO]: updating luabinding automatically
2015-02-27 03:54:42 +00:00
yangxiao
dd070e177e
modify unproject
2015-02-27 10:20:32 +08:00
CocosRobot
6a91450f7c
[AUTO]: updating luabinding automatically
2015-02-15 11:53:55 +00:00
samuele3hu
3a7cbe9d67
Add Particle3DTest for Lua and update related configure files
2015-02-15 15:56:20 +08:00
CocosRobot
a643691795
[AUTO]: updating luabinding automatically
2015-02-12 10:47:08 +00:00
Naoyuki Totani
2b43c12b88
fix SpriteEx
2015-02-12 15:16:48 +09:00
Nite Luo
ee2781e6a6
Merge pull request #10223 from vovkasm/cmake-msvc-fixes-core
...
Cmake build system fixes for MSVC (partial)
2015-02-04 23:18:08 -08:00
WenhaiLin
6873713c31
Fixed compile error on win32
2015-01-29 19:38:55 +08:00
CocosRobot
fcf0a2272f
[AUTO]: updating luabinding automatically
2015-01-29 02:27:42 +00:00
minggo
de3e9be2c5
Merge pull request #10265 from samuele3hu/v3_4_fi
...
Add AsyncLoadSprite3D test case and update the related lua binding
2015-01-29 10:16:49 +08:00
samuele3hu
0ec8510f00
Fix linux compile error
2015-01-29 09:19:57 +08:00
samuele3hu
80c2e0c153
Add AsyncLoadSprite3D test case and update the related lua binding
2015-01-28 21:47:52 +08:00
CocosRobot
ba5b23d2a5
[AUTO]: updating luabinding automatically
2015-01-28 07:21:15 +00:00
CocosRobot
78463a4a66
[AUTO]: updating luabinding automatically
2015-01-28 05:46:25 +00:00
minggo
f54916cf69
Merge pull request #10247 from samuele3hu/v3_4_fi
...
Add more 3D test case and adjust some binding function
2015-01-28 13:41:34 +08:00
samuele3hu
cd42806367
Fix the error of tolua_cocos2d_Mat4_decompose
2015-01-28 11:12:12 +08:00
samuele3hu
82a95bf2fc
Modify some script files
2015-01-28 10:57:30 +08:00
samuele3hu
6208e9cba5
Add more test cases about 3D
2015-01-28 09:40:20 +08:00
CocosRobot
4792a44a87
[AUTO]: updating luabinding automatically
2015-01-27 05:58:53 +00:00
Vladimir Timofeev
b6201f9328
cmake: try to fix lua-bindings for msvc
2015-01-26 10:09:49 +03:00
minggo
ebc75579a2
Merge pull request #9838 from htlxyz/v3_origin
...
modify trans lua value to fontdefinition error
2015-01-23 16:55:01 +08:00
minggo
42b6fbd1c6
Merge pull request #9919 from edwardzhou/luaLoadChunksFromZIP_supports_folder_structured_lua
...
Lua load chunks from zip supports folder structured lua
2015-01-23 16:13:09 +08:00
CocosRobot
ad9e5e21c3
[AUTO]: updating luabinding automatically
2015-01-22 06:08:11 +00:00
samuele3hu
d74fb0e8b5
Update LayoutComponent Test case of UIEditTest
2015-01-22 10:21:38 +08:00
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