Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12397 from pandamicro/v3 

Update submodules
This commit is contained in:
pandamicro 2015-06-18 08:13:58 +08:00
parent 8c56859ca9 5b23e8b381
commit 5a34133155
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin

@ -1 +1 @@
Subproject commit fbd9d50b94b1d472141d307e69f0e2c5f6215ec8
Subproject commit 1fd5d8c9c117d57fbba60ab4b4880d726b3a8002

2
tests/cpp-tests/Resources/ccs-res

@ -1 +1 @@
Subproject commit f1beaa4774ee49b5bd3fc20730773cd818959e61
Subproject commit 65f45cef163bea7f25d20fe9ba77f6af871656c0

8
tests/js-tests/src/Physics3DTest/Physics3DTest.js
View File

@ -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());
}

7
tests/js-tests/src/tests_resources.js
View File

@ -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";
if (!cc.sys.isNative) {
var res = res || {};
res.CCControlColourPickerSpriteSheet_plist = "extensions/CCControlColourPickerSpriteSheet.plist";
res.CCControlColourPickerSpriteSheet_png = "extensions/CCControlColourPickerSpriteSheet.png";
}

2
tools/bindings-generator

@ -1 +1 @@
Subproject commit b384d93865d9a9499eed7f6f4b961a58c067fec0
Subproject commit 23e98f0b9942a2ef305f00c8e8771b1029fbbd00

2
tools/cocos2d-console

@ -1 +1 @@
Subproject commit caaaef354e1e91f312676ee3086aff3a485b2d9d
Subproject commit c6bc7c55837faa461ada8980690ac5c83a14026b

2
web

@ -1 +1 @@
Subproject commit 71c5db165e2fb84ac0203889b23286904296ef09
Subproject commit 6776b111ed5ec904a687ce965f9143cbf84bb380