Commit Graph

15160 Commits

Author SHA1 Message Date
chuanweizhang 5ffc3d9726 modify create_project.py suffix 2014-01-04 14:04:39 +08:00
James Chen 9bb558ad46 Removes wrong resource in TestJavascript project. 2014-01-04 13:54:25 +08:00
chuanweizhang accdf5635f modify print message 2014-01-04 13:54:17 +08:00
James Chen e860d659a4 Update AUTHORS [ci skip] 2014-01-04 13:45:55 +08:00
James Chen 43cdf1713b Merge pull request #4864 from daltomi/test
fix bad name variable CCDirector
2014-01-03 21:44:42 -08:00
chuanweizhang 51a6e4fc35 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-04 13:25:34 +08:00
Daniel T. Borelli d10992951b fix bad name variable 2014-01-04 02:22:09 -03:00
James Chen 98346474b8 Merge pull request #4863 from Dhilan007/develop_crash
fix compiling error and miss file on vs.
2014-01-03 20:41:19 -08:00
Dhilan007 35246b0810 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +08:00
James Chen 90a295399d Merge pull request #4862 from CocosRobot/updategeneratedsubmodule_1388809336
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 20:22:42 -08:00
CocosRobot e42f721c6b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 04:22:17 +00:00
James Chen 44105c5d01 Merge pull request #4861 from dumganhar/develop
Fixing CocoStudio bindings error.
2014-01-03 20:12:05 -08:00
James Chen 322cf0d233 Fixing CocoStudio bindings error. 2014-01-04 12:11:10 +08:00
James Chen 83028deca6 Update CHANGELOG [ci skip] 2014-01-04 12:02:11 +08:00
James Chen e65c6b8e53 Merge pull request #4841 from dumganhar/template-container-unit-test
Template container unit test
2014-01-03 20:01:25 -08:00
James Chen 38d109f698 Merge pull request #4860 from CocosRobot/updategeneratedsubmodule_1388807921
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 20:01:17 -08:00
CocosRobot d29cdb5b52 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 03:58:44 +00:00
James Chen 233e0ab457 Update CHANGELOG [ci skip] 2014-01-04 11:50:35 +08:00
James Chen 55e45d44c4 Merge pull request #4810 from chengstory/#3480
Update SceneReaderTest Samples
2014-01-03 19:49:28 -08:00
James Chen 29e2bb89b1 issue #3577: Captures ‘this’ to make old gcc on linux happy. 2014-01-04 11:44:29 +08:00
James Chen cf8fa8e5fa issue #3577: Adds ValueTest. 2014-01-04 11:41:06 +08:00
James Chen 9342ae105a issue #3577: const_iterator —> iterator for Vector::erase(first, last). Makes android build happy. 2014-01-04 11:41:06 +08:00
James Chen 5072e63f89 issue #3577: Updates project file for mac and ios. 2014-01-04 11:41:06 +08:00
James Chen a48f561ac5 issue #3577: Adds UnitTest to controller.cpp. 2014-01-04 11:41:06 +08:00
James Chen 15029e0173 issue #3577: Includes `UnitTest.h` in tests.h. 2014-01-04 11:41:05 +08:00
James Chen 4980214d0f issue #3677: Updates Makefile. 2014-01-04 11:41:05 +08:00
James Chen 0915d4b00e issue #3577: Removes unused spaces. 2014-01-04 11:41:05 +08:00
James Chen ebf6d07720 issue #3577: iterator —> const_iterator since Map::getRandomObject is a const function. 2014-01-04 11:41:05 +08:00
James Chen f76a1f0527 issue #3577: Adds UnitTest.cpp/.h. 2014-01-04 11:41:05 +08:00
James Chen f55be38ad8 Merge pull request #4853 from Dhilan007/develop_crash
fix label not appear on the screen
2014-01-03 19:00:06 -08:00
James Chen 84e4bc6971 Merge pull request #4854 from CocosRobot/updategeneratedsubmodule_1388804338
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 18:59:31 -08:00
CocosRobot 0ed307a583 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 02:58:59 +00:00
Dhilan007 b14999a7a7 fix label not appear on the screen 2014-01-04 10:56:14 +08:00
James Chen 32546b58f9 Merge pull request #4840 from nutty898/develop_nutty_modify_framework_addNode
Develop nutty modify framework add node
2014-01-03 18:53:51 -08:00
James Chen f3eb21e748 Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash
closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
2014-01-03 18:51:16 -08:00
James Chen 61af958976 closed #3579: Bug fix in setTouchEnabledForLayer for jsbindings. 2014-01-04 10:32:04 +08:00
James Chen baeacaddfc closed #3579: Bug fix in setTouchEnabledForLayer for luabindings.
Also fixed lua module error.
2014-01-04 10:30:11 +08:00
James Chen 0082cf3e4d closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time. 2014-01-04 10:28:09 +08:00
Ricardo Quesada 76960ab83a Merge pull request #4851 from ricardoquesada/node_vertex_z_fix
Node vertex Z fix
2014-01-03 17:55:32 -08:00
Ricardo Quesada 5a0284c183 Node vertex Z fix
Node correctly  sets the Z vertex in getNodeToParentTransform(),
and not in transform().

This is the correct thing to do, and also fixes possible collisions
with the additionalTransform (eg: Camera)
2014-01-03 17:54:07 -08:00
James Chen c3c2b50c7c Merge pull request #4850 from CocosRobot/updategeneratedsubmodule_1388799616
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 17:41:53 -08:00
CocosRobot 54ee3392fc [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 01:40:17 +00:00
minggo 964d327db9 Merge pull request #4848 from dumganhar/more-warning-fixes
More warning fixes.
2014-01-03 17:31:02 -08:00
minggo 93f3545154 Merge pull request #4842 from Dhilan007/develop_crash
update js binding for studio change.
2014-01-03 17:29:14 -08:00
James Chen 46153d8c34 More warning fixes. 2014-01-04 09:17:37 +08:00
Ricardo Quesada 118fe45cce Merge pull request #4847 from ricardoquesada/menu_fix
Fixes NodeToWorld
2014-01-03 14:24:32 -08:00
Ricardo Quesada a7b33e3ec3 Fixes NodeToWorld
Multiplication was in the incorrect order
2014-01-03 14:21:33 -08:00
Dhilan007 e017609fc4 fix compiling error in jsb_cocos2dx_studio_manual.cpp on android. 2014-01-03 23:59:05 +08:00
Dhilan007 b6e676caa4 fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp. 2014-01-03 23:03:48 +08:00
Dhilan007 b4d392dc38 update js binding for studio change. 2014-01-03 21:33:48 +08:00