Merge branch 'master' of cocos2d-js-test into Iss2294_MigrateActionClasses

Conflicts:
	games/MoonWarriors/src/SparkEffect.js
	tests/SpriteTest/SpriteTest.js

Author: dingpinglv

.gitignore

@@ -1,3 +1,2 @@
 .DS_Store
 .idea/
-Published*/

games/CocosDragonJS/CocosDragonJS.ccbproj

@@ -24,6 +24,8 @@
 	<true/>
 	<key>javascriptMainCCB</key>
 	<string>MainMenuScene</string>
+	<key>needRepublish</key>
+	<false/>
 	<key>onlyPublishCCBs</key>
 	<false/>
 	<key>publishDirectory</key>
@@ -55,7 +57,7 @@
 	<key>publishResolution_large</key>
 	<true/>
 	<key>publishResolution_medium</key>
-	<false/>
+	<true/>
 	<key>publishResolution_small</key>
 	<true/>
 	<key>publishResolution_xlarge</key>
@@ -85,5 +87,9 @@
 			<string>Source/sounds</string>
 		</dict>
 	</array>
+	<key>versionStr</key>
+	<string>Version: 3.0-alpha5
+GitHub: 76499877e8
+</string>
 </dict>
 </plist>

games/CocosDragonJS/Published files Android/Bomb.ccbi

