mirror of
https://github.com/photonstorm/phaser
synced 2024-11-23 21:24:09 +00:00
A Camera will pause following a Game Object for the duration of the Camera Pan Effect, as the two will clash over the Camera scroll position
This commit is contained in:
parent
f9482ef580
commit
40b325accf
2 changed files with 2 additions and 1 deletions
|
@ -146,6 +146,7 @@ Notes:
|
||||||
* The `Key` method signature has changed. It now expects to receive a reference to the KeyboardPlugin instance that is creating the Key as the first argument. This is now stored in the new `Key.plugin` property, and cleared in `destroy`.
|
* The `Key` method signature has changed. It now expects to receive a reference to the KeyboardPlugin instance that is creating the Key as the first argument. This is now stored in the new `Key.plugin` property, and cleared in `destroy`.
|
||||||
* `KeyboardPlugin.removeKey` has a new optional argument `destroy` that will, if set, destroy the Key object being removed from the plugin.
|
* `KeyboardPlugin.removeKey` has a new optional argument `destroy` that will, if set, destroy the Key object being removed from the plugin.
|
||||||
* `InteractiveObject.customHitArea` is a new property that records if the hitArea for the Interactive Object was created based on texture size (false), or a custom shape (true)
|
* `InteractiveObject.customHitArea` is a new property that records if the hitArea for the Interactive Object was created based on texture size (false), or a custom shape (true)
|
||||||
|
* A Camera will pause following a Game Object for the duration of the Camera Pan Effect, as the two will clash over the Camera scroll position (thanks fruitbatinshades).
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
|
|
|
@ -712,7 +712,7 @@ var Camera = new Class({
|
||||||
CenterOn(deadzone, this.midPoint.x, this.midPoint.y);
|
CenterOn(deadzone, this.midPoint.x, this.midPoint.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (follow)
|
if (follow && !this.panEffect.isRunning)
|
||||||
{
|
{
|
||||||
var fx = (follow.x - this.followOffset.x);
|
var fx = (follow.x - this.followOffset.x);
|
||||||
var fy = (follow.y - this.followOffset.y);
|
var fy = (follow.y - this.followOffset.y);
|
||||||
|
|
Loading…
Reference in a new issue