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
1 parent 3bb5020 commit f8b7b0e46e1356d0e6cdf2f3a26742be8bddde2a Mat Groves authored on 7 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

1 parent 3bb5020 commit f8b7b0e46e1356d0e6cdf2f3a26742be8bddde2a

Mat Groves authored on 7 Jan 2017

Patch

Unified Split

Showing 36 changed files

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/core/math/ObservablePoint.js

Ignore Space Show notes View src/core/math/shapes/Rectangle.js

Ignore Space Show notes View src/core/renderers/SystemRenderer.js

Ignore Space Show notes View src/core/renderers/canvas/utils/CanvasRenderTarget.js

Ignore Space Show notes View src/core/sprites/Sprite.js

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

Ignore Space Show notes View src/core/text/Text.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/ticker/Ticker.js

Ignore Space Show notes View src/extract/canvas/CanvasExtract.js

Ignore Space Show notes View src/extract/webgl/WebGLExtract.js

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

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

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

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

Ignore Space Show notes View src/extras/webgl/TilingSpriteRenderer.js

Ignore Space Show notes View src/filters/blur/BlurFilter.js

Ignore Space Show notes View src/filters/blur/BlurXFilter.js

Ignore Space Show notes View src/filters/blur/BlurYFilter.js

Ignore Space Show notes View src/filters/colormatrix/ColorMatrixFilter.js

Ignore Space Show notes View src/filters/displacement/DisplacementFilter.js

Ignore Space Show notes View src/filters/noise/NoiseFilter.js

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

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

Ignore Space Show notes View src/mesh/webgl/MeshRenderer.js

Ignore Space Show notes View src/prepare/canvas/CanvasPrepare.js

Ignore Space Show notes View src/prepare/webgl/WebGLPrepare.js

Show line notes below