Merge branch 'dev-v5' into dev-geometry-texture-refactor

Fork: 0

mark / pixi.js

Browse code Merge branch 'dev-v5' into dev-geometry-texture-refactor # Conflicts: # src/core/renderers/webgl/systems/MaskSystem.js # src/core/renderers/webgl/systems/RenderTextureSystem.js # src/core/renderers/webgl/systems/StencilSystem.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 0a780b61b05d4e2cd9c34af62978301ab98960e3 2 parents 4e8f557 + e75b603 Mat Groves authored on 3 Apr 2017

Browse code

# Conflicts:
#	src/core/renderers/webgl/systems/MaskSystem.js
#	src/core/renderers/webgl/systems/RenderTextureSystem.js
#	src/core/renderers/webgl/systems/StencilSystem.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 0a780b61b05d4e2cd9c34af62978301ab98960e3

2 parents 4e8f557 + e75b603

Mat Groves authored on 3 Apr 2017

Patch

Unified Split

Showing 20 changed files

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

Ignore Space Show notes View src/core/geometry/Buffer.js

Ignore Space Show notes View src/core/geometry/Geometry.js

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

Ignore Space Show notes View src/core/graphics/webgl/GraphicsRenderer.js

Ignore Space Show notes View src/core/graphics/webgl/WebGLGraphicsData.js

Ignore Space Show notes View src/core/graphics/webgl/shaders/PrimitiveShader.js

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

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

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

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

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

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

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

Show notes View src/core/renderers/webgl/utils/mapWebGLDrawModesToPixi.js 100644 → 0

Show notes View src/core/renderers/webgl/utils/validateContext.js 100644 → 0

Ignore Space Show notes View src/core/shader/Program.js

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

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

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

Show line notes below