Browse code Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev Fixed Bug with text with being displayed wrong Conflicts: src/pixi/display/DisplayObjectContainer.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 caa3c00d0a01931646f18e9d2943ef1d5e677859 2 parents 9d32a54 + d540af6 Mat Groves authored on 24 Jul 2013

Showing 48 changed files

• bin/pixi.dev.js
• bin/pixi.js
• examples/example 1 - Basics/pixi.js
• examples/example 10 - Text/pixi.js
• examples/example 11 - RenderTexture/pixi.js
• examples/example 12 - Spine/pixi.js
• examples/example 13 - Graphics/pixi.js
• examples/example 14 - Masking/pixi.js
• examples/example 2 - SpriteSheet/pixi.js
• examples/example 3 - MovieClip/pixi.js
• examples/example 4 - Balls/pixi.js
• examples/example 5 - Morph/pixi.js
• examples/example 6 - Interactivity/pixi.js
• examples/example 7 - Transparent Background/pixi.js
• examples/example 8 - Dragging/pixi.js
• examples/example 9 - Tiling Texture/pixi.js
• src/pixi/InteractionManager.js
• src/pixi/core/Circle.js
• src/pixi/core/Ellipse.js
• src/pixi/core/Point.js
• src/pixi/core/Polygon.js
• src/pixi/core/Rectangle.js
• src/pixi/display/DisplayObject.js
• src/pixi/display/DisplayObjectContainer.js
• src/pixi/display/MovieClip.js
• src/pixi/display/Sprite.js
• src/pixi/display/Stage.js
• src/pixi/extras/CustomRenderable.js
• src/pixi/extras/Rope.js
• src/pixi/extras/Spine.js
• src/pixi/extras/Strip.js
• src/pixi/extras/TilingSprite.js
• src/pixi/loaders/AssetLoader.js
• src/pixi/loaders/BitmapFontLoader.js
• src/pixi/loaders/ImageLoader.js
• src/pixi/loaders/JsonLoader.js
• src/pixi/loaders/SpineLoader.js
• src/pixi/loaders/SpriteSheetLoader.js
• src/pixi/primitives/Graphics.js
• src/pixi/renderers/canvas/CanvasRenderer.js
• src/pixi/renderers/webgl/WebGLBatch.js
• src/pixi/renderers/webgl/WebGLRenderGroup.js
• src/pixi/renderers/webgl/WebGLRenderer.js
• src/pixi/text/BitmapText.js
• src/pixi/text/Text.js
• src/pixi/textures/BaseTexture.js
• src/pixi/textures/RenderTexture.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 examples/example 1 - Basics/pixi.js

Ignore Space Show notes View examples/example 10 - Text/pixi.js

Ignore Space Show notes View examples/example 11 - RenderTexture/pixi.js

Ignore Space Show notes View examples/example 12 - Spine/pixi.js

Ignore Space Show notes View examples/example 13 - Graphics/pixi.js

Ignore Space Show notes View examples/example 14 - Masking/pixi.js

Ignore Space Show notes View examples/example 2 - SpriteSheet/pixi.js

Ignore Space Show notes View examples/example 3 - MovieClip/pixi.js

Ignore Space Show notes View examples/example 4 - Balls/pixi.js

Ignore Space Show notes View examples/example 5 - Morph/pixi.js

Ignore Space Show notes View examples/example 6 - Interactivity/pixi.js

Ignore Space Show notes View examples/example 7 - Transparent Background/pixi.js

Ignore Space Show notes View examples/example 8 - Dragging/pixi.js

Ignore Space Show notes View examples/example 9 - Tiling Texture/pixi.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/pixi/renderers/canvas/CanvasRenderer.js

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

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

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

Ignore Space Show notes View src/pixi/text/BitmapText.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/textures/Texture.js

Show line notes below