samuele3hu
|
5b4e81aa3a
|
Update Android.mk for libluacocos2d
|
2014-10-15 00:25:12 +08:00 |
honghui
|
718b5a3cf8
|
Windows runtime response uncorrect
|
2014-10-15 00:20:18 +08:00 |
Anton Sokolchenko
|
1d02270c21
|
fix CMakeLists for Mac Os
|
2014-10-14 19:17:00 +03:00 |
samuele3hu
|
3e9900c40d
|
Update win32 project config
|
2014-10-15 00:08:52 +08:00 |
samuele3hu
|
5e2ea91eb8
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_CSLoader_bindings
|
2014-10-14 23:39:56 +08:00 |
samuele3hu
|
4a67963420
|
Update CSLoader lua-bindings and adjust project config
|
2014-10-14 23:37:00 +08:00 |
minggo
|
3fae476cd2
|
Merge pull request #8693 from cocoscodeide/v3
copy dll files to win32 runtime
|
2014-10-14 23:35:04 +08:00 |
honghui
|
445c9dcde4
|
copy dll files to win32 runtime
|
2014-10-14 23:32:25 +08:00 |
minggo
|
6bb58bfc44
|
Merge pull request #8692 from dualface/update-lua-template-runtime
Update lua template runtime
|
2014-10-14 23:19:04 +08:00 |
dualface
|
f45d9de8f2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update-lua-template-runtime
|
2014-10-14 23:11:12 +08:00 |
dualface
|
963474e43c
|
update lua-template-runtime
|
2014-10-14 23:08:42 +08:00 |
minggo
|
dc3997d41c
|
Merge pull request #8691 from minggo/fix-runtime
[ci skip]fix runtime error
|
2014-10-14 21:38:33 +08:00 |
minggo
|
39bce5c22f
|
fix runtime error
|
2014-10-14 21:37:04 +08:00 |
samuele3hu
|
735e86788e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
|
2014-10-14 21:36:44 +08:00 |
samuele3hu
|
3b4fbd8fff
|
Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes
|
2014-10-14 21:34:55 +08:00 |
minggo
|
19d408748c
|
Merge pull request #8687 from andyque/fixJenkinSqlTableName
fix jenkins sql table name
|
2014-10-14 20:09:30 +08:00 |
minggo
|
515424975f
|
Merge pull request #8689 from dualface/fix_codeide_debugger_support
Fix Code IDE debugger support
|
2014-10-14 18:38:32 +08:00 |
dualface
|
cc554fcb0a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_codeide_debugger_support
|
2014-10-14 18:27:46 +08:00 |
dualface
|
23781f7b92
|
fix coded debugger support
|
2014-10-14 18:26:56 +08:00 |
minggo
|
9aa50acc07
|
[ci skip]update config.json
|
2014-10-14 18:23:18 +08:00 |
minggo
|
94757e7adb
|
Merge pull request #8688 from minggo/remove-duplicated-codes
[ci skip]remove duplicated codes
|
2014-10-14 18:02:58 +08:00 |
minggo
|
7f3a480fa7
|
remove duplicated codes
|
2014-10-14 18:01:41 +08:00 |
andyque
|
9e538fce48
|
fix jenkins sql table name
|
2014-10-14 17:31:53 +08:00 |
minggo
|
1560ce6fea
|
Merge pull request #8685 from CocosRobot/update_cocosfiles_1413277837
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-14 17:15:00 +08:00 |
CocosRobot
|
c816ea443d
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-14 09:10:38 +00:00 |
minggo
|
c5fcc47778
|
Merge pull request #8681 from natural-law/v3
Update the reference of submodule cocos2d-console & plugin-x.
|
2014-10-14 17:09:28 +08:00 |
minggo
|
40ad15d25f
|
[ci skip]update config.json
|
2014-10-14 17:08:58 +08:00 |
minggo
|
abd2687cf5
|
Merge pull request #8683 from dualface/update_lua_template_runtime
update lua-template
|
2014-10-14 17:01:19 +08:00 |
tangziwen
|
473c9e90b2
|
fix Zorder for transparent mesh
|
2014-10-14 16:59:41 +08:00 |
dualface
|
cee999ebbb
|
update lua-template-default, lua-template-runtime, fix same proj problems.
|
2014-10-14 16:55:38 +08:00 |
Huabing.Xu
|
a20b8d671c
|
sprite lamp (works on iOS mac and android)
|
2014-10-14 16:54:52 +08:00 |
zhangbin
|
131c60fd20
|
Update the reference of submodule cocos2d-console.
|
2014-10-14 16:29:49 +08:00 |
XiaoYang
|
fb2235d712
|
Merge pull request #141 from songchengjiang/fixbillboard
Fixed billboard
|
2014-10-14 16:20:05 +08:00 |
minggo
|
f11c287ab6
|
Merge pull request #8679 from andyque/fixJenkinsError
fix jenkins linux compile error and add protobuf to ignore list
|
2014-10-14 16:10:05 +08:00 |
andyque
|
5ea0f0c86a
|
move include
|
2014-10-14 15:27:36 +08:00 |
andyque
|
2d4761966a
|
fix jenkins linux compile error and add protobuf to ignore list
|
2014-10-14 15:11:50 +08:00 |
songchengjiang
|
081196c933
|
fixed BillBoard
Added New Test case
|
2014-10-14 15:08:36 +08:00 |
minggo
|
6835aa73ba
|
Merge pull request #8676 from minggo/remove-protocolbuf
[ci skip]remove protocolbuf-lite
|
2014-10-14 14:54:56 +08:00 |
minggo
|
92689dd1fa
|
remove protocolbuf-lite
|
2014-10-14 14:53:24 +08:00 |
zhangbin
|
f46974196c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-10-14 14:44:16 +08:00 |
zhangbin
|
12ddeda1d7
|
Update the reference of submodule plugin-x.
|
2014-10-14 14:43:43 +08:00 |
minggo
|
2a2049c1df
|
Merge pull request #8675 from cocos2d/revert-8674-update_cocosfiles_1413268452
Revert "[AUTO][ci skip]: updating cocos2dx_files.json"
|
2014-10-14 14:42:26 +08:00 |
minggo
|
3274b6f9df
|
Revert "[AUTO][ci skip]: updating cocos2dx_files.json"
|
2014-10-14 14:41:45 +08:00 |
minggo
|
3003cfc463
|
Merge pull request #8674 from CocosRobot/update_cocosfiles_1413268452
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-14 14:35:16 +08:00 |
CocosRobot
|
96954d1188
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-14 06:34:13 +00:00 |
minggo
|
417eedcd62
|
Merge pull request #8672 from CocosRobot/update_cocosfiles_1413268046
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-14 14:33:00 +08:00 |
minggo
|
b0a8d62ff0
|
Merge pull request #8673 from CocosRobot/update_lua_bindings_1413268206
[AUTO]: updating luabinding automatically
|
2014-10-14 14:32:41 +08:00 |
CocosRobot
|
51e714bdae
|
[AUTO]: updating luabinding automatically
|
2014-10-14 06:32:12 +00:00 |
CocosRobot
|
b8ee257cd2
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-14 06:27:27 +00:00 |
minggo
|
0ab3017094
|
Merge pull request #8658 from pipu/v3_pipu
V3 pipu
|
2014-10-14 14:25:46 +08:00 |