Commit Graph

19664 Commits

Author SHA1 Message Date
James Chen b24eb291a9 Merge pull request #5766 from samuele3hu/develop_new_fix
Rename `testlua` to `lua_tests` for luaTest android project
2014-03-13 18:32:56 +08:00
boyu0 44a69db0cb update external library, add iOS x86_64 and arm64 architectures, support Xcode5.1 iPhone simulator(64 bit) 2014-03-13 18:32:03 +08:00
samuele3hu 2e7b3331a5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-13 17:53:43 +08:00
James Chen b37bd73861 Merge pull request #5751 from linchaogithub/develop
[Jenkins-watchdog] check & kill dead buid
2014-03-13 17:50:53 +08:00
samuele3hu ca56410427 Rename `testlua` to `lua_tests` for luaTest android project 2014-03-13 17:36:53 +08:00
minggo d0fb0b9e6a Merge pull request #5765 from shujunqiao/develop
add cocos-console-test.py to tools/jenkins-scripts
2014-03-13 17:08:55 +08:00
qiaofeng00oo 3013bf2d6d modify cocos-console-test.py. 2014-03-13 17:05:10 +08:00
chuanweizhang2013 bf9d3e93b1 Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage 2014-03-13 17:02:46 +08:00
chuanweizhang2013 f8dd1c1b1d update win32 templates 2014-03-13 17:00:25 +08:00
qiaofeng00oo 17ba28de2a add cocos-console-test.py to tools/jenkins-scripts/ 2014-03-13 16:29:47 +08:00
minggo ffc541609d Merge pull request #5763 from minggo/script-fix
find correct path on windows
2014-03-13 16:07:22 +08:00
minggo 747ca17386 find correct path on windows 2014-03-13 16:01:33 +08:00
James Chen 0df30132e2 Merge pull request #5759 from CocosRobot/update_cocosfiles_1394695081
[AUTO][ci skip]: updating cocos2dx_files.json
2014-03-13 15:35:06 +08:00
CocosRobot 28f7603f81 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-13 07:18:02 +00:00
James Chen 1cd41f8caa Merge pull request #5758 from CocosRobot/update_lua_bindings_1394693465
[AUTO]: updating luabinding automatically
2014-03-13 15:16:31 +08:00
CocosRobot b1becd3fae [AUTO]: updating luabinding automatically 2014-03-13 06:51:53 +00:00
James Chen 3f3831f0ac Merge pull request #5757 from samuele3hu/develop_new_fix
Update `bindings-generator` submodule and add auto-binding for the `RichText`
2014-03-13 14:48:50 +08:00
samuele3hu a30ce6cfc5 Update `bindings-generator` submodule 2014-03-13 14:47:00 +08:00
samuele3hu 5942a6d55d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-13 14:32:58 +08:00
chuanweizhang2013 fe7c911cd3 Merge pull request #15 from cocos2d/develop
update lua
2014-03-13 14:32:21 +08:00
samuele3hu 108928e1a7 Update `bindings-generator` submodule and add auto-binding for the `RichText` 2014-03-13 14:31:07 +08:00
linchaogithub 347dd55f3d [jenkins-job-watchdog-threshold]replace[duration] 2014-03-13 14:12:29 +08:00
James Chen 4611a54f81 Merge pull request #5754 from CocosRobot/update_lua_bindings_1394683297
[AUTO]: updating luabinding automatically[ci skip]
2014-03-13 12:04:47 +08:00
CocosRobot 107a8791e1 [AUTO]: updating luabinding automatically 2014-03-13 04:02:44 +00:00
James Chen 57a0c71cd0 Merge pull request #5753 from CocosRobot/update_lua_bindings_1394682303
[AUTO]: updating luabinding automatically
2014-03-13 11:47:03 +08:00
CocosRobot 6d8bc4e616 [AUTO]: updating luabinding automatically 2014-03-13 03:45:57 +00:00
James Chen 3f3325494a Merge pull request #5750 from CocosRobot/update_lua_bindings_1394681799
[AUTO]: updating luabinding automatically
2014-03-13 11:39:10 +08:00
CocosRobot e3c6497c2b [AUTO]: updating luabinding automatically 2014-03-13 03:37:37 +00:00
James Chen 91e8032f25 Merge pull request #5749 from CocosRobot/update_cocosfiles_1394681739
[AUTO][ci skip]: updating cocos2dx_files.json
2014-03-13 11:37:33 +08:00
CocosRobot 2c59743abf [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-13 03:35:40 +00:00
linchaogithub ab4841e774 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-13 11:17:50 +08:00
linchaogithub 9dcca7641c [Jenkins] watchdog 2014-03-13 11:16:21 +08:00
James Chen 5f376e0b5b Update CHANGELOG [ci skip] 2014-03-13 11:10:53 +08:00
James Chen ad316654c2 Merge pull request #5743 from heliclei/remove-node-name
remove node name related features from v3.0
2014-03-13 11:09:49 +08:00
James Chen 51b708db8e Merge pull request #5741 from nutty898/develop_nutty_modify_framework_for315CrashFixed
[UI] Potential crash in cocos2d::ui::ScrollView.
2014-03-13 11:06:15 +08:00
James Chen 817ce7cab9 Merge pull request #5742 from chuanweizhang2013/luamerage
fixed template android build errors
2014-03-13 10:54:05 +08:00
James Chen 2da4b7f375 Update CHANGELOG [ci skip] 2014-03-13 10:52:47 +08:00
James Chen 46649b3d1a Merge pull request #5744 from dingpinglv/Iss4277_fixedControlButtonBug
Issue #4277: fixed a bug of ControlButton that it will crash when it deletes itself in its callback.
2014-03-13 10:50:25 +08:00
heliclei c26b103b23 remove node name related features from v3.0 2014-03-13 10:45:02 +08:00
CaiWenzhi a4d558adee Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-13 10:25:32 +08:00
dingpinglv f8af43a7a5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Iss4277_fixedControlButtonBug 2014-03-13 10:15:05 +08:00
dingpinglv a567d467b3 Issue #4277: fixed a bug of ControlButton that it will crash when it deletes itself in its callback. 2014-03-13 10:14:24 +08:00
CaiWenzhi b8ce59962a Fixed bug of ScrollView 2014-03-13 10:11:41 +08:00
chuanweizhang2013 0dc85e42a7 modify module_path 2014-03-13 09:51:43 +08:00
chuanweizhang2013 d4fe9509fc Merge pull request #14 from cocos2d/develop
update lua
2014-03-13 09:43:25 +08:00
Ricardo Quesada c5cfb11eb8 Merge pull request #5739 from ricardoquesada/xcode_only_active_arch
only active arch for DEBUG
2014-03-12 08:40:41 -07:00
Ricardo Quesada 372c26b5ba only active arch for DEBUG
RELEAES compiles all valid archs
2014-03-12 08:40:04 -07:00
James Chen ac0aecb394 Merge pull request #5737 from dumganhar/runtime-fix
Lua Runtime fix
2014-03-12 21:48:35 +08:00
James Chen 77a8476c80 GLView::end needs to release self. 2014-03-12 21:45:57 +08:00
James Chen cc8738ee94 Simulator fix: After main loop, NSApplication needs to be terminated immediately. 2014-03-12 21:45:15 +08:00