Browse code Merge branch 'dev' Conflicts: bin/pixi.dev.js bin/pixi.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 v1.5.3 v1.5.2.1 v1.5.2 v1.5.1 v1.5.0 v1.4.3 v1.4.2 floattex 2.0.0 1.5.3 1.4.2

commit d69e780f9b2037e49a1deff9c717a0e2ecd461b6 2 parents 4d0eb36 + 68c476d Mat Groves authored on 9 Jan 2014

Showing 12 changed files

• Gruntfile.js
• src/pixi/display/DisplayObject.js
• src/pixi/display/Stage.js
• src/pixi/filters/AlphaMaskFilter.js
• src/pixi/loaders/SpineLoader.js
• src/pixi/loaders/SpriteSheetLoader.js
• src/pixi/primitives/Graphics.js
• src/pixi/renderers/canvas/CanvasRenderer.js
• src/pixi/renderers/webgl/WebGLRenderer.js
• src/pixi/renderers/webgl/utils/WebGLGraphics.js
• src/pixi/renderers/webgl/utils/WebGLMaskManager.js
• src/pixi/utils/Detector.js

Ignore Space Show notes View Gruntfile.js

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

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

Ignore Space Show notes View src/pixi/filters/AlphaMaskFilter.js

Ignore Space Show notes View src/pixi/loaders/SpineLoader.js

Ignore Space Show notes View src/pixi/loaders/SpriteSheetLoader.js

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

Ignore Space Show notes View src/pixi/renderers/canvas/CanvasRenderer.js

Ignore Space Show notes View src/pixi/renderers/webgl/WebGLRenderer.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/utils/Detector.js

Show line notes below