Browse code Merge branch 'Graphics-upgrade' into dev Conflicts: bin/pixi.dev.js bin/pixi.dev.js.map bin/pixi.js src/pixi/primitives/Graphics.js src/pixi/renderers/webgl/utils/WebGLGraphics.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 v2.x 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.9 v3.0.8 v3.0.7 v3.0.6 v3.0.5 v3.0.4 v3.0.3 v3.0.2 v3.0.11 v3.0.10 v3.0.1 v3.0.0-rc4 v3.0.0-rc3 v3.0.0-rc2 v3.0.0-rc1 v3.0.0 v2.2.9 v2.2.8 v2.2.7 v2.2.6 v2.2.5 v2.2.4 v2.2.3 v2.2.2 v2.2.1 v2.2.0 v2.1.1 v2.1.01 v2.1.0 v2.0.0 v1.6.1 v1.6.0 floattex 2.0.0

commit 9d52d47e188af5763dcd79af1551ace2a872372c 2 parents c9b7a62 + a9b0f99 mathew groves authored on 29 Jun 2014

Showing 33 changed files

• Gruntfile.js
• bin/pixi.dev.js
• bin/pixi.dev.js.map
• bin/pixi.js
• examples/example 14 - Masking/index.html
• examples/example 20 - Strip/snake.png
• examples/example 21 - Complex Graphics/index.html
• examples/example 21 - Complex Graphics/indexMask.html
• examples/example 22 - Complex Masking/eggHead.png
• examples/example 22 - Complex Masking/flowerTop.png
• examples/example 22 - Complex Masking/helmlok.png
• examples/example 22 - Complex Masking/index.html
• examples/example 22 - Complex Masking/skully.png
• src/pixi/Pixi.js
• src/pixi/display/DisplayObjectContainer.js
• src/pixi/display/Sprite.js
• src/pixi/display/SpriteBatch.js
• src/pixi/extras/Strip.js
• src/pixi/primitives/Graphics.js
• src/pixi/renderers/webgl/WebGLRenderer.js
• src/pixi/renderers/webgl/shaders/ComplexPrimitiveShader.js
• src/pixi/renderers/webgl/shaders/PixiFastShader.js
• src/pixi/renderers/webgl/shaders/PixiShader.js
• src/pixi/renderers/webgl/shaders/PrimitiveShader.js
• src/pixi/renderers/webgl/shaders/StripShader.js
• src/pixi/renderers/webgl/utils/WebGLComplexGraphics.js
• src/pixi/renderers/webgl/utils/WebGLFilterManager.js
• src/pixi/renderers/webgl/utils/WebGLGraphics.js
• src/pixi/renderers/webgl/utils/WebGLMaskManager.js
• src/pixi/renderers/webgl/utils/WebGLPrimitiveBatch.js
• src/pixi/renderers/webgl/utils/WebGLShaderManager.js
• src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
• src/pixi/renderers/webgl/utils/WebGLStencilManager.js

Ignore Space Show notes View Gruntfile.js

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

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

Ignore Space Show notes View bin/pixi.js

Ignore Space Show notes View examples/example 14 - Masking/index.html

Ignore Space Show notes View examples/example 20 - Strip/snake.png 0 → 100644

Ignore Space Show notes View examples/example 21 - Complex Graphics/index.html 0 → 100644

Ignore Space Show notes View examples/example 21 - Complex Graphics/indexMask.html 0 → 100644

Ignore Space Show notes View examples/example 22 - Complex Masking/eggHead.png 0 → 100644

Ignore Space Show notes View examples/example 22 - Complex Masking/flowerTop.png 0 → 100644

Ignore Space Show notes View examples/example 22 - Complex Masking/helmlok.png 0 → 100644

Ignore Space Show notes View examples/example 22 - Complex Masking/index.html 0 → 100644

Ignore Space Show notes View examples/example 22 - Complex Masking/skully.png 0 → 100644

Ignore Space Show notes View src/pixi/Pixi.js

Ignore Space Show notes View src/pixi/display/DisplayObjectContainer.js

Ignore Space Show notes View src/pixi/display/Sprite.js

Ignore Space Show notes View src/pixi/display/SpriteBatch.js

Ignore Space Show notes View src/pixi/extras/Strip.js

Ignore Space Show notes View src/pixi/primitives/Graphics.js

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

Ignore Space Show notes View src/pixi/renderers/webgl/shaders/ComplexPrimitiveShader.js 0 → 100644

Ignore Space Show notes View src/pixi/renderers/webgl/shaders/PixiFastShader.js

Ignore Space Show notes View src/pixi/renderers/webgl/shaders/PixiShader.js

Ignore Space Show notes View src/pixi/renderers/webgl/shaders/PrimitiveShader.js

Ignore Space Show notes View src/pixi/renderers/webgl/shaders/StripShader.js

Ignore Space Show notes View src/pixi/renderers/webgl/utils/WebGLComplexGraphics.js 0 → 100644

Ignore Space Show notes View src/pixi/renderers/webgl/utils/WebGLFilterManager.js

Ignore Space Show notes View src/pixi/renderers/webgl/utils/WebGLGraphics.js

Ignore Space Show notes View src/pixi/renderers/webgl/utils/WebGLMaskManager.js

Ignore Space Show notes View src/pixi/renderers/webgl/utils/WebGLPrimitiveBatch.js 0 → 100644

Ignore Space Show notes View src/pixi/renderers/webgl/utils/WebGLShaderManager.js

Ignore Space Show notes View src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js

Ignore Space Show notes View src/pixi/renderers/webgl/utils/WebGLStencilManager.js 0 → 100644

Show line notes below