Browse code Merge branch 'pr/406' into dev Conflicts: bin/pixi.dev.js bin/pixi.js src/pixi/renderers/webgl/PixiShader.js batch-dev bugfix/polygon-offset dev dev-blendmode-add-again dev-canvas-renderer-dirty-transform dev-graphics-fix-batches dev-line-join dev-offscreen-canvas dev-renderTexture-pool dev-replace-buble-with-babel englercj/update-s3 feature-nine-slice-canvas-tint fix-svg master multiple-pointer-down-events upgrade v2.x v3.x v4.x v5.0.4 v5.0.3 v5.0.2 v5.0.1 v5.0.0-rc.3 v5.0.0-rc.2 v5.0.0-rc v5.0.0-alpha.3 v5.0.0-alpha.2 v5.0.0-alpha v5.0.0 v4.8.8 v4.8.7 v4.8.6 v4.8.5 v4.8.4 v4.8.3 v4.8.2 v4.8.1 v4.8.0 v4.7.3 v4.7.2 v4.7.1 v4.7.0 v4.6.2 v4.6.1 v4.6.0 v4.5.6 v4.5.5 v4.5.4 v4.5.3 v4.5.2 v4.5.1 v4.5.0 v4.0.3 v4.0.2 v4.0.1 v4.0.0-rc4 v4.0.0-rc3 v4.0.0-rc2 v4.0.0-rc1 v4.0.0 v3.0.9 v3.0.8 v3.0.7 v3.0.6 v3.0.5 v3.0.4 v3.0.3 v3.0.2 v3.0.11 v3.0.10 v3.0.1 v3.0.0-rc4 v3.0.0-rc3 v3.0.0-rc2 v3.0.0-rc1 v3.0.0 v2.2.9 v2.2.8 v2.2.7 v2.2.6 v2.2.5 v2.2.4 v2.2.3 v2.2.2 v2.2.1 v2.2.0 v2.1.1 v2.1.01 v2.1.0 v2.0.0 v1.6.1 v1.6.0 v1.5.3 v1.5.2.1 v1.5.2 v1.5.1 v1.5.0 v1.4.3 v1.4.2 v1.4.1 v1.4.0 floattex 2.0.0 1.5.3 1.4.2

commit 400a7d8827eb7cc2a974b25238c1139823529721 2 parents b5a2216 + a4ea181 Mat Groves authored on 3 Dec 2013

Showing 19 changed files

• Gruntfile.js
• bin/pixi.dev.js.map
• examples/example 15 - Filters/indexAll.html
• src/pixi/display/DisplayObject.js
• src/pixi/filters/AbstractFilter.js
• src/pixi/filters/BlurXFilter.js
• src/pixi/filters/BlurYFilter.js
• src/pixi/filters/ColorStepFilter.js
• src/pixi/filters/CrossHatchFilter.js
• src/pixi/filters/DisplacementFilter.js
• src/pixi/filters/DotScreenFilter.js
• src/pixi/filters/GrayFilter.js
• src/pixi/filters/InvertFilter.js
• src/pixi/filters/PixelateFilter.js
• src/pixi/filters/RGBSplitFilter.js
• src/pixi/filters/SepiaFilter.js
• src/pixi/filters/SmartBlurFilter.js
• src/pixi/filters/TwistFilter.js
• src/pixi/renderers/webgl/PixiShader.js

Ignore Space Show notes View Gruntfile.js

Ignore Space Show notes View bin/pixi.dev.js.map

Ignore Space Show notes View examples/example 15 - Filters/indexAll.html

Ignore Space Show notes View src/pixi/display/DisplayObject.js

Ignore Space Show notes View src/pixi/filters/AbstractFilter.js

Ignore Space Show notes View src/pixi/filters/BlurXFilter.js

Ignore Space Show notes View src/pixi/filters/BlurYFilter.js

Ignore Space Show notes View src/pixi/filters/ColorStepFilter.js

Ignore Space Show notes View src/pixi/filters/CrossHatchFilter.js

Ignore Space Show notes View src/pixi/filters/DisplacementFilter.js

Ignore Space Show notes View src/pixi/filters/DotScreenFilter.js

Ignore Space Show notes View src/pixi/filters/GrayFilter.js

Ignore Space Show notes View src/pixi/filters/InvertFilter.js

Ignore Space Show notes View src/pixi/filters/PixelateFilter.js

Ignore Space Show notes View src/pixi/filters/RGBSplitFilter.js

Ignore Space Show notes View src/pixi/filters/SepiaFilter.js

Ignore Space Show notes View src/pixi/filters/SmartBlurFilter.js

Ignore Space Show notes View src/pixi/filters/TwistFilter.js

Ignore Space Show notes View src/pixi/renderers/webgl/PixiShader.js

Show line notes below