Browse code Merge branch 'pixidev/dev' Conflicts: src/pixi/extras/TilingSprite.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 floattex 2.0.0 1.5.3

commit dd9fd183fb121623ac54f9ae5e76239415b4c06a 2 parents 661c5bc + 9c91116 photonstorm authored on 16 Feb 2014

Showing 42 changed files

• bin/pixi.dev.js
• bin/pixi.js
• docs/classes/AjaxRequest.html
• docs/classes/CanvasMaskManager.html
• docs/classes/CanvasTinter.html
• docs/classes/FilterTexture.html
• docs/classes/InteractionData.html
• docs/classes/InteractionManager.html
• docs/classes/NormalMapFilter.html
• docs/classes/PixiFastShader.html
• docs/classes/PixiShader.html
• docs/classes/PolyK.html
• docs/classes/PrimitiveShader.html
• docs/classes/Rope.html
• docs/classes/SpriteBatch.html
• docs/classes/Strip.html
• docs/classes/WebGLFilterManager.html
• docs/classes/WebGLGraphics.html
• docs/classes/WebGLMaskManager.html
• docs/classes/WebGLShaderManager.html
• docs/classes/WebGLSpriteBatch.html
• docs/classes/autoDetectRenderer.html
• docs/files/src_pixi_InteractionData.js.html
• docs/files/src_pixi_core_Matrix.js.html
• docs/files/src_pixi_display_SpriteBatch.js.html
• docs/files/src_pixi_filters_NormalMapFilter.js.html
• docs/files/src_pixi_renderers_webgl_utils_FilterTexture.js.html
• examples/example 19 - Normal/1223-normal.jpg
• examples/example 19 - Normal/BGrotate.jpg
• examples/example 19 - Normal/NormalMapFilter.js
• examples/example 19 - Normal/NormalMapFilter__.js
• examples/example 19 - Normal/click.png
• examples/example 19 - Normal/heineken-names-small-30262.jpg
• examples/example 19 - Normal/index.html
• examples/example 19 - Normal/logo_small.png
• examples/example 19 - Normal/tinyMaggot.png
• src/pixi/InteractionManager.js
• src/pixi/display/SpriteBatch copy.js
• src/pixi/display/SpriteBatch.js
• src/pixi/extras/TilingSprite.js
• src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
• src/pixi/textures/Texture.js

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

Ignore Space Show notes View bin/pixi.js

Ignore Space Show notes View docs/classes/AjaxRequest.html 0 → 100644

Ignore Space Show notes View docs/classes/CanvasMaskManager.html 0 → 100644

Ignore Space Show notes View docs/classes/CanvasTinter.html 0 → 100644

Ignore Space Show notes View docs/classes/FilterTexture.html 0 → 100644

Ignore Space Show notes View docs/classes/InteractionData.html 0 → 100644

Ignore Space Show notes View docs/classes/InteractionManager.html 0 → 100644

Ignore Space Show notes View docs/classes/NormalMapFilter.html 0 → 100644

Ignore Space Show notes View docs/classes/PixiFastShader.html 0 → 100644

Ignore Space Show notes View docs/classes/PixiShader.html 0 → 100644

Ignore Space Show notes View docs/classes/PolyK.html 0 → 100644

Ignore Space Show notes View docs/classes/PrimitiveShader.html 0 → 100644

Ignore Space Show notes View docs/classes/Rope.html 0 → 100644

Ignore Space Show notes View docs/classes/SpriteBatch.html 0 → 100644

Ignore Space Show notes View docs/classes/Strip.html 0 → 100644

Ignore Space Show notes View docs/classes/WebGLFilterManager.html 0 → 100644

Ignore Space Show notes View docs/classes/WebGLGraphics.html 0 → 100644

Ignore Space Show notes View docs/classes/WebGLMaskManager.html 0 → 100644

Ignore Space Show notes View docs/classes/WebGLShaderManager.html 0 → 100644

Ignore Space Show notes View docs/classes/WebGLSpriteBatch.html 0 → 100644

Ignore Space Show notes View docs/classes/autoDetectRenderer.html 0 → 100644

Ignore Space Show notes View docs/files/src_pixi_InteractionData.js.html 0 → 100644

Ignore Space Show notes View docs/files/src_pixi_core_Matrix.js.html 0 → 100644

Ignore Space Show notes View docs/files/src_pixi_display_SpriteBatch.js.html 0 → 100644

Ignore Space Show notes View docs/files/src_pixi_filters_NormalMapFilter.js.html 0 → 100644

Ignore Space Show notes View docs/files/src_pixi_renderers_webgl_utils_FilterTexture.js.html 0 → 100644

Ignore Space Show notes View examples/example 19 - Normal/1223-normal.jpg 0 → 100644

Ignore Space Show notes View examples/example 19 - Normal/BGrotate.jpg 0 → 100644

Ignore Space Show notes View examples/example 19 - Normal/NormalMapFilter.js 0 → 100644

Ignore Space Show notes View examples/example 19 - Normal/NormalMapFilter__.js 0 → 100644

Ignore Space Show notes View examples/example 19 - Normal/click.png 0 → 100644

Ignore Space Show notes View examples/example 19 - Normal/heineken-names-small-30262.jpg 0 → 100644

Ignore Space Show notes View examples/example 19 - Normal/index.html 0 → 100644

Ignore Space Show notes View examples/example 19 - Normal/logo_small.png 0 → 100644

Ignore Space Show notes View examples/example 19 - Normal/tinyMaggot.png 0 → 100644

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

Show notes View src/pixi/display/SpriteBatch copy.js 100644 → 0

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

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

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

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

Show line notes below