Browse code Merge branch 'dev-filters' into dev Conflicts: src/pixi/textures/RenderTexture.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 floattex 2.0.0

commit 56fb9a1b06002bbbefef79f85fd47edcd6dd8b23 2 parents 223d2fb + 1c1e2bc mathew groves authored on 10 Oct 2014

Showing 39 changed files

• Gruntfile.js
• src/pixi/InteractionManager.js
• src/pixi/Pixi.js
• src/pixi/core/Circle.js
• src/pixi/core/Ellipse.js
• src/pixi/core/Matrix.js
• src/pixi/core/Point.js
• src/pixi/core/Polygon.js
• src/pixi/core/Rectangle.js
• src/pixi/display/DisplayObject.js
• src/pixi/display/DisplayObjectContainer.js
• src/pixi/display/Sprite.js
• src/pixi/display/SpriteBatch.js
• src/pixi/extras/Strip.js
• src/pixi/geom/Circle.js
• src/pixi/geom/Ellipse.js
• src/pixi/geom/Matrix.js
• src/pixi/geom/Point.js
• src/pixi/geom/Polygon.js
• src/pixi/geom/Rectangle.js
• src/pixi/primitives/Graphics.js
• src/pixi/renderers/canvas/CanvasGraphics.js
• src/pixi/renderers/canvas/CanvasRenderer.js
• src/pixi/renderers/canvas/utils/CanvasMaskManager.js
• src/pixi/renderers/webgl/WebGLRenderer.js
• src/pixi/renderers/webgl/utils/WebGLBlendModeManager.js
• src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.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/WebGLShaderManager.js
• src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
• src/pixi/renderers/webgl/utils/WebGLStencilManager.js
• src/pixi/text/Text.js
• src/pixi/textures/BaseTexture.js
• src/pixi/textures/RenderTexture.js
• src/pixi/textures/Texture.js
• test/unit/pixi/core/Matrix.js
• test/unit/pixi/textures/BaseTexture.js

Ignore Space Show notes View Gruntfile.js

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

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

Show notes View src/pixi/core/Circle.js 100644 → 0

Show notes View src/pixi/core/Ellipse.js 100644 → 0

Show notes View src/pixi/core/Matrix.js 100644 → 0

Show notes View src/pixi/core/Point.js 100644 → 0

Show notes View src/pixi/core/Polygon.js 100644 → 0

Show notes View src/pixi/core/Rectangle.js 100644 → 0

Ignore Space Show notes View src/pixi/display/DisplayObject.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/geom/Circle.js 0 → 100644

Ignore Space Show notes View src/pixi/geom/Ellipse.js 0 → 100644

Ignore Space Show notes View src/pixi/geom/Matrix.js 0 → 100644

Ignore Space Show notes View src/pixi/geom/Point.js 0 → 100644

Ignore Space Show notes View src/pixi/geom/Polygon.js 0 → 100644

Ignore Space Show notes View src/pixi/geom/Rectangle.js 0 → 100644

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

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

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

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

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

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

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

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/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

Ignore Space Show notes View src/pixi/text/Text.js

Ignore Space Show notes View src/pixi/textures/BaseTexture.js

Ignore Space Show notes View src/pixi/textures/RenderTexture.js

Ignore Space Show notes View src/pixi/textures/Texture.js

Ignore Space Show notes View test/unit/pixi/core/Matrix.js

Ignore Space Show notes View test/unit/pixi/textures/BaseTexture.js

Show line notes below