Commit Graph

19664 Commits

Author SHA1 Message Date
shujunqiao d18ee12678 for test close project in cocos-console-test.py. 2014-03-21 14:15:59 +08:00
James Chen 6d1d7bca84 Merge pull request #5903 from dumganhar/merge5898
closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
2014-03-21 14:15:28 +08:00
cw 2b458d6f8f update prebuilt runtime pc 2014-03-21 14:13:57 +08:00
lm 9598c151ed [Jenkins] Clean workspace after build finish 2014-03-21 13:57:38 +08:00
Dhilan007 1a08cd9b32 fix typo. 2014-03-21 13:52:12 +08:00
James Chen f51c39c034 closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
Thank @pandamicro.
2014-03-21 13:44:29 +08:00
cw 8a40fbc159 update pc show msg 2014-03-21 11:56:21 +08:00
James Chen c2ce7b91d6 Merge pull request #5902 from CocosRobot/update_cocosfiles_1395372145
[AUTO][ci skip]: updating cocos2dx_files.json
2014-03-21 11:54:32 +08:00
samuele3hu e2ed17f69c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr 2014-03-21 11:28:39 +08:00
samuele3hu 71f3cb7862 close #4452:Make `addCustomHandler` more distinct 2014-03-21 11:24:24 +08:00
CocosRobot 3c9acc938b [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 03:22:25 +00:00
James Chen b2d25ea092 Update CHANGELOG [ci skip] 2014-03-21 11:22:12 +08:00
James Chen 6340547fc5 Merge pull request #5900 from heliclei/fix-test-memory-leak
fix memory leak in CocosDenshionTest.
2014-03-21 11:21:04 +08:00
James Chen a9d8a325db Merge pull request #5899 from CocosRobot/update_cocosfiles_1395370450
[AUTO][ci skip]: updating cocos2dx_files.json
2014-03-21 11:11:38 +08:00
James Chen 368d5216ad Merge pull request #5897 from Dhilan007/develop_edtaa_license
update license.
2014-03-21 11:09:36 +08:00
heliclei 9c00484022 Autorelease custom extended class, fix memory leak 2014-03-21 11:07:28 +08:00
CocosRobot 0b7a052fa6 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 02:54:10 +00:00
James Chen b2d7769d05 Update CHANGELOG [ci skip] 2014-03-21 10:53:56 +08:00
James Chen d5e8bde89e Merge pull request #5889 from samuele3hu/develop_socket
close #4400: Use the latest version of LuaSocket and modify the related project config
2014-03-21 10:52:38 +08:00
Dhilan007 6da2773117 add licenses for AA-EDT 2014-03-21 10:49:07 +08:00
shujunqiao 686ed5dfa1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test 2014-03-21 10:42:23 +08:00
Dhilan007 cca1591e8a update license. 2014-03-21 10:23:11 +08:00
minggo 5439f02cc5 Merge pull request #5882 from natural-law/develop
Backup the environment  file when adding environment variable in setup.py.
2014-03-21 09:50:44 +08:00
Dhilan007 6b74794c74 fix typo and mistake in Label::setTextColor. 2014-03-21 09:47:29 +08:00
James Chen 767d427dc6 Update CHANGELOG [ci skip] 2014-03-21 09:35:27 +08:00
James Chen 3cde66dce8 Merge pull request #5854 from boyu0/iss4424_setgravityenable_fix
closed #4424: fix PhysicsBody::setGravityEnable() doesn't work correctly sometimes
2014-03-21 09:34:33 +08:00
Dhilan007 9dfa099bef Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
James Chen 2c9d8e80c7 Update CHANGELOG [ci skip] 2014-03-20 18:25:53 +08:00
James Chen c3ef689724 Merge pull request #5890 from dumganhar/iss4462-ccb
closed #4462: Wrong logic in CCBAnimationManager::moveAnimationsFromNode...
2014-03-20 18:24:54 +08:00
James Chen b3cfc693ca Merge pull request #5887 from andyque/fix_tests_warnings
Fix warnings in cpp-tests.
2014-03-20 18:24:10 +08:00
samuele3hu 21a21c2d3d close #4400: Update the anrroid.mk for lua-bindings 2014-03-20 18:09:52 +08:00
samuele3hu 11bbeb4a30 close #4452:Using better spelling format 2014-03-20 17:56:33 +08:00
James Chen dcd919d9f7 closed #4462: Wrong logic in CCBAnimationManager::moveAnimationsFromNode. 2014-03-20 17:43:44 +08:00
samuele3hu 977ef0092b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr 2014-03-20 17:43:28 +08:00
shujunqiao fdb87cc69d ignore [] in command [console run]. 2014-03-20 17:40:41 +08:00
zhangbin bcb635c19b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-20 17:23:09 +08:00
samuele3hu 4b25c9f62e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-03-20 17:07:33 +08:00
samuele3hu d3487d2d3c close #4400: Use the newest version of LuaSocket for lua 2014-03-20 17:04:54 +08:00
andyque 91d972ba87 rollback the scheme mode of projects 2014-03-20 17:01:21 +08:00
andyque dd790ce54d add id return value to LuaObjectCBridge 2014-03-20 16:59:18 +08:00
andyque cf86fd619f fix lua bindings warnings 2014-03-20 16:48:12 +08:00
andyque f26ae8a019 remove unused params warnings 2014-03-20 16:34:42 +08:00
James Chen 625ec5a882 Merge pull request #5886 from lmskater/add-master-build
[Jenkins] Add master build in pull-request-builder.py
2014-03-20 16:32:10 +08:00
andyque 7ab639ec0f fix lots compile warnings 2014-03-20 16:24:55 +08:00
lm 3db3a12318 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into add-master-build 2014-03-20 16:20:02 +08:00
lm 3f09fbdade [Jenkins] Add master build in pull-request-builder.py 2014-03-20 16:19:35 +08:00
zhangbin 74cb49661a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-20 15:29:12 +08:00
James Chen 7c56f45f28 Merge pull request #5881 from CocosRobot/update_cocosfiles_1395300160
[AUTO][ci skip]: updating cocos2dx_files.json
2014-03-20 15:28:11 +08:00
James Chen d3eecf367a Merge pull request #5883 from CocosRobot/update_lua_bindings_1395300230
[AUTO]: updating luabinding automatically
2014-03-20 15:27:45 +08:00
CocosRobot 0f22720da5 [AUTO]: updating luabinding automatically 2014-03-20 07:25:03 +00:00