Fork: 0
mark / pixi.js
Browse code
Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev
Conflicts:
	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 v1.4.1 v1.4.0 v1.3.0 floattex 2.0.0 1.5.3 1.4.2
commit 110c1234ab6077fd06704fcf954fc6035b116259
2 parents e46b57b + 40504f5
@Mat Groves Mat Groves authored on 23 Jun 2013
Patch
Unified Split
Showing 8 changed files
View
README.md
View
examples/example 13 - Custom Renderer/index.html 100644 → 0
View
examples/example 13 - Custom Renderer/pixi.js 100644 → 0
View
src/pixi/loaders/SpriteSheetLoader.js
View
src/pixi/renderers/webgl/WebGLRenderGroup.js
View
src/pixi/renderers/webgl/WebGLRenderer.js
View
src/pixi/textures/BaseTexture.js
View
src/pixi/textures/RenderTexture.js