Browse code Merge branch 'dev-rewrite' of https://github.com/GoodBoyDigital/pixi.js into dev-rewrite Conflicts: src/core/primitives/Graphics.js src/core/renderers/webgl/WebGLRenderer.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 0970a9368b1be66858da1ab8cfcb0273d05d5332 2 parents 76ced5f + 81c71a6 mathew groves authored on 12 Jan 2015

Showing 87 changed files

• src/core/display/DisplayObject.js
• src/core/display/DisplayObjectContainer.js
• src/core/display/Sprite.js
• src/core/display/SpriteBatch.js
• src/core/index.js
• src/core/math/Matrix.js
• src/core/math/Point.js
• src/core/math/shapes/Circle.js
• src/core/math/shapes/Ellipse.js
• src/core/math/shapes/Polygon.js
• src/core/math/shapes/Rectangle.js
• src/core/math/shapes/RoundedRectangle.js
• src/core/primitives/Graphics.js
• src/core/primitives/GraphicsData.js
• src/core/renderers/canvas/CanvasRenderer.js
• src/core/renderers/canvas/utils/CanvasBuffer.js
• src/core/renderers/canvas/utils/CanvasGraphics.js
• src/core/renderers/canvas/utils/CanvasMaskManager.js
• src/core/renderers/canvas/utils/CanvasTinter.js
• src/core/renderers/webgl/managers/WebGLBlendModeManager.js
• src/core/renderers/webgl/managers/WebGLFilterManager.js
• src/core/renderers/webgl/managers/WebGLManager.js
• src/core/renderers/webgl/managers/WebGLMaskManager.js
• src/core/renderers/webgl/managers/WebGLShaderManager.js
• src/core/renderers/webgl/managers/WebGLStencilManager.js
• src/core/renderers/webgl/shaders/ComplexPrimitiveShader.js
• src/core/renderers/webgl/shaders/FastShader.js
• src/core/renderers/webgl/shaders/PrimitiveShader.js
• src/core/renderers/webgl/shaders/Shader.js
• src/core/renderers/webgl/shaders/StripShader.js
• src/core/renderers/webgl/utils/FilterTexture.js
• src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js
• src/core/renderers/webgl/utils/WebGLGraphics.js
• src/core/renderers/webgl/utils/WebGLGraphicsData.js
• src/core/renderers/webgl/utils/WebGLSpriteBatch.js
• src/core/textures/BaseTexture.js
• src/core/textures/RenderTexture.js
• src/core/textures/Texture.js
• src/core/textures/TextureUvs.js
• src/core/textures/VideoBaseTexture.js
• src/core/utils/EventData.js
• src/core/utils/EventTarget.js
• src/core/utils/PolyK.js
• src/core/utils/index.js
• src/extras/MovieClip.js
• src/extras/Rope.js
• src/extras/Strip.js
• src/extras/TilingSprite.js
• src/filters/AbstractFilter.js
• src/filters/AlphaMaskFilter.js
• src/filters/AsciiFilter.js
• src/filters/BlurFilter.js
• src/filters/BlurXFilter.js
• src/filters/BlurYFilter.js
• src/filters/ColorMatrixFilter.js
• src/filters/ColorStepFilter.js
• src/filters/ConvolutionFilter.js
• src/filters/CrossHatchFilter.js
• src/filters/DisplacementFilter.js
• src/filters/DotScreenFilter.js
• src/filters/FilterBlock.js
• src/filters/GrayFilter.js
• src/filters/InvertFilter.js
• src/filters/NoiseFilter.js
• src/filters/NormalMapFilter.js
• src/filters/PixelateFilter.js
• src/filters/RGBSplitFilter.js
• src/filters/SepiaFilter.js
• src/filters/SmartBlurFilter.js
• src/filters/TiltShiftFilter.js
• src/filters/TiltShiftXFilter.js
• src/filters/TiltShiftYFilter.js
• src/filters/TwistFilter.js
• src/interaction/InteractionData.js
• src/interaction/InteractionManager.js
• src/loaders/AssetLoader.js
• src/loaders/AtlasLoader.js
• src/loaders/BitmapFontLoader.js
• src/loaders/ImageLoader.js
• src/loaders/JsonLoader.js
• src/loaders/SpineLoader.js
• src/loaders/SpineTextureLoader.js
• src/loaders/SpriteSheetLoader.js
• src/spine/Spine.js
• src/spine/SpineRuntime.js
• src/text/BitmapText.js
• src/text/Text.js

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

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

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

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

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

