chuanweizhang2013
|
80e9c7d9b8
|
add head
|
2014-06-20 13:43:09 +08:00 |
yangxiao
|
f633c6a8c2
|
create sub Animate3D
|
2014-06-20 12:01:54 +08:00 |
yinkaile
|
1aa07906a1
|
add new line at the end of the file
|
2014-06-20 11:36:48 +08:00 |
cocoscodeide
|
d7c077ad03
|
Merge pull request #37 from chuanweizhang2013/v3luaruntime
add protobuf
|
2014-06-19 20:36:33 -07:00 |
chuanweizhang2013
|
a45056dbd7
|
add protobuf
|
2014-06-20 11:32:22 +08:00 |
yinkaile
|
aac4ded898
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-20 11:24:12 +08:00 |
yinkaile
|
510bc23b16
|
1.fixed action may shake a little
2.fixed frame event will emit even they do not in current play section
|
2014-06-20 11:23:26 +08:00 |
andyque
|
4ca184b58a
|
issue #5161, deprecated getSize
|
2014-06-20 11:18:53 +08:00 |
samuele3hu
|
5351055d5d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-20 11:12:09 +08:00 |
samuele3hu
|
d9848a62d2
|
Update controller.lua for CocosIDE’s need
|
2014-06-20 11:09:26 +08:00 |
yinkaile
|
043c640037
|
fixed warning and logic error
|
2014-06-20 10:52:14 +08:00 |
zhangbin
|
ec62f05b12
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-20 10:51:13 +08:00 |
zhangbin
|
0019d9a061
|
Optimize the win32 projects configuration.
|
2014-06-20 10:50:43 +08:00 |
andyque
|
585ccf2c71
|
issue #5161, replace all _size to _contentSize
|
2014-06-20 10:40:16 +08:00 |
minggo
|
d7e7a73fec
|
Merge pull request #7154 from Mazyod/fix-cc-log-info
CCLOGINFO compilation fix
|
2014-06-20 10:01:31 +08:00 |
Mazyad Alabduljaleel
|
c7ec43202a
|
restore COCOS_DEBUG macro
|
2014-06-19 21:00:56 +04:00 |
Mazyad Alabduljaleel
|
433dc140cd
|
CCLOGINFO compilation fix
|
2014-06-19 20:59:08 +04:00 |
minggo
|
f1ea2e9332
|
[ci skip]
|
2014-06-19 22:13:27 +08:00 |
minggo
|
9f0a566b8a
|
Merge pull request #6945 from John-He-928/mingw-build
Fix MinGW build
|
2014-06-19 22:08:28 +08:00 |
minggo
|
079e612ef2
|
[ci skip]
|
2014-06-19 22:07:25 +08:00 |
lite3
|
77210d60ae
|
fix: can not create networkThread at second create HttpClient.
|
2014-06-19 22:07:24 +08:00 |
minggo
|
44e8df0ec6
|
[ci skip]
|
2014-06-19 22:05:52 +08:00 |
minggo
|
e374bd67c7
|
Merge pull request #6946 from hanjukim/skip-utf8-bom
Skip UTF8 BOM if it exists and bug fix for unterminated string
|
2014-06-19 22:02:38 +08:00 |
minggo
|
7d05249490
|
Merge pull request #7153 from CocosRobot/update_cocosfiles_1403186228
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-19 21:57:57 +08:00 |
CocosRobot
|
ffb96092fd
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-19 13:57:10 +00:00 |
minggo
|
4fa86ae6ce
|
Merge pull request #7151 from CocosRobot/update_lua_bindings_1403185113
[AUTO]: updating luabinding automatically
|
2014-06-19 21:42:33 +08:00 |
CocosRobot
|
62e2580e48
|
[AUTO]: updating luabinding automatically
|
2014-06-19 13:40:08 +00:00 |
minggo
|
36e5b579fc
|
Merge pull request #7149 from CocosRobot/update_lua_bindings_1403184170
[AUTO]: updating luabinding automatically
|
2014-06-19 21:25:58 +08:00 |
minggo
|
a8328f1254
|
Merge pull request #7148 from CocosRobot/update_cocosfiles_1403184246
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-19 21:25:45 +08:00 |
CocosRobot
|
a3bee308f6
|
[AUTO]: updating luabinding automatically
|
2014-06-19 13:24:36 +00:00 |
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 |