CocosRobot
|
3ee2e7a490
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-17 02:56:26 +00:00 |
CocosRobot
|
4ccc6ce5de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-11 06:53:45 +00:00 |
CocosRobot
|
f7803cba19
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-04 11:09:49 +00:00 |
CocosRobot
|
09cbc2145d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-28 03:29:16 +00:00 |
CocosRobot
|
5760e43387
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-26 01:45:38 +00:00 |
CocosRobot
|
6a0e1b323f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-20 02:42:17 +00:00 |
CocosRobot
|
216438fb9b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-10 01:40:55 +00:00 |
CocosRobot
|
1919d1a679
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-08 03:50:33 +00:00 |
CocosRobot
|
246fa7ffd8
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-29 07:45:48 +00:00 |
CocosRobot
|
b082620d85
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-27 15:24:49 +00:00 |
minggo
|
26632ec69a
|
linjia demo finish
|
2015-09-26 19:43:35 +08:00 |
CocosRobot
|
b09b146f97
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-22 09:23:14 +00:00 |
CocosRobot
|
9ef7991b99
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-21 10:43:59 +00:00 |
CocosRobot
|
0af77fca90
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-21 08:35:18 +00:00 |
CocosRobot
|
c562a57030
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 16:32:43 +00:00 |
CocosRobot
|
37cb9afb3f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 14:04:49 +00:00 |
CocosRobot
|
ad65343814
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 13:51:58 +00:00 |
CocosRobot
|
79a7878687
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 07:41:46 +00:00 |
CocosRobot
|
fe41739584
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 04:07:18 +00:00 |
CocosRobot
|
ae8a35a726
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-15 10:36:16 +00:00 |
CocosRobot
|
19561ca84b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-15 06:32:52 +00:00 |
CocosRobot
|
c9b30bd391
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-15 05:45:47 +00:00 |
CocosRobot
|
4b3e71e353
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-15 01:35:59 +00:00 |
CocosRobot
|
e79678454b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-11 09:59:04 +00:00 |
CocosRobot
|
cfe0be269b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-10 10:14:45 +00:00 |
CocosRobot
|
b3976cdd63
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-09 06:08:45 +00:00 |
CocosRobot
|
a78f5e3dcc
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-09 02:23:01 +00:00 |
CocosRobot
|
7117fa24be
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-24 10:13:27 +00:00 |
CocosRobot
|
31a09c9f23
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-24 06:13:37 +00:00 |
CocosRobot
|
6b6c6b242c
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-21 06:44:25 +00:00 |
CocosRobot
|
9a6c779580
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-21 03:59:12 +00:00 |
子龙山人
|
5b0dcd8a10
|
Merge pull request #13484 from CocosRobot/update_lua_bindings_1440055948
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-20 15:42:06 +08:00 |
CocosRobot
|
a3b8423977
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-20 07:39:25 +00:00 |
CocosRobot
|
bf723eab91
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-19 05:55:16 +00:00 |
CocosRobot
|
9b003c9cfc
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-14 03:34:30 +00:00 |
CocosRobot
|
2de6b4ed4c
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-13 09:11:00 +00:00 |
CocosRobot
|
9fd18f987e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-13 02:53:50 +00:00 |
CocosRobot
|
ef41cb27ca
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-11 08:02:58 +00:00 |
CocosRobot
|
8c76a194fa
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-09 02:32:59 +00:00 |
CocosRobot
|
eb9d1ea205
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-07 22:55:48 +00:00 |
CocosRobot
|
3e71ce33c8
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-03 10:09:10 +00:00 |
CocosRobot
|
dbb8792630
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-03 07:46:25 +00:00 |
CocosRobot
|
167f9adca8
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-03 05:09:11 +00:00 |
pandamicro
|
3c2e66e425
|
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
|
2015-08-02 22:28:27 +08:00 |
CocosRobot
|
29208156d9
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-01 13:23:21 +00:00 |
CocosRobot
|
90d578c6e5
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-01 02:16:33 +00:00 |
CocosRobot
|
0851363532
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-31 02:06:41 +00:00 |
CocosRobot
|
b167d29a80
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 10:27:28 +00:00 |
CocosRobot
|
ef7318cf00
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 09:23:06 +00:00 |
CocosRobot
|
7a73c65208
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 05:53:20 +00:00 |