From d51fd2397c6c4421f80eb314297b8b1971e132a9 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 16 Jun 2015 15:01:52 +0800 Subject: [PATCH 1/5] Fix js test ES6 usage issue --- tests/js-tests/src/Physics3DTest/Physics3DTest.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/js-tests/src/Physics3DTest/Physics3DTest.js b/tests/js-tests/src/Physics3DTest/Physics3DTest.js index 41184ae602..81e1544b83 100644 --- a/tests/js-tests/src/Physics3DTest/Physics3DTest.js +++ b/tests/js-tests/src/Physics3DTest/Physics3DTest.js @@ -433,21 +433,21 @@ var Physics3DKinematicDemo = Physics3DTestDemo.extend({ floor.setSyncFlag(cc.Physics3DComponent.PhysicsSyncFlag.NONE); //create Kinematics - for(let i = 0; i < 3; ++i){ + for(var i = 0; i < 3; ++i){ rbDes.mass = 0; rbDes.shape = cc.Physics3DShape.createBox(cc.math.vec3(2, 2, 2)); - let sprite = cc.PhysicsSprite3D.create("Sprite3DTest/box.c3t", rbDes); + var sprite = cc.PhysicsSprite3D.create("Sprite3DTest/box.c3t", rbDes); sprite.setTexture("Images/CyanSquare.png"); sprite.setCameraMask(cc.CameraFlag.USER1); - let rigidBody = sprite.getPhysicsObj(); + var rigidBody = sprite.getPhysicsObj(); rigidBody.setKinematic(true); this.addChild(sprite); sprite.setScale(2); sprite.setPosition3D(cc.math.vec3(-15, 0, 15-15*i)); - let moveby = cc.moveBy(2+i, cc.math.vec3(30, 0, 0)); + var moveby = cc.moveBy(2+i, cc.math.vec3(30, 0, 0)); sprite.runAction(cc.sequence(moveby, moveby.reverse()).repeatForever()); } From 4fa1cdc30255fae9cdf9ba78c962a56890902cfb Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 17 Jun 2015 15:43:35 +0800 Subject: [PATCH 2/5] Update submodules --- plugin | 2 +- tests/cpp-tests/Resources/ccs-res | 2 +- tools/bindings-generator | 2 +- tools/cocos2d-console | 2 +- web | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugin b/plugin index fbd9d50b94..d9f6440569 160000 --- a/plugin +++ b/plugin @@ -1 +1 @@ -Subproject commit fbd9d50b94b1d472141d307e69f0e2c5f6215ec8 +Subproject commit d9f6440569e072bae3f86ad679866309a39accae diff --git a/tests/cpp-tests/Resources/ccs-res b/tests/cpp-tests/Resources/ccs-res index f1beaa4774..65f45cef16 160000 --- a/tests/cpp-tests/Resources/ccs-res +++ b/tests/cpp-tests/Resources/ccs-res @@ -1 +1 @@ -Subproject commit f1beaa4774ee49b5bd3fc20730773cd818959e61 +Subproject commit 65f45cef163bea7f25d20fe9ba77f6af871656c0 diff --git a/tools/bindings-generator b/tools/bindings-generator index b384d93865..23e98f0b99 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit b384d93865d9a9499eed7f6f4b961a58c067fec0 +Subproject commit 23e98f0b9942a2ef305f00c8e8771b1029fbbd00 diff --git a/tools/cocos2d-console b/tools/cocos2d-console index caaaef354e..c6bc7c5583 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit caaaef354e1e91f312676ee3086aff3a485b2d9d +Subproject commit c6bc7c55837faa461ada8980690ac5c83a14026b diff --git a/web b/web index 71c5db165e..6776b111ed 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 71c5db165e2fb84ac0203889b23286904296ef09 +Subproject commit 6776b111ed5ec904a687ce965f9143cbf84bb380 From 153e9f729464b115e7e1e42c68adf831411b4f68 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 17 Jun 2015 17:57:09 +0800 Subject: [PATCH 3/5] Fix plugin ref --- plugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin b/plugin index d9f6440569..70a736b030 160000 --- a/plugin +++ b/plugin @@ -1 +1 @@ -Subproject commit d9f6440569e072bae3f86ad679866309a39accae +Subproject commit 70a736b030f5766a97740e7deea5558f056bdd36 From 6e7f1ce9dd302a2e0acb439a29e383d5b5c86b32 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 18 Jun 2015 00:16:52 +0800 Subject: [PATCH 4/5] Fix plugin compilation issue --- plugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin b/plugin index 70a736b030..1fd5d8c9c1 160000 --- a/plugin +++ b/plugin @@ -1 +1 @@ -Subproject commit 70a736b030f5766a97740e7deea5558f056bdd36 +Subproject commit 1fd5d8c9c117d57fbba60ab4b4880d726b3a8002 From 5b23e8b3812aec6ca07ee96e34770167e5c6e76a Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 18 Jun 2015 00:24:01 +0800 Subject: [PATCH 5/5] Fix resource issue --- tests/js-tests/src/tests_resources.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/js-tests/src/tests_resources.js b/tests/js-tests/src/tests_resources.js index 2cad6d76b4..3afaf7da35 100644 --- a/tests/js-tests/src/tests_resources.js +++ b/tests/js-tests/src/tests_resources.js @@ -1097,5 +1097,8 @@ var g_ccs2 = [ "ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png" ]; -res.CCControlColourPickerSpriteSheet_plist = "extensions/CCControlColourPickerSpriteSheet.plist"; -res.CCControlColourPickerSpriteSheet_png = "extensions/CCControlColourPickerSpriteSheet.png"; \ No newline at end of file +if (!cc.sys.isNative) { + var res = res || {}; + res.CCControlColourPickerSpriteSheet_plist = "extensions/CCControlColourPickerSpriteSheet.plist"; + res.CCControlColourPickerSpriteSheet_png = "extensions/CCControlColourPickerSpriteSheet.png"; +} \ No newline at end of file