Merge branch 'master' of https://github.com/photonstorm/phaser

Author: photonstorm

src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextCanvasRenderer.js

@@ -90,6 +90,7 @@ var DynamicBitmapTextCanvasRenderer = function (renderer, src, interpolationPerc
     ctx.save();
     ctx.translate(src.x, src.y);
     ctx.rotate(src.rotation);
+    ctx.translate(-src.displayOriginX, -src.displayOriginY);
     ctx.scale(src.scaleX, src.scaleY);
 
     if (src.cropWidth > 0 && src.cropHeight > 0)

src/gameobjects/bitmaptext/static/BitmapTextCanvasRenderer.js

@@ -87,6 +87,7 @@ var BitmapTextCanvasRenderer = function (renderer, src, interpolationPercentage,
     ctx.save();
     ctx.translate((src.x - cameraScrollX) + src.frame.x, (src.y - cameraScrollY) + src.frame.y);
     ctx.rotate(src.rotation);
+    ctx.translate(-src.displayOriginX, -src.displayOriginY);
     ctx.scale(src.scaleX, src.scaleY);
 
     // ctx.fillStyle = 'rgba(255,0,255,0.5)';

src/renderer/webgl/pipelines/TextureTintPipeline.js

@@ -983,6 +983,9 @@ var TextureTintPipeline = new Class({
                 continue;
             }
 
+            x -= bitmapText.displayOriginX;
+            y -= bitmapText.displayOriginY;
+
             xw = x + glyphW * scale;
             yh = y + glyphH * scale;
             tx0 = x * mva + y * mvc + mve;
@@ -1260,6 +1263,8 @@ var TextureTintPipeline = new Class({
                 vTintBR = getTint(vTintBR, alpha);
             }
 
+            x -= bitmapText.displayOriginX;
+            y -= bitmapText.displayOriginY;
             x *= scale;
             y *= scale;
             x -= cameraScrollX;