Fork: 0
mark / pixi.js
Browse code
Merge remote-tracking branch 'upstream/dev' into fs-cleanup
Resolved conflicts

Conflicts:
	src/filters/blur/BlurXFilter.js
	src/filters/blur/BlurYFilter.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 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 floattex
commit a792cf0109a5f062b12f73c7111cdd8a50afedcb
2 parents 2163eda + cf448f5
@Wouter Commandeur Wouter Commandeur authored on 7 Mar 2015
Patch
Unified Split
Showing 12 changed files
View
src/core/const.js
View
src/core/renderers/webgl/filters/AbstractFilter.js
View
src/core/renderers/webgl/managers/FilterManager.js
View
src/core/sprites/Sprite.js
View
src/filters/blur/BlurFilter.js
View
src/filters/blur/BlurXFilter.js
View
src/filters/blur/BlurYFilter.js
View
src/filters/blur/blur.frag 0 → 100644
View
src/filters/blur/blurX.frag 100644 → 0
View
src/filters/blur/blurX.vert 0 → 100644
View
src/filters/blur/blurY.frag 100644 → 0
View
src/filters/blur/blurY.vert 0 → 100644