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/sprites/webgl/SpriteShader.js src/core/utils/pluginTarget.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 4af829419f7a8f440334e79939eed2dff5965f51 2 parents 32beaaa + 4e3c8b4 mathew groves authored on 23 Jan 2015

Browse code

Conflicts:
	src/core/sprites/webgl/SpriteShader.js
	src/core/utils/pluginTarget.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 4af829419f7a8f440334e79939eed2dff5965f51

2 parents 32beaaa + 4e3c8b4

mathew groves authored on 23 Jan 2015

Patch

Unified Split

Showing 13 changed files

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

Ignore Space Show notes View src/core/sprites/webgl/SpriteBatchRenderer.js

Ignore Space Show notes View src/core/sprites/webgl/SpriteBatchShader.js

Show notes View src/loaders/ImageLoader.js 100644 → 0

Show notes View src/loaders/JsonLoader.js 100644 → 0

Show notes View src/loaders/SpineLoader.js 100644 → 0

Show notes View src/loaders/SpriteSheetLoader.js 100644 → 0

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

Ignore Space Show notes View src/loaders/loader.js 0 → 100644

Ignore Space Show notes View src/loaders/spineAtlasParser.js 0 → 100644

Ignore Space Show notes View src/loaders/spritesheetParser.js 0 → 100644

Ignore Space Show notes View src/loaders/textureParser.js 0 → 100644

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

Show line notes below