Merge remote-tracking branch 'upstream/dev' into dev-rotateTexture

Fork: 0

mark / pixi.js

Browse code Merge remote-tracking branch 'upstream/dev' into dev-rotateTexture Conflicts: bin/pixi.js bin/pixi.js.map bin/pixi.min.js bin/pixi.min.js.map 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.11 v3.0.10 floattex
commit 4ead34f89d667c2cd82be80493fc7121c78503e2 2 parents cba037e + 7397b3d Ivan Popelyshev authored on 22 Jan 2016

Browse code

Conflicts:
	bin/pixi.js
	bin/pixi.js.map
	bin/pixi.min.js
	bin/pixi.min.js.map

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.11 v3.0.10 floattex

commit 4ead34f89d667c2cd82be80493fc7121c78503e2

2 parents cba037e + 7397b3d

Ivan Popelyshev authored on 22 Jan 2016

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View package.json

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

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

Ignore Space Show notes View src/interaction/InteractionData.js

Ignore Space Show notes View src/interaction/InteractionManager.js

Ignore Space Show notes View src/loaders/bitmapFontParser.js

Ignore Space Show notes View src/loaders/spritesheetParser.js

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

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

Ignore Space Show notes View test/unit/interaction/InteractionData.test.js

Show line notes below