Browse code Merge branch 'dev-v4.0.0' of https://github.com/pixijs/pixi.js into dev-v4.0.0 Conflicts: bin/pixi.js bin/pixi.js.map bin/pixi.min.js bin/pixi.min.js.map src/core/graphics/Graphics.js src/core/renderers/webgl/managers/MaskManager.js src/mesh/index.js src/particles/webgl/ParticleRenderer.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 feature-nine-slice-canvas-tint fix-svg master multiple-pointer-down-events upgrade 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 floattex

commit ef6df3d5f63d8b6d85efdc2067a336407f804344 2 parents 3125a20 + adc7eaf clément chenebault authored on 24 Feb 2016

Showing 27 changed files

• bin/pixi.js
• bin/pixi.js.map
• bin/pixi.min.js
• bin/pixi.min.js.map
• package.json
• src/core/graphics/Graphics.js
• src/core/graphics/webgl/shaders/PrimitiveShader.js
• src/core/index.js
• src/core/math/shapes/Rectangle.js
• src/core/particles/ParticleContainer.js
• src/core/particles/webgl/ParticleBuffer.js
• src/core/particles/webgl/ParticleRenderer.js
• src/core/particles/webgl/ParticleShader.js
• src/core/renderers/webgl/WebGLRenderer.js
• src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js
• src/core/renderers/webgl/managers/MaskManager.js
• src/index.js
• src/mesh/Mesh.js
• src/mesh/index.js
• src/mesh/webgl/MeshRenderer.js
• src/mesh/webgl/MeshShader.js
• src/particles/ParticleContainer.js
• src/particles/index.js
• src/particles/webgl/ParticleBuffer.js
• src/particles/webgl/ParticleRenderer.js
• src/particles/webgl/ParticleShader.js
• src/polyfill/index.js

Ignore Space Show notes View bin/pixi.js

Ignore Space Show notes View bin/pixi.js.map

Ignore Space Show notes View bin/pixi.min.js

Ignore Space Show notes View bin/pixi.min.js.map
Not supported

Ignore Space Show notes View package.json

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

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

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

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

Show notes View src/core/particles/ParticleContainer.js 100644 → 0

Show notes View src/core/particles/webgl/ParticleBuffer.js 100644 → 0

Show notes View src/core/particles/webgl/ParticleRenderer.js 100644 → 0

Show notes View src/core/particles/webgl/ParticleShader.js 100644 → 0

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

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

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

Ignore Space Show notes View src/index.js

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

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

Show notes View src/mesh/webgl/MeshRenderer.js 100644 → 0

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

Ignore Space Show notes View src/particles/ParticleContainer.js 0 → 100644

Ignore Space Show notes View src/particles/index.js 0 → 100644

Ignore Space Show notes View src/particles/webgl/ParticleBuffer.js 0 → 100644

Ignore Space Show notes View src/particles/webgl/ParticleRenderer.js 0 → 100644

Ignore Space Show notes View src/particles/webgl/ParticleShader.js 0 → 100644

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

Show line notes below