Browse code Merge branch 'dev' Conflicts: bin/pixi.dev.js bin/pixi.dev.js.map bin/pixi.js examples/example 19 - CacheAsBitmap/index.html src/pixi/display/DisplayObject.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 floattex 2.0.0 1.5.3

commit d759c2c205fa4687d15e980ddf8f4f58c963be5a 2 parents d90b757 + 73fb15c mathew groves authored on 24 Apr 2014

Showing 21 changed files

• bin/pixi.dev.js
• bin/pixi.js
• bower.json
• package.json
• src/pixi/InteractionData.js
• src/pixi/InteractionManager.js
• src/pixi/Pixi.js
• src/pixi/core/Circle.js
• src/pixi/display/DisplayObject.js
• src/pixi/display/MovieClip.js
• src/pixi/extras/SPINE-LICENSE
• src/pixi/extras/Strip.js
• src/pixi/loaders/JsonLoader.js
• src/pixi/primitives/Graphics.js
• src/pixi/renderers/webgl/utils/FilterTexture.js
• src/pixi/renderers/webgl/utils/WebGLFilterManager.js
• src/pixi/renderers/webgl/utils/WebGLMaskManager.js
• src/pixi/text/Text.js
• src/pixi/textures/BaseTexture.js
• src/pixi/textures/RenderTexture.js
• src/pixi/utils/Detector.js

Ignore Space Show notes View bin/pixi.dev.js

Ignore Space Show notes View bin/pixi.js

Ignore Space Show notes View bower.json

Ignore Space Show notes View package.json

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

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

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

Ignore Space Show notes View src/pixi/core/Circle.js

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

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

Ignore Space Show notes View src/pixi/extras/SPINE-LICENSE 0 → 100755

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

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

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

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

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

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

Show line notes below