Merging previous changes back in again.

Author: photonstorm

README.md

@@ -56,10 +56,15 @@ Significant API changes:
 * Tilemap.createFromObjects can now turn a bunch of Tiled objects into Sprites in one single call, and copies across all properties as well.
 * Tween.onStartCallback and onCompleteCallback have been removed to avoid confusion. You should use the onStart, onLoop and onComplete events instead.
 * Button.forceOut default value has changed from true to false, so Buttons will revert to an Up state (if set) when pressed and released.
-* Body.drag has been removed. Please use the new Body.friction value instead (which is a number value, not a Point object)
 * The way the collision process callback works has changed significantly and now works as originally intended.
 * The World level quadtree is no longer created, they are now built and ripped down each time you collide a Group, this helps collision accuracy.
 * Bodies are no longer added to a world quadtree, so have had all of their quadtree properties removed such as skipQuadtree, quadTreeIndex, etc.
+* Body.drag has been removed. Please use the new Body.friction value instead (which is a number value, not a Point object)
+* Body.embedded and Body.wasTouching have been removed as they are no longer required.
+* Body.customSeparateX/Y have been removed as you should now use Body.customSeparateCallback.
+* Body.maxVelocity defaults have been removed from 10,000 to 2000.
+* Body.friction is new and has a default value of 0.1 - you may need to set this to zero depending on the type of game you're making.
+* Body.customSeparateCallback allows you to set your own callback when two Bodies need to separate rather than using the built-in method.
 
 
 New features:
@@ -87,12 +92,14 @@ New features:
 * Groups now have an 'alive' property, which can be useful when iterating through child groups with functions like forEachAlive.
 * Added a new Project Template "Full Screen Mobile" which you can find in the resources folder. Contains html / css / layout needed for a deployed Phaser game.
 * Body.speed - the current speed of the body.
+* Body.angle - the current angle the Body is facing based on its velocity. This is not the same as the Sprite angle that may own the body.
 * Body.friction - This now replaces Body.drag and provides for a much smoother friction experience.
 * Body.minBounceVelocity - If a Body has bounce set, this threshold controls if it should rebound or not. Use it to stop 'jittering' on bounds/tiles with super-low velocities.
 * QuadTree.populate - you can pass it a Group and it'll automatically insert all of the children ready for inspection.
 * Input.setMoveCallback allows you to set a callback that will be fired each time the activePointer receives a DOM move event.
 * Math.distancePow(x1,y1,x2,y2,power) returns the distance between two coordinates at the given power.
 * Physics.collideArray(obj, array) for when you want to collide an object against a number of sprites that aren't all in the same Group.
+* Physics.overlapArray(obj, array) for when you want to overlap test an object against a number of sprites that aren't all in the same Group.
 * Math.reverseAngle - reverses an angle (in radians).
 * Math.normalizeAngle - normalises an angle, now in radians only.
 * Math.normalizeLatitude - Normalizes a latitude to the [-90,90] range.

examples/tilemaps/sci fly.js

