Merge branch 'dev-rewrite' of https://github.com/GoodBoyDigital/pixi.js into dev-rewrite

Fork: 0

mark / pixi.js

Browse code Merge branch 'dev-rewrite' of https://github.com/GoodBoyDigital/pixi.js into dev-rewrite Conflicts: src/core/display/DisplayObjectContainer.js src/core/renderers/webgl/utils/RenderTarget.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 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 floattex
commit 79dc6e07d48b9d64016f48c55d0f6d27c2e31eac 2 parents ac29612 + 843d539 mathew groves authored on 15 Jan 2015

Browse code

Conflicts:
	src/core/display/DisplayObjectContainer.js
	src/core/renderers/webgl/utils/RenderTarget.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 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 floattex

commit 79dc6e07d48b9d64016f48c55d0f6d27c2e31eac

2 parents ac29612 + 843d539

mathew groves authored on 15 Jan 2015

Patch

Unified Split

Showing 36 changed files

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

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

Ignore Space Show notes View src/core/graphics/GraphicsData.js 0 → 100644

Ignore Space Show notes View src/core/graphics/webgl/ComplexPrimitiveShader.js 0 → 100644

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

Ignore Space Show notes View src/core/graphics/webgl/PrimitiveShader.js 0 → 100644

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

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

Ignore Space Show notes View src/core/math/Matrix.js

Show notes View src/core/primitives/Graphics.js 100644 → 0

Show notes View src/core/primitives/GraphicsData.js 100644 → 0

Show notes View src/core/primitives/GraphicsRenderer.js 100644 → 0

Show notes View src/core/primitives/WebGLGraphicsData.js 100755 → 0

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

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

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

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

Show notes View src/core/renderers/webgl/shaders/ComplexPrimitiveShader.js 100644 → 0

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

Show notes View src/core/renderers/webgl/shaders/PrimitiveShader.js 100644 → 0

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

Show notes View src/core/renderers/webgl/shaders/SpriteShader.js 100644 → 0

Show notes View src/core/renderers/webgl/shaders/StripShader.js 100644 → 0

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

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

Ignore Space Show notes View src/core/sprites/Sprite.js

Ignore Space Show notes View src/core/sprites/SpriteBatch.js

Show notes View src/core/sprites/SpriteRenderer.js 100644 → 0

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

Ignore Space Show notes View src/core/sprites/webgl/SpriteShader.js 0 → 100644

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

Ignore Space Show notes View src/core/utils/pluginTarget.js 0 → 100644

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

Ignore Space Show notes View src/extras/StripShader.js 0 → 100644

Ignore Space Show notes View src/extras/TilingSprite.js

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

Show line notes below