Merge branch 'dev' into next

Fork: 0

mark / pixi.js

Browse code Merge branch 'dev' into next # Conflicts: # package.json # scripts/release.js # src/accessibility/AccessibilityManager.js # src/core/renderers/webgl/WebGLRenderer.js # src/core/renderers/webgl/utils/Quad.js # src/core/sprites/webgl/SpriteRenderer.js # src/core/textures/BaseTexture.js # src/core/textures/Spritesheet.js # src/core/textures/Texture.js # src/interaction/InteractionManager.js # src/mesh/Mesh.js # src/mesh/Plane.js # src/mesh/Rope.js # src/mesh/webgl/MeshRenderer.js # test/core/BaseTexture.js # test/core/Spritesheet.js # test/core/Texture.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 021f9e062ffcb7c6e1f66ec4f39fb2f5267ea3f7 2 parents c0f2662 + 353707d Mat Groves authored on 12 Apr 2017

Browse code

# Conflicts:
#	package.json
#	scripts/release.js
#	src/accessibility/AccessibilityManager.js
#	src/core/renderers/webgl/WebGLRenderer.js
#	src/core/renderers/webgl/utils/Quad.js
#	src/core/sprites/webgl/SpriteRenderer.js
#	src/core/textures/BaseTexture.js
#	src/core/textures/Spritesheet.js
#	src/core/textures/Texture.js
#	src/interaction/InteractionManager.js
#	src/mesh/Mesh.js
#	src/mesh/Plane.js
#	src/mesh/Rope.js
#	src/mesh/webgl/MeshRenderer.js
#	test/core/BaseTexture.js
#	test/core/Spritesheet.js
#	test/core/Texture.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 021f9e062ffcb7c6e1f66ec4f39fb2f5267ea3f7

2 parents c0f2662 + 353707d

Mat Groves authored on 12 Apr 2017

Patch

Unified Split

Showing 27 changed files

Ignore Space Show notes View package.json

Ignore Space Show notes View scripts/release.js 0 → 100644

Ignore Space Show notes View src/accessibility/AccessibilityManager.js

Ignore Space Show notes View src/core/graphics/Graphics.js

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

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

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

Ignore Space Show notes View src/core/text/Text.js

Ignore Space Show notes View src/core/text/TextMetrics.js 0 → 100644

Ignore Space Show notes View src/core/text/TextStyle.js

Ignore Space Show notes View src/core/textures/BaseTexture.js

Ignore Space Show notes View src/core/textures/Spritesheet.js

Ignore Space Show notes View src/core/textures/Texture.js

Ignore Space Show notes View src/core/textures/VideoBaseTexture.js

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

Ignore Space Show notes View src/deprecation.js

Ignore Space Show notes View src/extras/cacheAsBitmap.js

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

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

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

Ignore Space Show notes View test/core/BaseTexture.js

Ignore Space Show notes View test/core/Bounds.js

Ignore Space Show notes View test/core/Spritesheet.js

Ignore Space Show notes View test/core/Text.js

Ignore Space Show notes View test/core/TextStyle.js

Ignore Space Show notes View test/core/Texture.js

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

Show line notes below