Ignore Space Show notes View src/core/math/Matrix.js

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

Ignore Space Show notes View src/core/math/shapes/Circle.js

Ignore Space Show notes View src/core/math/shapes/Ellipse.js

Ignore Space Show notes View src/core/math/shapes/Polygon.js

Ignore Space Show notes View src/core/math/shapes/Rectangle.js

Ignore Space Show notes View src/core/math/shapes/RoundedRectangle.js

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

Ignore Space Show notes View src/core/primitives/GraphicsData.js

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

Ignore Space Show notes View src/core/renderers/canvas/utils/CanvasBuffer.js

Ignore Space Show notes View src/core/renderers/canvas/utils/CanvasGraphics.js

Ignore Space Show notes View src/core/renderers/canvas/utils/CanvasMaskManager.js

Ignore Space Show notes View src/core/renderers/canvas/utils/CanvasTinter.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/core/textures/BaseTexture.js

Ignore Space Show notes View src/core/textures/RenderTexture.js

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

Ignore Space Show notes View src/core/textures/TextureUvs.js

Ignore Space Show notes View src/core/textures/VideoBaseTexture.js

Ignore Space Show notes View src/core/utils/EventData.js

Ignore Space Show notes View src/core/utils/EventTarget.js

Ignore Space Show notes View src/core/utils/PolyK.js

Ignore Space Show notes View src/core/utils/index.js

Ignore Space Show notes View src/extras/MovieClip.js

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

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

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

Ignore Space Show notes View src/filters/AbstractFilter.js

Ignore Space Show notes View src/filters/AlphaMaskFilter.js

Ignore Space Show notes View src/filters/AsciiFilter.js

Ignore Space Show notes View src/filters/BlurFilter.js

Ignore Space Show notes View src/filters/BlurXFilter.js

Ignore Space Show notes View src/filters/BlurYFilter.js

Ignore Space Show notes View src/filters/ColorMatrixFilter.js

Ignore Space Show notes View src/filters/ColorStepFilter.js

Ignore Space Show notes View src/filters/ConvolutionFilter.js

Ignore Space Show notes View src/filters/CrossHatchFilter.js

Ignore Space Show notes View src/filters/DisplacementFilter.js

Ignore Space Show notes View src/filters/DotScreenFilter.js

Ignore Space Show notes View src/filters/FilterBlock.js

Ignore Space Show notes View src/filters/GrayFilter.js

Ignore Space Show notes View src/filters/InvertFilter.js

Ignore Space Show notes View src/filters/NoiseFilter.js

Ignore Space Show notes View src/filters/NormalMapFilter.js

Ignore Space Show notes View src/filters/PixelateFilter.js

Ignore Space Show notes View src/filters/RGBSplitFilter.js

Ignore Space Show notes View src/filters/SepiaFilter.js

Ignore Space Show notes View src/filters/SmartBlurFilter.js

Ignore Space Show notes View src/filters/TiltShiftFilter.js

Ignore Space Show notes View src/filters/TiltShiftXFilter.js

Ignore Space Show notes View src/filters/TiltShiftYFilter.js

Ignore Space Show notes View src/filters/TwistFilter.js

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/text/BitmapText.js

Ignore Space Show notes View src/text/Text.js

Show line notes below