Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,392 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

19392 Commits

Author SHA1 Message Date
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
Huabing.Xu 7441c06680 change matrix projection compatible with kazmath logic 2014-04-10 17:02:36 +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
CocosRobot 1e37906965 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-10 03:30:39 +00:00
James Chen 599e14efaa Merge pull request #6207 from CocosRobot/update_lua_bindings_1397100218 
[AUTO]: updating luabinding automatically
 2014-04-10 11:27:04 +08:00
James Chen c24cdc6eef Update AUTHORS [ci skip] 2014-04-10 11:26:32 +08:00
James Chen 13e0b732d1 Merge pull request #6206 from dumganhar/pull/6197 
Merge PR #6197: Potential leak in CCEditBoxImplIOS.mm
 2014-04-10 11:24:48 +08:00
CocosRobot 782bdd90f5 [AUTO]: updating luabinding automatically 2014-04-10 03:24:38 +00:00
James Chen 0c3c29b50d Remove unused comments in CCEditBoxImplIOS.mm 2014-04-10 11:22:55 +08:00
James Chen 150e73ba62 Merge commit 'refs/pull/6197/head' of git://github.com/cocos2d/cocos2d-x into pull/6197 2014-04-10 11:21:16 +08:00
James Chen efb443dea0 Merge pull request #6200 from dumganhar/iss4729-deprecated-folder 
issue #4729: Move deprecated stuff to deprecated folder
 2014-04-10 11:17:21 +08:00
James Chen ba1f535201 Merge pull request #6199 from Dhilan007/develop_label 
closed #4743: Label:Makes the create functions of Label clearer.
 2014-04-10 11:15:56 +08:00
Huabing.Xu 231cdcb906 adjust comment message 2014-04-10 11:14:46 +08:00
James Chen cae0a45c40 Merge pull request #6205 from dumganhar/getData-fix 
Fix for FileUtils::getData
 2014-04-10 11:13:33 +08:00
James Chen 117f248a3b Fix for FileUtils::getData 2014-04-09 20:07:00 -07:00
Dhilan007 8ab372fdd9 Label:Add compatible API of the create functions. 2014-04-10 10:58:49 +08:00