Merge branch 'dev' into dev-geometry-update

Fork: 0

mark / pixi.js

Browse code Merge branch 'dev' into dev-geometry-update # Conflicts: # src/mesh/Mesh.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 83cbf967b83fcf46e8f4c3e4c9e4fe58f8abfe31 2 parents 9171235 + 3198506 Mat Groves authored on 11 Jan 2017

Browse code

# Conflicts:
#	src/mesh/Mesh.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 83cbf967b83fcf46e8f4c3e4c9e4fe58f8abfe31

2 parents 9171235 + 3198506

Mat Groves authored on 11 Jan 2017

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View README.md

Ignore Space Show notes View src/mesh/Rope.js

Show line notes below