CocosRobot
|
1f02af4a94
|
[AUTO]: updating luabinding automatically
|
2015-04-28 12:21:56 +00:00 |
samuele3hu
|
5819159889
|
Add Lua-bindings for SpritePolygon and related test case
|
2015-04-28 18:19:57 +08:00 |
samuele3hu
|
c801d1868c
|
Update Sprite3DTest and VideoPlayerTest about Lua
|
2015-04-28 11:27:50 +08:00 |
CocosRobot
|
a7edda72f5
|
[AUTO]: updating luabinding automatically
|
2015-04-27 09:47:08 +00:00 |
CocosRobot
|
09a6cc19b7
|
[AUTO]: updating luabinding automatically
|
2015-04-27 07:48:42 +00:00 |
CocosRobot
|
09cddb4d4b
|
[AUTO]: updating luabinding automatically
|
2015-04-27 02:25:05 +00:00 |
Danut Chereches
|
5f692962b9
|
fixed 'seperate' typo
issue #8408
|
2015-04-25 00:02:39 +03:00 |
CocosRobot
|
30ccbe3526
|
[AUTO]: updating luabinding automatically
|
2015-04-21 10:29:17 +00:00 |
CocosRobot
|
87e29db218
|
[AUTO]: updating luabinding automatically
|
2015-04-20 05:40:58 +00:00 |
samuele3hu
|
9477e89723
|
Fix the compile error on the win32
|
2015-04-20 11:46:48 +08:00 |
samuele3hu
|
4f22a1470b
|
Update the project setting
|
2015-04-20 10:11:39 +08:00 |
samuele3hu
|
067ad6ad60
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2
Conflicts:
cocos/scripting/lua-bindings/proj.android/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
|
2015-04-20 10:05:02 +08:00 |
minggo
|
e133f81226
|
Merge pull request #11482 from samuele3hu/v3_remove_useless
[ci skip]Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B
|
2015-04-17 17:54:53 +08:00 |
minggo
|
768d2bdb48
|
Merge pull request #11481 from andyque/remove-all-lz-in-android
remove system zlib dependency since we use our own prebuilt version
|
2015-04-17 17:49:14 +08:00 |
samuele3hu
|
9aadc2a993
|
Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B,
|
2015-04-17 17:40:28 +08:00 |
andyque
|
d3a06de6d6
|
remove system zlib dependency since we use our own prebuilt version of
zlib now.
|
2015-04-17 17:24:33 +08:00 |
samuele3hu
|
b300701ec4
|
Remove the reference of quick module
|
2015-04-17 15:52:45 +08:00 |
samuele3hu
|
b72034a3f6
|
Add Lua bindings for WebView and related test case
|
2015-04-17 14:08:47 +08:00 |
CocosRobot
|
f1bd23aa32
|
[AUTO]: updating luabinding automatically
|
2015-04-16 02:19:38 +00:00 |
CocosRobot
|
66fcba02b1
|
[AUTO]: updating luabinding automatically
|
2015-04-14 09:10:16 +00:00 |
CocosRobot
|
0e4a209241
|
[AUTO]: updating luabinding automatically
|
2015-04-14 08:44:30 +00:00 |
CocosRobot
|
a0a6b9cda4
|
[AUTO]: updating luabinding automatically
|
2015-04-14 02:12:05 +00:00 |
minggo
|
bc34554bd9
|
Merge pull request #11407 from samuele3hu/v3_studio2
Synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
|
2015-04-13 18:22:18 +08:00 |
samuele3hu
|
24654a4847
|
synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
|
2015-04-13 16:29:44 +08:00 |
CocosRobot
|
698a75e17f
|
[AUTO]: updating luabinding automatically
|
2015-04-13 05:44:29 +00:00 |
CocosRobot
|
bd3b978c89
|
[AUTO]: updating luabinding automatically
|
2015-04-10 10:18:33 +00:00 |
CocosRobot
|
15f22d936f
|
[AUTO]: updating luabinding automatically
|
2015-04-10 07:27:51 +00:00 |
samuele3hu
|
9bf2a920b4
|
Update the Lua bindings for terrain and TerrainTest.lua
|
2015-04-09 13:41:52 +08:00 |
CocosRobot
|
22da4c4832
|
[AUTO]: updating luabinding automatically
|
2015-04-09 03:50:13 +00:00 |
tangziwen
|
176532eef4
|
update Terrain Lua binding
|
2015-04-09 10:01:40 +08:00 |
CocosRobot
|
58ca1b7911
|
[AUTO]: updating luabinding automatically
|
2015-04-08 03:52:03 +00:00 |
minggo
|
4bcfcb1d09
|
Merge pull request #11320 from samuele3hu/v3_terrain
#issue 10819:Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 11:45:46 +08:00 |
CocosRobot
|
4bcf6b7b67
|
[AUTO]: updating luabinding automatically
|
2015-04-08 02:04:07 +00:00 |
samuele3hu
|
3a2601a1f8
|
Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 10:03:50 +08:00 |
minggo
|
50fa15c0cd
|
Merge pull request #11301 from samuele3hu/v3_lua_jit
Add luajit support for iOS 64bit devices and related test cases
|
2015-04-07 18:17:09 +08:00 |
samuele3hu
|
a64e90d469
|
Update the related project setting for Luajit and related test cases
|
2015-04-06 22:41:34 +08:00 |
CocosRobot
|
e20a747138
|
[AUTO]: updating luabinding automatically
|
2015-04-03 07:53:06 +00:00 |
samuele3hu
|
826fe4cf31
|
Update the Xcode project setting for luajit
|
2015-04-02 10:07:31 +08:00 |
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 |