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

Author: photonstorm

src/gameobjects/container/Container.js

@@ -36,6 +36,7 @@ var Container = new Class({
     Extends: GameObject,
 
     Mixins: [
+        Components.Alpha,
         Components.BlendMode,
         Components.Depth,
         Components.Transform,
@@ -128,6 +129,7 @@ var Container = new Class({
         this._displayList = scene.sys.displayList;
 
         this.setPosition(x, y);
+        this.clearAlpha();
 
         if (Array.isArray(children))
         {

src/gameobjects/container/ContainerCanvasRenderer.js

@@ -45,9 +45,15 @@ var ContainerCanvasRenderer = function (renderer, container, interpolationPercen
         transformMatrix.scale(container.scaleX, container.scaleY);
     }
 
+    var alpha = container._alpha;
+
     for (var index = 0; index < children.length; ++index)
     {
-        children[index].renderCanvas(renderer, children[index], interpolationPercentage, camera, transformMatrix);
+        var child = children[index];
+        var childAlpha = child._alpha;
+        child.setAlpha(childAlpha * alpha);
+        child.renderCanvas(renderer, child, interpolationPercentage, camera, transformMatrix);
+        child.setAlpha(childAlpha);
     }
 };
 

src/gameobjects/container/ContainerWebGLRenderer.js

@@ -45,9 +45,15 @@ var ContainerWebGLRenderer = function (renderer, container, interpolationPercent
         transformMatrix.scale(container.scaleX, container.scaleY);
     }
 
+    var alpha = container._alpha;
+
     for (var index = 0; index < children.length; ++index)
     {
-        children[index].renderWebGL(renderer, children[index], interpolationPercentage, camera, transformMatrix);
+        var child = children[index];
+        var childAlpha = child._alpha;
+        child.setAlpha(childAlpha * alpha);
+        child.renderWebGL(renderer, child, interpolationPercentage, camera, transformMatrix);
+        child.setAlpha(childAlpha);
     }
 };