kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
CocosRobot
|
6e849a158d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 08:18:00 +00:00 |
CocosRobot
|
b76db94725
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 05:43:02 +00:00 |
CocosRobot
|
22f04da582
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 07:18:18 +00:00 |
CocosRobot
|
55c7de75e9
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 06:48:41 +00:00 |
CocosRobot
|
6bed988354
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 03:47:36 +00:00 |
CocosRobot
|
94a47fabcf
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-11 06:16:36 +00:00 |
CocosRobot
|
4fc0366e4d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-08 06:21:14 +00:00 |
CocosRobot
|
835e56e80a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 23:13:03 +00:00 |
CocosRobot
|
9178eeca73
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 08:11:21 +00:00 |
CocosRobot
|
8865bd488e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-04 12:52:41 +00:00 |
CocosRobot
|
76b151c281
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-03 20:25:32 +00:00 |
CocosRobot
|
3a1b52cafd
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-05-29 06:31:00 +00:00 |
CocosRobot
|
3bf58ab401
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 09:08:33 +00:00 |
CocosRobot
|
3851e8356e
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 08:00:53 +00:00 |
CocosRobot
|
824456b073
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-26 21:56:01 +00:00 |
CocosRobot
|
7fa68d9b3a
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-25 08:37:59 +00:00 |
CocosRobot
|
59807629d9
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-22 02:04:38 +00:00 |
CocosRobot
|
ad301891f0
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-21 02:46:49 +00:00 |
CocosRobot
|
cb6abaa14c
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-21 01:52:51 +00:00 |
CocosRobot
|
9572de26d4
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-18 05:43:08 +00:00 |
CocosRobot
|
006f9fcd36
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-14 02:30:32 +00:00 |
CocosRobot
|
6bf984f3d3
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-13 08:11:34 +00:00 |
CocosRobot
|
a7fb56de69
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-12 05:23:45 +00:00 |
CocosRobot
|
b5e9986d17
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-11 02:00:41 +00:00 |
CocosRobot
|
4195c4b250
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-08 02:03:02 +00:00 |
CocosRobot
|
8470ab606b
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-06 01:07:26 +00:00 |
CocosRobot
|
6ef35d48ae
|
[AUTO]: updating luabinding automatically
|
2015-05-05 03:31:53 +00:00 |
CocosRobot
|
4414536612
|
[AUTO]: updating luabinding automatically
|
2015-05-05 01:36:54 +00:00 |
CocosRobot
|
2b916b3b80
|
[AUTO]: updating luabinding automatically
|
2015-04-30 06:56:36 +00:00 |
minggo
|
4acd231f89
|
merge v3.6
|
2015-04-30 13:46:08 +08:00 |
CocosRobot
|
1f02af4a94
|
[AUTO]: updating luabinding automatically
|
2015-04-28 12:21:56 +00: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 |
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
|
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 |
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 |
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 |
CocosRobot
|
22da4c4832
|
[AUTO]: updating luabinding automatically
|
2015-04-09 03:50:13 +00:00 |
CocosRobot
|
58ca1b7911
|
[AUTO]: updating luabinding automatically
|
2015-04-08 03:52:03 +00:00 |
CocosRobot
|
4bcf6b7b67
|
[AUTO]: updating luabinding automatically
|
2015-04-08 02:04:07 +00:00 |
CocosRobot
|
e20a747138
|
[AUTO]: updating luabinding automatically
|
2015-04-03 07:53:06 +00: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 |
CocosRobot
|
4785e6e383
|
[AUTO]: updating luabinding automatically
|
2015-03-27 05:46:01 +00: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 |
CocosRobot
|
f43b666929
|
[AUTO]: updating luabinding automatically
|
2015-03-26 02:44:28 +00:00 |
CocosRobot
|
1ced296b58
|
[AUTO]: updating luabinding automatically
|
2015-03-25 03:59:57 +00: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 |
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 |
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 |
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 |
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 |
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 |
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 |
CocosRobot
|
6a91450f7c
|
[AUTO]: updating luabinding automatically
|
2015-02-15 11:53:55 +00:00 |
CocosRobot
|
a643691795
|
[AUTO]: updating luabinding automatically
|
2015-02-12 10:47:08 +00:00 |
CocosRobot
|
fcf0a2272f
|
[AUTO]: updating luabinding automatically
|
2015-01-29 02:27:42 +00: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 |
CocosRobot
|
4792a44a87
|
[AUTO]: updating luabinding automatically
|
2015-01-27 05:58:53 +00:00 |
CocosRobot
|
ad9e5e21c3
|
[AUTO]: updating luabinding automatically
|
2015-01-22 06:08:11 +00: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 |
CocosRobot
|
8f099c7f0d
|
[AUTO]: updating luabinding automatically
|
2015-01-21 03:09:35 +00:00 |
CocosRobot
|
2f75d56c9b
|
[AUTO]: updating luabinding automatically
|
2015-01-21 02:10:47 +00: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 |
CocosRobot
|
97aee8cef0
|
[AUTO]: updating luabinding automatically
|
2015-01-14 09:19:31 +00:00 |
CocosRobot
|
e69497c7c0
|
[AUTO]: updating luabinding automatically
|
2015-01-14 08:26:14 +00:00 |
CocosRobot
|
b134f74db4
|
[AUTO]: updating luabinding automatically
|
2015-01-14 03:43:27 +00:00 |
CocosRobot
|
93d1d9c940
|
[AUTO]: updating luabinding automatically
|
2015-01-12 12:08:54 +00: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 |
CocosRobot
|
9253ae99bc
|
[AUTO]: updating luabinding automatically
|
2015-01-07 09:50:54 +00:00 |
CocosRobot
|
54c75337c5
|
[AUTO]: updating luabinding automatically
|
2015-01-07 03:19:27 +00:00 |
CocosRobot
|
f83daed2cf
|
[AUTO]: updating luabinding automatically
|
2015-01-07 02:27:01 +00: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 |
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 |
CocosRobot
|
75436db583
|
[AUTO]: updating luabinding automatically
|
2014-12-29 05:51:45 +00: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 |
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 |
CocosRobot
|
6b15f4edcb
|
[AUTO]: updating luabinding automatically
|
2014-12-25 06:14:03 +00:00 |
lvlong
|
a4a108f766
|
fix lua binding again!!
|
2014-12-25 14:04:41 +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 |
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 |
CocosRobot
|
9ffacb3f78
|
[AUTO]: updating luabinding automatically
|
2014-12-17 10:38:03 +00: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 |
CocosRobot
|
b0aacdc287
|
[AUTO]: updating luabinding automatically
|
2014-12-09 10:34:49 +00:00 |
CocosRobot
|
e510f24663
|
[AUTO]: updating luabinding automatically
|
2014-12-08 10:14:41 +00:00 |
CocosRobot
|
0c54f8f7a0
|
[AUTO]: updating luabinding automatically
|
2014-12-04 02:11:58 +00:00 |
CocosRobot
|
f0c31172b8
|
[AUTO]: updating luabinding automatically
|
2014-11-27 13:39:15 +00:00 |
CocosRobot
|
36a5a170d2
|
[AUTO]: updating luabinding automatically
|
2014-11-27 02:55:33 +00:00 |
CocosRobot
|
3ed78b820e
|
[AUTO]: updating luabinding automatically
|
2014-11-27 02:02:29 +00: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 |
CocosRobot
|
7dc623fcab
|
[AUTO]: updating luabinding automatically
|
2014-11-24 07:24:39 +00:00 |
CocosRobot
|
e52ee603ac
|
[AUTO]: updating luabinding automatically
|
2014-11-20 03:41:28 +00:00 |
CocosRobot
|
a908c391b0
|
[AUTO]: updating luabinding automatically
|
2014-11-09 15:33:08 +00:00 |
CocosRobot
|
aae2fd9e2a
|
[AUTO]: updating luabinding automatically
|
2014-11-07 02:38:01 +00:00 |
CocosRobot
|
13f9073e22
|
[AUTO]: updating luabinding automatically
|
2014-11-05 05:44:02 +00:00 |
CocosRobot
|
9592b1f661
|
[AUTO]: updating luabinding automatically
|
2014-10-31 02:44:25 +00:00 |
CocosRobot
|
0ef3887497
|
[AUTO]: updating luabinding automatically
|
2014-10-24 13:55:25 +00:00 |
CocosRobot
|
e02558e391
|
[AUTO]: updating luabinding automatically
|
2014-10-20 10:17:27 +00:00 |
CocosRobot
|
5e09b1e3b1
|
[AUTO]: updating luabinding automatically
|
2014-10-20 06:06:43 +00:00 |
CocosRobot
|
96d709aff3
|
[AUTO]: updating luabinding automatically
|
2014-10-18 07:36:54 +00:00 |
CocosRobot
|
20781825f2
|
[AUTO]: updating luabinding automatically
|
2014-10-17 14:56:22 +00:00 |
CocosRobot
|
e8373e9b41
|
[AUTO]: updating luabinding automatically
|
2014-10-17 06:28:36 +00: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 |
CocosRobot
|
2bfad920ce
|
[AUTO]: updating luabinding automatically
|
2014-10-16 04:01:10 +00:00 |
Huabing.Xu
|
c12f88d63c
|
lua compiles ok-need to make it works later
|
2014-10-15 17:33:58 +08:00 |
CocosRobot
|
64a7ef9173
|
[AUTO]: updating luabinding automatically
|
2014-10-14 18:01:12 +00:00 |
CocosRobot
|
51e714bdae
|
[AUTO]: updating luabinding automatically
|
2014-10-14 06:32:12 +00:00 |
CocosRobot
|
971d3a6653
|
[AUTO]: updating luabinding automatically
|
2014-10-11 08:12:44 +00:00 |
CocosRobot
|
53cde3f3b2
|
[AUTO]: updating luabinding automatically
|
2014-10-10 08:39:46 +00:00 |
CocosRobot
|
70a2195ccf
|
[AUTO]: updating luabinding automatically
|
2014-10-08 09:53:11 +00:00 |
CocosRobot
|
a96a2a992d
|
[AUTO]: updating luabinding automatically
|
2014-09-30 07:13:25 +00:00 |
CocosRobot
|
50a06a13ad
|
[AUTO]: updating luabinding automatically
|
2014-09-29 10:11:17 +00:00 |
CocosRobot
|
fd9ed15d6d
|
[AUTO]: updating luabinding automatically
|
2014-09-29 01:25:31 +00:00 |
CocosRobot
|
021d21a2a7
|
[AUTO]: updating luabinding automatically
|
2014-09-26 15:37:17 +00:00 |
CocosRobot
|
963c02eb3d
|
[AUTO]: updating luabinding automatically
|
2014-09-26 05:45:33 +00:00 |
CocosRobot
|
7192681618
|
[AUTO]: updating luabinding automatically
|
2014-09-25 06:50:06 +00: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 |
CocosRobot
|
526c28bea9
|
[AUTO]: updating luabinding automatically
|
2014-09-15 15:21:18 +00:00 |
CocosRobot
|
8c7eb81271
|
[AUTO]: updating luabinding automatically
|
2014-09-15 01:50:32 +00:00 |
CocosRobot
|
29f9cbfd6a
|
[AUTO]: updating luabinding automatically
|
2014-09-12 08:15:54 +00:00 |
CocosRobot
|
434d4fbfdd
|
[AUTO]: updating luabinding automatically
|
2014-09-11 07:11:40 +00: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 |
CocosRobot
|
ed8835d262
|
[AUTO]: updating luabinding automatically
|
2014-09-09 06:43:49 +00: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 |
CocosRobot
|
ffb36d577e
|
[AUTO]: updating luabinding automatically
|
2014-09-03 03:29:43 +00:00 |
CocosRobot
|
dc15287ac3
|
[AUTO]: updating luabinding automatically
|
2014-09-02 05:45:07 +00: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 |
CocosRobot
|
5db16cdc23
|
[AUTO]: updating luabinding automatically
|
2014-08-25 02:34:32 +00:00 |
CocosRobot
|
899e0a4182
|
[AUTO]: updating luabinding automatically
|
2014-08-22 11:25:33 +00: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 |
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 |
CocosRobot
|
6467dcaa57
|
[AUTO]: updating luabinding automatically
|
2014-08-14 02:17:25 +00:00 |
CocosRobot
|
7a99220aad
|
[AUTO]: updating luabinding automatically
|
2014-08-14 01:39:44 +00:00 |
CocosRobot
|
df7c0ae1cb
|
[AUTO]: updating luabinding automatically
|
2014-08-13 06:42:14 +00:00 |
CocosRobot
|
cbbe7b9c60
|
[AUTO]: updating luabinding automatically
|
2014-08-12 02:08:16 +00:00 |
CocosRobot
|
3d222ab73a
|
[AUTO]: updating luabinding automatically
|
2014-08-11 01:31:04 +00:00 |
CocosRobot
|
aa68a63757
|
[AUTO]: updating luabinding automatically
|
2014-08-08 02:49:17 +00: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 |
CocosRobot
|
24da61e443
|
[AUTO]: updating luabinding automatically
|
2014-08-05 05:35:12 +00: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 |
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 |
CocosRobot
|
12042bfd9d
|
[AUTO]: updating luabinding automatically
|
2014-07-28 03:38:12 +00: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 |
CocosRobot
|
c8c17b68df
|
[AUTO]: updating luabinding automatically
|
2014-07-22 09:11:18 +00:00 |
CocosRobot
|
30b00dadd8
|
[AUTO]: updating luabinding automatically
|
2014-07-21 03:57:41 +00: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 |
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 |
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
|
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 |
CocosRobot
|
e72fffe5c9
|
[AUTO]: updating luabinding automatically
|
2014-07-17 02:28:34 +00:00 |
CocosRobot
|
af231d78db
|
[AUTO]: updating luabinding automatically
|
2014-07-16 13:02:27 +00:00 |
CocosRobot
|
1ef1a809b5
|
[AUTO]: updating luabinding automatically
|
2014-07-14 08:53:13 +00:00 |
CocosRobot
|
87aaf7dcef
|
[AUTO]: updating luabinding automatically
|
2014-07-11 09:48:20 +00:00 |
CocosRobot
|
563386a777
|
[AUTO]: updating luabinding automatically
|
2014-07-11 05:46:37 +00:00 |
CocosRobot
|
20c4e6530d
|
[AUTO]: updating luabinding automatically
|
2014-07-11 04:07:14 +00:00 |
CocosRobot
|
c205bd0806
|
[AUTO]: updating luabinding automatically
|
2014-07-10 14:10:03 +00:00 |
CocosRobot
|
af460a1530
|
[AUTO]: updating luabinding automatically
|
2014-07-10 02:03:40 +00:00 |
CocosRobot
|
ae12030745
|
[AUTO]: updating luabinding automatically
|
2014-07-09 05:42:06 +00:00 |
CocosRobot
|
5838370b31
|
[AUTO]: updating luabinding automatically
|
2014-07-08 10:05:47 +00:00 |
CocosRobot
|
4c1da7d89a
|
[AUTO]: updating luabinding automatically
|
2014-07-06 13:05:59 +00:00 |
CocosRobot
|
2821a23640
|
[AUTO]: updating luabinding automatically
|
2014-07-02 02:15:26 +00: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 |
CocosRobot
|
9393777c22
|
[AUTO]: updating luabinding automatically
|
2014-06-27 08:31:17 +00:00 |
CocosRobot
|
57513d4c2e
|
[AUTO]: updating luabinding automatically
|
2014-06-26 03:10:44 +00: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 |
CocosRobot
|
515f967f96
|
[AUTO]: updating luabinding automatically
|
2014-06-25 06:17:41 +00:00 |