Merge branch 'dev-legacy-option' into dev-geometry-update

Fork: 0

mark / pixi.js

Browse code Merge branch 'dev-legacy-option' into dev-geometry-update # Conflicts: # src/core/renderers/webgl/managers/FilterManager.js # src/extras/cacheAsBitmap.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 fix-svg master multiple-pointer-down-events upgrade 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 floattex
commit b32dd2ad09296a80485d46d3da28ef79693adf4b 2 parents 5ea2fdf + dd82bca Mat Groves authored on 30 Jan 2017

Browse code

# Conflicts:
#	src/core/renderers/webgl/managers/FilterManager.js
#	src/extras/cacheAsBitmap.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 fix-svg master multiple-pointer-down-events upgrade 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 floattex

commit b32dd2ad09296a80485d46d3da28ef79693adf4b

2 parents 5ea2fdf + dd82bca

Mat Groves authored on 30 Jan 2017

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View src/core/Application.js

Ignore Space Show notes View src/core/renderers/webgl/WebGLRenderer.js

Ignore Space Show notes View src/core/sprites/webgl/SpriteRenderer.js

Ignore Space Show notes View test/core/WebGLRenderer.js 0 → 100644

Show line notes below