@@ -0,0 +1,48 @@
+/* http://www.cocosbuilder.com
+ * http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2012 Zynga, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+//
+// Controller for the Bomb Object
+// When the Dragon (hero) touches this object, the Dragon moves downwards.
+//
+var Bomb = function () {
+    this.radius = 15;
+};
+
+Bomb.prototype.onUpdate = function () {
+};
+
+Bomb.prototype.handleCollisionWith = function (gameObjectController) {
+    if (gameObjectController.controllerName == "Dragon") {
+        // Collided with the dragon, remove object and add an exposion instead
+        this.isScheduledForRemove = true;
+
+        cc.AudioEngine.getInstance().playEffect("Explo.mp3");
+
+        var explosion = cc.BuilderReader.load("Explosion.ccbi");
+        explosion.setPosition(this.rootNode.getPosition());
+
+        this.rootNode.getParent().addChild(explosion);
+    }
+};

games/CocosDragonJS/Published files Android/Bomb.js

@@ -0,0 +1,46 @@
+/* http://www.cocosbuilder.com
+ * http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2012 Zynga, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+//
+// Controller for the Coin Object
+// When the Dragon (hero) touches this object, the Dragon moves upwards
+//
+
+var Coin = function()
+{
+    this.radius = 15;
+};
+
+Coin.prototype.onUpdate = function()
+{};
+
+Coin.prototype.handleCollisionWith = function(gameObjectController)
+{
+    if (gameObjectController.controllerName == "Dragon")
+    {
+        cc.AudioEngine.getInstance().playEffect("Coin.mp3");
+        this.isScheduledForRemove = true;
+    }
+};

games/CocosDragonJS/Published files Android/Coin.ccbi

@@ -0,0 +1,79 @@
+/* http://www.cocosbuilder.com
+ * http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2012 Zynga, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+//
+// controller for the Dragon Object (the Hero)
+//
+
+// Constants
+var CD_START_SPEED = 8;
+var CD_COIN_SPEED = 8;
+var CD_START_TARGET = 160;
+
+var CD_TARGET_FILTER_FACTOR = 0.05;
+var CD_SLOW_DOWN_FACTOR = 0.995;
+var CD_GRAVITY_SPEED = 0.1;
+var CD_GAMEOVER_SPEED = -10;
+var CD_DELTA_TO_ROTATION_FACTOR = 5;
+
+var Dragon = function () {
+    this.xTarget = CD_START_TARGET * gScaleFactor;
+    this.ySpeed = CD_START_SPEED;
+    this.radius = 25;
+};
+
+Dragon.prototype.onUpdate = function () {
+    // Calculate the new position
+    var oldPosition = cc.pMult(this.rootNode.getPosition(), 1.0 / gScaleFactor);
+
+    var xNew = (this.xTarget / gScaleFactor) * CD_TARGET_FILTER_FACTOR + oldPosition.x * (1 - CD_TARGET_FILTER_FACTOR);
+    var yNew = oldPosition.y + this.ySpeed;
+    this.rootNode.setPosition(xNew * gScaleFactor, yNew * gScaleFactor);
+
+    // Update the vertical speed
+    this.ySpeed = (this.ySpeed - CD_GRAVITY_SPEED) * CD_SLOW_DOWN_FACTOR;
+
+    // Tilt the dragon
+    var xDelta = xNew - oldPosition.x;
+    this.rootNode.setRotation(xDelta * CD_DELTA_TO_ROTATION_FACTOR);
+
+    // Check for game over
+    if (this.ySpeed < CD_GAMEOVER_SPEED) {
+        sharedGameScene.handleGameOver();
+    }
+};
+
+Dragon.prototype.handleCollisionWith = function (gameObjectController) {
+    if (gameObjectController.controllerName == "Coin") {
+        // Took a coin
+        this.ySpeed = CD_COIN_SPEED;
+        sharedGameScene.setScore(sharedGameScene.score + 1);
+    }
+    else if (gameObjectController.controllerName == "Bomb") {
+        // Hit a bomb
+        if (this.ySpeed > 0) this.ySpeed = 0;
+
+        this.rootNode.animationManager.runAnimationsForSequenceNamed("Hit");
+    }
+};

games/CocosDragonJS/Published files Android/Coin.js

@@ -0,0 +1,45 @@
+/* http://www.cocosbuilder.com
+ * http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2012 Zynga, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+//
+// Controller for the EndCoin object
+// When the Dragon (hero) touches this object, the game is won.
+//
+var EndCoin = function()
+{
+    this.radius = 15;
+};
+
+EndCoin.prototype.onUpdate = function()
+{};
+
+EndCoin.prototype.handleCollisionWith = function(gameObjectController)
+{
+    if (gameObjectController.controllerName == "Dragon")
+    {
+        cc.AudioEngine.getInstance().playEffect("Coin.mp3");
+        this.isScheduledForRemove = true;
+        sharedGameScene.handleLevelComplete();
+    }
+};

games/CocosDragonJS/Published files Android/Coin.mp3

@@ -0,0 +1,46 @@
+/* http://www.cocosbuilder.com
+ * http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2012 Zynga, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+//
+// Controller for the Bomb Object
+// This object is run when the Dragon (hero) touches a bomb
+//
+
+var Explosion = function () {
+    this.radius = 15;
+};
+
+Explosion.prototype.onDidLoadFromCCB = function () {
+    this.rootNode.animationManager.setCompletedAnimationCallback(this, this.onAnimationComplete);
+};
+
+Explosion.prototype.onUpdate = function () {
+};
+
+Explosion.prototype.handleCollisionWith = function (gameObjectController) {
+};
+
+Explosion.prototype.onAnimationComplete = function (animationManager) {
+    this.isScheduledForRemove = true;
+};

games/CocosDragonJS/Published files Android/Dragon.ccbi

@@ -0,0 +1,71 @@
+/* http://www.cocosbuilder.com
+ * http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2012 Zynga, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+//
+// Controller for the GameScene Object
+// This object loads the main Scene
+//
+
+var GameScene = function(){};
+var sharedGameScene;
+var gLevelOffsetX = 0;
+
+GameScene.prototype.onDidLoadFromCCB = function()
+{
+    sharedGameScene = this;
+
+    this.score = 0;
+
+    var level = cc.BuilderReader.load("Level.ccbi");
+
+    // Center the level on Screen
+    gLevelOffsetX = (gWinSize.width-CD_LEVEL_WIDTH*gScaleFactor)/2;
+
+    level.setPosition(cc.p(gLevelOffsetX,0));
+
+    this.rootNode.addChild(level);
+};
+
+GameScene.prototype.setScore = function(score)
+{
+    this.score = score;
+    this.scoreLabel.setString(""+score);
+};
+
+GameScene.prototype.getScore = function()
+{
+    return this.score;
+};
+
+GameScene.prototype.handleGameOver = function()
+{
+    var scene = cc.BuilderReader.loadAsScene("MainMenuScene.ccbi");
+    cc.Director.getInstance().replaceScene(scene);
+};
+
+GameScene.prototype.handleLevelComplete = function()
+{
+    var scene = cc.BuilderReader.loadAsScene("MainMenuScene.ccbi");
+    cc.Director.getInstance().replaceScene(scene);
+};