James Chen
|
f99b9bbabe
|
Merge pull request #6225 from heliclei/fix-console-linux-crash2
fix CCConsole linux crash
|
2014-04-10 19:57:50 +08:00 |
James Chen
|
7b4bec1395
|
Merge pull request #6226 from dumganhar/develop
Initializes member variables for TransitionScene class
|
2014-04-10 19:33:17 +08:00 |
James Chen
|
e7a4ac531a
|
Initializes member variables for TransitionScene class
|
2014-04-10 19:29:07 +08:00 |
heliclei
|
157fce785c
|
fix CCConsole linux crash
|
2014-04-10 18:31:28 +08:00 |
James Chen
|
bed5df98b7
|
Merge pull request #6224 from shujunqiao/cocos-console-test
[ci skip], fix android part in cocos-console-test.py.
|
2014-04-10 18:24:57 +08:00 |
shujunqiao
|
c937cad4c9
|
[ci skip], fix android part in cocos-console-test.py.
|
2014-04-10 18:20:53 +08:00 |
cw
|
06b727d184
|
remove comment code and rename function
|
2014-04-10 18:15:07 +08:00 |
cw
|
472e4020da
|
add new project socket lua
|
2014-04-10 18:02:47 +08:00 |
James Chen
|
167682fb46
|
Merge pull request #6222 from Dhilan007/develop
Add CCFontFNT.h to cocos2d.h
|
2014-04-10 17:33:36 +08:00 |
Dhilan007
|
8472e51b85
|
Add CCFontFNT.h to cocos2d.h
|
2014-04-10 17:31:42 +08:00 |
James Chen
|
2d131cf96a
|
Merge pull request #6221 from dumganhar/develop
Removed unused comments in GUIDefine.h
|
2014-04-10 17:19:56 +08:00 |
James Chen
|
39b25c9307
|
Removed unused comments in GUIDefine.h
|
2014-04-10 17:15:59 +08:00 |
James Chen
|
801fdde92b
|
Update CHANGELOG [ci skip]
|
2014-04-10 17:11:05 +08:00 |
James Chen
|
5d882cea23
|
Merge pull request #6213 from koowolf/wp8_fix
fix compiler error in wp8
|
2014-04-10 17:10:08 +08:00 |
James Chen
|
247f877cf4
|
Update AUTHORS [ci skip]
|
2014-04-10 17:08:02 +08:00 |
James Chen
|
443195df40
|
Merge pull request #6123 from ololomax/patch-1
set _node to null in createNodeWithSceneFile
|
2014-04-10 17:05:45 +08:00 |
James Chen
|
9c07ca5722
|
Merge pull request #6220 from Dhilan007/develop
Fixed logical error in TestChangeAnimationInternal::onExit.
|
2014-04-10 16:54:38 +08:00 |
koowolf
|
b5433f05c1
|
replace LabelTTF with Label
|
2014-04-10 16:51:25 +08:00 |
Dhilan007
|
d583dcc0f0
|
Fixed logical error in TestChangeAnimationInternal::onExit.
|
2014-04-10 16:48:51 +08:00 |
James Chen
|
cbd1af109f
|
Merge pull request #6219 from CocosRobot/update_cocosfiles_1397119257
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-04-10 16:44:28 +08:00 |
CocosRobot
|
d27a3c9642
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-04-10 08:40:58 +00:00 |
James Chen
|
f3160a8357
|
Merge pull request #6218 from CocosRobot/update_lua_bindings_1397118502
[AUTO]: updating luabinding automatically
|
2014-04-10 16:36:34 +08:00 |
CocosRobot
|
530cfae129
|
[AUTO]: updating luabinding automatically
|
2014-04-10 08:30:19 +00:00 |
James Chen
|
24ec86129a
|
Merge pull request #6217 from CocosRobot/update_lua_bindings_1397117948
[AUTO]: updating luabinding automatically
|
2014-04-10 16:21:14 +08:00 |
CocosRobot
|
431f843773
|
[AUTO]: updating luabinding automatically
|
2014-04-10 08:20:27 +00:00 |
James Chen
|
335b1ec2ce
|
Update CHANGELOG [ci skip]
|
2014-04-10 16:19:09 +08:00 |
James Chen
|
8fcf687452
|
Merge pull request #6216 from Dhilan007/develop
Fixed logical error in CameraCenterTest::onExit.
|
2014-04-10 16:17:10 +08:00 |
Dhilan007
|
fce85e08f9
|
Fixed logical error in CameraCenterTest::onExit.
|
2014-04-10 16:13:07 +08:00 |
James Chen
|
0ee1c5f198
|
Merge pull request #6215 from samuele3hu/develop_fix
update config files for lua bindings-generator and `lua_cocos2dx_manual.cpp` file
|
2014-04-10 15:59:48 +08:00 |
samuele3hu
|
748391f252
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-10 15:55:45 +08:00 |
chuanweizhang2013
|
b8ed365b7f
|
tab to 4 space
|
2014-04-10 15:53:42 +08:00 |
samuele3hu
|
249163c32d
|
Update config files for lua bindings-generator and `lua_cocos2dx_manual.cpp` file
|
2014-04-10 15:52:51 +08:00 |
chuanweizhang2013
|
eb6ef4d067
|
tab to 4 space
|
2014-04-10 15:51:25 +08:00 |
chuanweizhang2013
|
d5940243e1
|
mofiy wrong indention
|
2014-04-10 15:37:59 +08:00 |
James Chen
|
428cea061c
|
Merge pull request #6214 from dumganhar/iss4744-set-dirty-for-node
closed #4744: EventDispatcher::setDirtyForNode doesn't consider node's children
|
2014-04-10 15:35:29 +08:00 |
James Chen
|
8a66f43f30
|
closed #4744: Adds test for issue4744.
|
2014-04-10 15:31:53 +08:00 |
James Chen
|
a258df38a9
|
closed #4744: EventDispatcher::setDirtyForNode doesn't consider node's children
|
2014-04-10 15:31:22 +08:00 |
koowolf
|
aa51e5dd22
|
fix compiler error in wp8
|
2014-04-10 15:15:17 +08:00 |
James Chen
|
31a49a7599
|
Merge pull request #6212 from samuele3hu/develop_fix
Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF`
|
2014-04-10 15:12:36 +08:00 |
samuele3hu
|
c4c4358708
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-10 15:05:41 +08:00 |
samuele3hu
|
2800133c99
|
Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF`
|
2014-04-10 14:54:14 +08:00 |
cw
|
69865382c0
|
add prebuilt
|
2014-04-10 14:38:31 +08:00 |
James Chen
|
517dced63e
|
Merge pull request #6210 from CocosRobot/update_lua_bindings_1397110725
[AUTO]: updating luabinding automatically
|
2014-04-10 14:27:47 +08:00 |
CocosRobot
|
3f1e8c83a4
|
[AUTO]: updating luabinding automatically
|
2014-04-10 06:19:59 +00:00 |
James Chen
|
6d81c8a0a9
|
Merge pull request #6209 from dumganhar/develop
Moved the constructor and init function of SpriteBatchNode to protected access
|
2014-04-10 14:14:32 +08:00 |
James Chen
|
7ec9d6907e
|
Moved the constructor and init function of SpriteBatchNode to protected access.
|
2014-04-10 14:11:40 +08:00 |
James Chen
|
35b2271b0d
|
Update CHANGELOG [ci skip]
|
2014-04-10 12:49:53 +08:00 |
James Chen
|
bc14706058
|
Update AUTHORS [ci skip]
|
2014-04-10 12:47:04 +08:00 |
James Chen
|
6bdef136a7
|
Merge pull request #6145 from wefiends/set_fullscreen_videomode
CCGLView: Add createWithFullscreen overloaded method that sets video mode.
|
2014-04-10 12:45:57 +08:00 |
James Chen
|
7316f9402b
|
Merge pull request #6208 from CocosRobot/update_cocosfiles_1397100639
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-04-10 11:31:26 +08:00 |