@@ -3,8 +3,8 @@ var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: p
 
 function preload() {
 
-    game.load.tilemap('level3', 'assets/maps/cybernoid.json', null, Phaser.Tilemap.TILED_JSON);
-    game.load.image('tiles', 'assets/maps/cybernoid.png', 16, 16);
+    game.load.tilemap('level3', 'assets/tilemaps/maps/cybernoid.json', null, Phaser.Tilemap.TILED_JSON);
+    game.load.image('tiles', 'assets/tilemaps/tiles/cybernoid.png', 16, 16);
     game.load.image('phaser', 'assets/sprites/phaser-ship.png');
     game.load.image('chunk', 'assets/sprites/chunk.png');
 
@@ -29,13 +29,12 @@ function create() {
     //  Basically this sets EVERY SINGLE tile to fully collide on all faces
     map.setCollisionByExclusion([7, 32, 35, 36, 47]);
 
-    // layer.debug = true;
+    layer.debug = true;
 
     layer.resizeWorld();
 
     sprite = game.add.sprite(450, 80, 'phaser');
     sprite.anchor.setTo(0.5, 0.5);
-    sprite.angle = 5;
 
     game.camera.follow(sprite);
     // game.camera.deadzone = new Phaser.Rectangle(160, 160, layer.renderWidth-320, layer.renderHeight-320);
@@ -47,7 +46,7 @@ function create() {
     emitter.makeParticles('chunk');
     emitter.minRotation = 0;
     emitter.maxRotation = 0;
-    emitter.gravity = 5;
+    emitter.gravity = 150;
     emitter.bounce.setTo(0.5, 0.5);
 
     game.input.onDown.add(particleBurst, this);

examples/wip/2ball.js

@@ -28,15 +28,15 @@ function create() {
 	var bg = game.add.sprite(0, 0, bmd);
 	bg.body.moves = false;
 
-	test7();
+	test4();
 
 }
 
 function test7() {
 
 	game.physics.gravity.y = 200;
 
-	sprite = game.add.sprite(300, 300, 'gameboy', 0);
+	sprite = game.add.sprite(0, 300, 'gameboy', 0);
 	sprite.name = 'red';
 	sprite.body.collideWorldBounds = true;
 	sprite.body.bounce.setTo(0.8, 0.8);
@@ -119,7 +119,7 @@ function stop5() {
 
 function test4() {
 
-	game.physics.gravity.y = 50;
+	game.physics.gravity.y = 150;
 
 	sprite = game.add.sprite(300, 0, 'gameboy', 0);
 	sprite.name = 'red';
@@ -242,15 +242,15 @@ function update() {
 
 	// game.physics.collide(group, group);
 
-	// if (sprite3)
-	// {
-	// 	game.physics.collideArray(sprite, [sprite2, sprite3]);
-	// 	game.physics.collide(sprite2, sprite3);
-	// }
-	// else
-	// {
-	// 	game.physics.collide(sprite, sprite2);
-	// }
+	if (sprite3)
+	{
+		game.physics.collideArray(sprite, [sprite2, sprite3]);
+		game.physics.collide(sprite2, sprite3);
+	}
+	else
+	{
+		game.physics.collide(sprite, sprite2);
+	}
 
 
 	if (sprite)

examples/wip/multiball.js

@@ -23,10 +23,11 @@ function create() {
 	bg.body.moves = false;
 
 	game.physics.gravity.y = 250;
+	// game.physics.gravity.x = 250;
 
 	sprites = game.add.group();
 
-	for (var i = 0; i < 40; i++)
+	for (var i = 0; i < 20; i++)
 	{
 		var s = sprites.create(game.rnd.integerInRange(100, 700), game.rnd.integerInRange(32, 200), 'ball');
 		s.body.velocity.x = game.rnd.integerInRange(-400, 400);

examples/wip/sci-fly2.js

@@ -3,8 +3,8 @@ var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: p
 
 function preload() {
 
-    game.load.tilemap('level3', 'assets/maps/cybernoid.json', null, Phaser.Tilemap.TILED_JSON);
-    game.load.image('tiles', 'assets/maps/cybernoid.png', 16, 16);
+    game.load.tilemap('level3', 'assets/tilemaps/maps/cybernoid.json', null, Phaser.Tilemap.TILED_JSON);
+    game.load.image('tiles', 'assets/tilemaps/tiles/cybernoid.png', 16, 16);
     game.load.image('phaser', 'assets/sprites/phaser-ship.png');
     game.load.image('chunk', 'assets/sprites/chunk.png');
 
@@ -29,7 +29,7 @@ function create() {
     //  Basically this sets EVERY SINGLE tile to fully collide on all faces
     map.setCollisionByExclusion([7, 32, 35, 36, 47]);
 
-    // layer.debug = true;
+    layer.debug = true;
 
     layer.resizeWorld();
 
@@ -47,7 +47,7 @@ function create() {
     emitter.makeParticles('chunk');
     emitter.minRotation = 0;
     emitter.maxRotation = 0;
-    emitter.gravity = 5;
+    emitter.gravity = 150;
     emitter.bounce.setTo(0.5, 0.5);
 
     game.input.onDown.add(particleBurst, this);