CocosRobot
|
54b2a15886
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-19 13:24:14 +00:00 |
minggo
|
af88cf053b
|
Merge pull request #7022 from samuele3hu/v3_fix
Add bytecode and encrypted files test cases for Lua
|
2014-06-19 21:20:05 +08:00 |
minggo
|
c28c050c79
|
Merge pull request #7147 from CocosRobot/update_lua_bindings_1403182654
[AUTO]: updating luabinding automatically
|
2014-06-19 21:05:34 +08:00 |
minggo
|
0d07e19cd1
|
Merge pull request #7054 from 2youyouo2/v3
add TimelineAction
|
2014-06-19 21:05:15 +08:00 |
CocosRobot
|
d97401cdb1
|
[AUTO]: updating luabinding automatically
|
2014-06-19 13:00:05 +00:00 |
minggo
|
190d6d4859
|
Merge pull request #7136 from CocosRobot/update_lua_bindings_1403162482
[AUTO]: updating luabinding automatically
|
2014-06-19 20:56:10 +08:00 |
minggo
|
cdbd3508d4
|
Merge pull request #7139 from zawasp/uniform_struct
fix warning Uniform is struct, not class.
|
2014-06-19 20:55:37 +08:00 |
minggo
|
87a89bfaa2
|
Merge pull request #7142 from minggo/v3
revert binding-generators to correct commit
|
2014-06-19 20:53:41 +08:00 |
minggo
|
2f959a3f87
|
[ci skip]
|
2014-06-19 20:48:45 +08:00 |
minggo
|
7553060ba7
|
Merge pull request #7146 from gin0606/addNewLineAtTheEndOfFileCpp
[ci skip]Add new line at the end of a file to *.[cpp|h]
|
2014-06-19 20:47:17 +08:00 |
minggo
|
72465a362e
|
Merge pull request #7145 from gin0606/addNewLineAtTheEndOfFile
add new line at the end of a file to *.mk
|
2014-06-19 20:45:57 +08:00 |
lite3
|
05df5b8e14
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-19 19:54:09 +08:00 |
gin0606
|
79f82b00bc
|
Add new line at the end of a file to *.mm
|
2014-06-19 20:48:50 +09:00 |
gin0606
|
3ae8e29ce5
|
Add new line at the end of a file to *.h
|
2014-06-19 20:45:49 +09:00 |
gin0606
|
bf4f30d14b
|
Add new line at the end of a file to *.cpp
|
2014-06-19 20:45:24 +09:00 |
gin0606
|
2c837b0960
|
add new line at the end of a file to *.mk
|
2014-06-19 20:43:27 +09:00 |
Huabing.Xu
|
f82be936b5
|
Merge branch 'fast_tmx_copy' into fast_tmx
Conflicts:
cocos/2d/CCFastTMXLayer.cpp
|
2014-06-19 18:10:44 +08:00 |
Huabing.Xu
|
e03c412e71
|
refactor fast tmx rendering
|
2014-06-19 18:05:21 +08:00 |
minggo
|
bfed48f0ff
|
revert binding-generators to correct commit
|
2014-06-19 17:42:50 +08:00 |
minggo
|
6d80de181a
|
revert binding-generators to correct commit
|
2014-06-19 17:39:14 +08:00 |
chuanweizhang2013
|
9e62cc9c31
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-06-19 17:28:25 +08:00 |
cocoscodeide
|
8a1d170f0d
|
Merge pull request #35 from bofeng-song/v3
fix can`t debug vs project
|
2014-06-19 17:27:20 +08:00 |
chuanweizhang2013
|
be8775e314
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-06-19 17:23:36 +08:00 |
andyque
|
4d64b166cc
|
refactor - replace magic string with const string
|
2014-06-19 17:04:14 +08:00 |
chuanweizhang2013
|
1153531448
|
add response error
|
2014-06-19 16:50:16 +08:00 |
Mircea Rila
|
69f1bb6193
|
fix warning Uniform is struct, not class.
|
2014-06-19 11:46:00 +03:00 |
minggo
|
b042f28ccd
|
Merge pull request #7138 from minggo/v3
revert bindings-generator submodule
|
2014-06-19 16:04:13 +08:00 |
minggo
|
07d86d40ef
|
revert bindings-generator submodule
|
2014-06-19 16:03:19 +08:00 |
boyu0
|
5f10ff2c29
|
issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2
|
2014-06-19 15:57:13 +08:00 |
lvlong
|
8493c4579b
|
before switch branch save
|
2014-06-19 15:43:02 +08:00 |
minggo
|
a549fdccdc
|
Merge pull request #7134 from samuele3hu/v3_keypad_fix
Update bindings-generator
|
2014-06-19 15:28:43 +08:00 |
CocosRobot
|
c638cb8816
|
[AUTO]: updating luabinding automatically
|
2014-06-19 07:22:49 +00:00 |
minggo
|
1a241ca350
|
Merge pull request #7135 from minggo/orrderOfArrival
not set _orderOfArrival to 0 after visit
|
2014-06-19 15:17:55 +08:00 |
andyque
|
a26ef87783
|
cleanup reader code
|
2014-06-19 15:16:56 +08:00 |
minggo
|
136033c282
|
not set _orderOfArrival to 0 after visit
|
2014-06-19 15:09:27 +08:00 |
minggo
|
cecd96105e
|
Merge pull request #7132 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-06-19 14:49:20 +08:00 |
zhangbin
|
bd6aed8a7b
|
Update the reference of submodule cocos2d-console.
|
2014-06-19 14:47:16 +08:00 |
samuele3hu
|
477816e883
|
update bindings-generator submodule
|
2014-06-19 14:42:09 +08:00 |
andyque
|
515de9eda5
|
remove magic string of widget json reader
|
2014-06-19 14:40:24 +08:00 |
samuele3hu
|
46ce1c917d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-19 14:37:00 +08:00 |
2youyou2
|
0ce51162af
|
support Label widget
|
2014-06-19 14:11:37 +08:00 |
yangxiao
|
c5bb10e5f4
|
add comments
|
2014-06-19 14:11:14 +08:00 |
samuele3hu
|
65f51181c6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
|
2014-06-19 14:06:14 +08:00 |
samuele3hu
|
3a350e11ae
|
Add Lua binding for Animation3D and Animate3D ,and add related test case
|
2014-06-19 14:05:38 +08:00 |
子龙山人
|
e1095c4f09
|
Merge pull request #9 from geron-cn/guanghuiv3
Guanghuiv3
|
2014-06-19 13:38:53 +08:00 |
yangxiao
|
4db0bea73f
|
bone original pose
|
2014-06-19 12:01:03 +08:00 |
minggo
|
dff3feeeb7
|
Merge pull request #7128 from natural-law/v3
Modify the lua runtime template for prebuilt engine.
|
2014-06-19 11:49:04 +08:00 |
zhangbin
|
3b19b07915
|
Modify the lua runtime template for prebuilt engine.
|
2014-06-19 11:33:39 +08:00 |
chuanweizhang2013
|
e1d7871089
|
add mac android support
|
2014-06-19 11:27:31 +08:00 |
minggo
|
56777e6d61
|
[ci skip]
|
2014-06-19 09:47:01 +08:00 |