Merge branch 'dev'
Conflicts:
	bin/pixi.dev.js
	bin/pixi.js
	src/pixi/renderers/webgl/WebGLRenderer.js
commit 99c985b8726c42ff4dbccc68ed76a79f616af147
2 parents b29acff + 588d6fe
@mathew groves mathew groves authored on 23 Oct 2014
Showing 342 changed files
View
.editorconfig 0 → 100644
Too large
View
Gruntfile.js
Too large
View
README.md
Too large
View
bin/pixi.dev.js.map
Too large
View
bower.json
Too large
View
docs/api.js
Too large
View
docs/classes/AbstractFilter.html
Too large
View
docs/classes/AjaxRequest.html
Too large
View
docs/classes/AlphaMaskFilter.html
Too large
View
docs/classes/AsciiFilter.html 0 → 100644
Too large
View
docs/classes/AssetLoader.html
Too large
View
docs/classes/AtlasLoader.html
Too large
View
docs/classes/BaseTexture.html
Too large
View
docs/classes/BitmapFontLoader.html
Too large
View
docs/classes/BitmapText.html
Too large
View
docs/classes/BlurFilter.html
Too large
View
docs/classes/BlurXFilter.html 0 → 100644
Too large
View
docs/classes/BlurYFilter.html 0 → 100644
Too large
View
docs/classes/CanvasBuffer.html 0 → 100644
Too large
View
docs/classes/CanvasGraphics.html
Too large
View
docs/classes/CanvasMaskManager.html
Too large
View
docs/classes/CanvasRenderer.html
Too large
View
docs/classes/CanvasTinter.html
Too large
View
docs/classes/Circle.html
Too large
View
docs/classes/ColorMatrixFilter.html
Too large
View
docs/classes/ColorStepFilter.html
Too large
View
docs/classes/ComplexPrimitiveShader.html
Too large
View
docs/classes/ConvolutionFilter.html 0 → 100644
Too large
View
docs/classes/CrossHatchFilter.html 0 → 100644
Too large
View
docs/classes/DisplacementFilter.html
Too large
View
docs/classes/DisplayObject.html
Too large
View
docs/classes/DisplayObjectContainer.html
Too large
View
docs/classes/DotScreenFilter.html
Too large
View
docs/classes/Ellipse.html
Too large
View
docs/classes/Event.html 0 → 100644
Too large
View
docs/classes/EventTarget.html
Too large
View
docs/classes/FilterBlock.html 0 → 100644
Too large
View
docs/classes/FilterTexture.html
Too large
View
docs/classes/Graphics.html
Too large
View
docs/classes/GraphicsData.html 0 → 100644
Too large
View
docs/classes/GrayFilter.html
Too large
View
docs/classes/ImageLoader.html
Too large
View
docs/classes/InteractionData.html
Too large
View
docs/classes/InteractionManager.html
Too large
View
docs/classes/InvertFilter.html
Too large
View
docs/classes/JsonLoader.html
Too large
View
docs/classes/Matrix.html
Too large
View
docs/classes/Matrix2.html 100644 → 0
Too large
View
docs/classes/MovieClip.html
Too large
View
docs/classes/NoiseFilter.html 0 → 100644
Too large
View
docs/classes/NormalMapFilter.html
Too large
View
docs/classes/PixelateFilter.html
Too large
View
docs/classes/PixiFastShader.html
Too large
View
docs/classes/PixiShader.html
Too large
View
docs/classes/Point.html
Too large
View
docs/classes/PolyK.html
Too large
View
docs/classes/Polygon.html
Too large
View
docs/classes/PrimitiveShader.html
Too large
View
docs/classes/RGBSplitFilter.html 0 → 100644
Too large
View
docs/classes/Rectangle.html
Too large
View
docs/classes/RenderTexture.html 0 → 100644
Too large
View
docs/classes/Rope.html
Too large
View
docs/classes/SepiaFilter.html
Too large
View
docs/classes/SmartBlurFilter.html 0 → 100644
Too large
View
docs/classes/Spine.html
Too large
View
docs/classes/SpineLoader.html 0 → 100644
Too large
View
docs/classes/Sprite.html
Too large
View
docs/classes/SpriteBatch.html
Too large
View
docs/classes/SpriteSheetLoader.html
Too large
View
docs/classes/Stage.html
Too large
View
docs/classes/Strip.html
Too large
View
docs/classes/StripShader.html 0 → 100644
Too large
View
docs/classes/Text.html
Too large
View
docs/classes/Texture.html
Too large
View
docs/classes/TilingSprite.html
Too large
View
docs/classes/TiltShiftFilter.html 0 → 100644
Too large
View
docs/classes/TiltShiftXFilter.html 0 → 100644
Too large
View
docs/classes/TiltShiftYFilter.html 0 → 100644
Too large
View
docs/classes/TwistFilter.html
Too large
View
docs/classes/WebGLBlendModeManager.html 0 → 100644
Too large
View
docs/classes/WebGLFastSpriteBatch.html 0 → 100644
Too large
View
docs/classes/WebGLFilterManager.html
Too large
View
docs/classes/WebGLGraphics.html
Too large
View
docs/classes/WebGLGraphicsData.html 0 → 100644
Too large
View
docs/classes/WebGLMaskManager.html
Too large
View
docs/classes/WebGLRenderer.html
Too large
View
docs/classes/WebGLShaderManager.html
Too large
View
docs/classes/WebGLSpriteBatch.html
Too large
View
docs/classes/WebGLStencilManager.html
Too large
View
docs/classes/autoDetectRecommendedRenderer.html 0 → 100644
Too large
View
docs/classes/autoDetectRenderer.html
Too large
View
docs/classes/getRecommendedRenderer.html 100644 → 0
Too large
View
docs/data.json
Too large
View
docs/files/src_pixi_InteractionData.js.html
Too large
View
docs/files/src_pixi_InteractionManager.js.html
Too large
View
docs/files/src_pixi_Intro.js.html
Too large
View
docs/files/src_pixi_Outro.js.html
Too large
View
docs/files/src_pixi_Pixi.js.html
Too large
View
docs/files/src_pixi_core_Circle.js.html 100644 → 0
Too large
View
docs/files/src_pixi_core_Ellipse.js.html 100644 → 0
Too large
View
docs/files/src_pixi_core_Matrix.js.html 100644 → 0
Too large
View
docs/files/src_pixi_core_Point.js.html 100644 → 0
Too large
View
docs/files/src_pixi_core_Polygon.js.html 100644 → 0
Too large
View
docs/files/src_pixi_core_Rectangle.js.html 100644 → 0
Too large
View
docs/files/src_pixi_display_DisplayObject.js.html
Too large
View
docs/files/src_pixi_display_DisplayObjectContainer.js.html
Too large
View
docs/files/src_pixi_display_MovieClip.js.html
Too large
View
docs/files/src_pixi_display_Sprite.js.html
Too large
View
docs/files/src_pixi_display_SpriteBatch.js.html
Too large
View
docs/files/src_pixi_display_Stage.js.html
Too large
View
docs/files/src_pixi_extras_Rope.js.html
Too large
View
docs/files/src_pixi_extras_Spine.js.html
Too large
View
docs/files/src_pixi_extras_Strip.js.html
Too large
View
docs/files/src_pixi_extras_TilingSprite.js.html
Too large
View
docs/files/src_pixi_filters_AbstractFilter.js.html
Too large
View
docs/files/src_pixi_filters_AlphaMaskFilter.js.html
Too large
View
docs/files/src_pixi_filters_AsciiFilter.js.html 0 → 100644
Too large
View
docs/files/src_pixi_filters_BlurFilter.js.html
Too large
View
docs/files/src_pixi_filters_BlurXFilter.js.html
Too large
View
docs/files/src_pixi_filters_BlurYFilter.js.html
Too large
View
docs/files/src_pixi_filters_ColorMatrixFilter.js.html
Too large
View
docs/files/src_pixi_filters_ColorStepFilter.js.html
Too large
View
docs/files/src_pixi_filters_ConvolutionFilter.js.html 0 → 100644
Too large
View
docs/files/src_pixi_filters_CrossHatchFilter.js.html
Too large
View
docs/files/src_pixi_filters_DisplacementFilter.js.html
Too large
View
docs/files/src_pixi_filters_DotScreenFilter.js.html
Too large
View
docs/files/src_pixi_filters_FilterBlock.js.html
Too large
View
docs/files/src_pixi_filters_GrayFilter.js.html
Too large
View
docs/files/src_pixi_filters_InvertFilter.js.html
Too large
View
docs/files/src_pixi_filters_NoiseFilter.js.html 0 → 100644
Too large
View
docs/files/src_pixi_filters_NormalMapFilter.js.html
Too large
View
docs/files/src_pixi_filters_PixelateFilter.js.html
Too large
View
docs/files/src_pixi_filters_RGBSplitFilter.js.html
Too large
View
docs/files/src_pixi_filters_SepiaFilter.js.html
Too large
View
docs/files/src_pixi_filters_SmartBlurFilter.js.html
Too large
View
docs/files/src_pixi_filters_TiltShiftFilter.js.html 0 → 100644
Too large
View
docs/files/src_pixi_filters_TiltShiftXFilter.js.html 0 → 100644
Too large
View
docs/files/src_pixi_filters_TiltShiftYFilter.js.html 0 → 100644
Too large
View
docs/files/src_pixi_filters_TwistFilter.js.html
Too large
View
docs/files/src_pixi_geom_Circle.js.html 0 → 100644
Too large
View
docs/files/src_pixi_geom_Ellipse.js.html 0 → 100644
Too large
View
docs/files/src_pixi_geom_Matrix.js.html 0 → 100644
Too large
View
docs/files/src_pixi_geom_Point.js.html 0 → 100644
Too large
View
docs/files/src_pixi_geom_Polygon.js.html 0 → 100644
Too large
View
docs/files/src_pixi_geom_Rectangle.js.html 0 → 100644
Too large
View
docs/files/src_pixi_loaders_AssetLoader.js.html
Too large
View
docs/files/src_pixi_loaders_AtlasLoader.js.html
Too large
View
docs/files/src_pixi_loaders_BitmapFontLoader.js.html
Too large
View
docs/files/src_pixi_loaders_ImageLoader.js.html
Too large
View
docs/files/src_pixi_loaders_JsonLoader.js.html
Too large
View
docs/files/src_pixi_loaders_SpineLoader.js.html
Too large
View
docs/files/src_pixi_loaders_SpriteSheetLoader.js.html
Too large
View
docs/files/src_pixi_primitives_Graphics.js.html
Too large
View
docs/files/src_pixi_renderers_canvas_CanvasGraphics.js.html
Too large
View
docs/files/src_pixi_renderers_canvas_CanvasRenderer.js.html
Too large
View
docs/files/src_pixi_renderers_canvas_utils_CanvasBuffer.js.html 0 → 100644
Too large
View
docs/files/src_pixi_renderers_canvas_utils_CanvasMaskManager.js.html
Too large
View
docs/files/src_pixi_renderers_canvas_utils_CanvasTinter.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_WebGLRenderer.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_shaders_ComplexPrimitiveShader.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_shaders_PixiFastShader.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_shaders_PixiShader.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_shaders_PrimitiveShader.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_shaders_StripShader.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_utils_FilterTexture.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_utils_WebGLBlendModeManager.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_utils_WebGLFastSpriteBatch.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_utils_WebGLFilterManager.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_utils_WebGLGraphics.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_utils_WebGLMaskManager.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_utils_WebGLShaderManager.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_utils_WebGLShaderUtils.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_utils_WebGLSpriteBatch.js.html
Too large
View
docs/files/src_pixi_renderers_webgl_utils_WebGLStencilManager.js.html
Too large
View
docs/files/src_pixi_text_BitmapText.js.html
Too large
View
docs/files/src_pixi_text_Text.js.html
Too large
View
docs/files/src_pixi_textures_BaseTexture.js.html
Too large
View
docs/files/src_pixi_textures_RenderTexture.js.html
Too large
View
docs/files/src_pixi_textures_Texture.js.html
Too large
View
docs/files/src_pixi_utils_Detector.js.html
Too large
View
docs/files/src_pixi_utils_EventTarget.js.html
Too large
View
docs/files/src_pixi_utils_Polyk.js.html
Too large
View
docs/files/src_pixi_utils_Utils.js.html
Too large
View
docs/index.html
Too large
View
docs/modules/PIXI.html
Too large
View
examples/example 1 - Basics/index.html
Too large
View
examples/example 1 - Basics/indexTest2.html
Too large
View
examples/example 10 - Text/index.html
Too large
View
examples/example 11 - RenderTexture/index.html
Too large
View
examples/example 11 - RenderTexture/indexNew.html
Too large
View
examples/example 12 - Spine/data/Pixie.json
Too large
View
examples/example 12 - Spine/data/PixieSpineData.json
Too large
View
examples/example 12 - Spine/data/dragonBones.json
Too large
View
examples/example 12 - Spine/data/dragonBonesData.json
Too large
View
examples/example 12 - Spine/data/goblins.json
Too large
View
examples/example 12 - Spine/data/goblinsSpineData.json
Too large
View
examples/example 12 - Spine/data/spineboy.json
Too large
View
examples/example 12 - Spine/data/spineboySpineData.json
Too large
View
examples/example 12 - Spine/index.html
Too large
View
examples/example 12 - Spine/index_dragon.html
Too large
View
examples/example 12 - Spine/index_goblins.html
Too large
View
examples/example 12 - Spine/index_pixie.html
Too large
View
examples/example 13 - Graphics/index.html
Too large
View
examples/example 13 - Graphics/indexLineTest.html
Too large
View
examples/example 14 - Masking/Copy of index.html
Too large
View
examples/example 14 - Masking/index double mask.html
Too large
View
examples/example 14 - Masking/index nested masks.html
Too large
View
examples/example 14 - Masking/index.html
Too large
View
examples/example 15 - Filters/index.html
Too large
View
examples/example 15 - Filters/indexAll.html
Too large
View
examples/example 15 - Filters/indexBlur.html
Too large
View
examples/example 15 - Filters/indexDisplacement.html
Too large
View
examples/example 15 - Filters/indexDisplacement_2.html
Too large
View
examples/example 16 - BlendModes/index.html
Too large
View
examples/example 17 - Tinting/index.html
Too large
View
examples/example 18 - Batch/index.html
Too large
View
examples/example 19 - CacheAsBitmap/SpriteSheet.json
Too large
View
examples/example 19 - CacheAsBitmap/index.html
Too large
View
examples/example 2 - SpriteSheet/SpriteSheet.json
Too large
View
examples/example 2 - SpriteSheet/fighter.json
Too large
View
examples/example 2 - SpriteSheet/index.html
Too large
View
examples/example 2 - SpriteSheet/indexTrim.html
Too large
View
examples/example 20 - Strip/index.html
Too large
View
examples/example 21 - Complex Graphics/index.html
Too large
View
examples/example 22 - Complex Masking/index.html
Too large
View
examples/example 23 - Texture Swap/index.html
Too large
View
examples/example 24 - Box2D Integration/box2d.min.js 0 → 100644
Too large
View
examples/example 24 - Box2D Integration/bricks.png 0 → 100644
Too large
View
examples/example 24 - Box2D Integration/bunny.png 0 → 100644
Too large
View
examples/example 24 - Box2D Integration/grass.png 0 → 100644
Too large
View
examples/example 24 - Box2D Integration/index.html 0 → 100644
Too large
View
examples/example 3 - MovieClip/SpriteSheet.json
Too large
View
examples/example 3 - MovieClip/index.html
Too large
View
examples/example 4 - Balls/index.html
Too large
View
examples/example 4 - Balls/storm.css
Too large
View
examples/example 5 - Morph/index.html
Too large
View
examples/example 5 - Morph/storm.css
Too large
View
examples/example 6 - Interactivity/index.html
Too large
View
examples/example 7 - Transparent Background/index.html
Too large
View
examples/example 8 - Dragging/index.html
Too large
View
examples/example 9 - Tiling Texture/index.html
Too large
View
package.json
Too large
View
src/pixi/InteractionData.js
Too large
View
src/pixi/InteractionManager.js
Too large
View
src/pixi/Pixi.js
Too large
View
src/pixi/core/Circle.js 100644 → 0
Too large
View
src/pixi/core/Ellipse.js 100644 → 0
Too large
View
src/pixi/core/Matrix.js 100644 → 0
Too large
View
src/pixi/core/Point.js 100644 → 0
Too large
View
src/pixi/core/Polygon.js 100644 → 0
Too large
View
src/pixi/core/Rectangle.js 100644 → 0
Too large
View
src/pixi/display/DisplayObject.js
Too large
View
src/pixi/display/DisplayObjectContainer.js
Too large
View
src/pixi/display/MovieClip.js
Too large
View
src/pixi/display/Sprite.js
Too large
View
src/pixi/display/SpriteBatch.js
Too large
View
src/pixi/display/Stage.js
Too large
View
src/pixi/extras/Rope.js
Too large
View
src/pixi/extras/Strip.js
Too large
View
src/pixi/extras/TilingSprite.js
Too large
View
src/pixi/filters/AbstractFilter.js
Too large
View
src/pixi/filters/AlphaMaskFilter.js
Too large
View
src/pixi/filters/AsciiFilter.js 0 → 100644
Too large
View
src/pixi/filters/BlurFilter.js
Too large
View
src/pixi/filters/BlurXFilter.js
Too large
View
src/pixi/filters/BlurYFilter.js
Too large
View
src/pixi/filters/ColorMatrixFilter.js
Too large
View
src/pixi/filters/ColorStepFilter.js
Too large
View
src/pixi/filters/ConvolutionFilter.js 0 → 100644
Too large
View
src/pixi/filters/CrossHatchFilter.js
Too large
View
src/pixi/filters/DisplacementFilter.js
Too large
View
src/pixi/filters/DotScreenFilter.js
Too large
View
src/pixi/filters/FilterBlock.js
Too large
View
src/pixi/filters/GrayFilter.js
Too large
View
src/pixi/filters/InvertFilter.js
Too large
View
src/pixi/filters/NoiseFilter.js 0 → 100644
Too large
View
src/pixi/filters/NormalMapFilter.js
Too large
View
src/pixi/filters/PixelateFilter.js
Too large
View
src/pixi/filters/RGBSplitFilter.js
Too large
View
src/pixi/filters/SepiaFilter.js
Too large
View
src/pixi/filters/SmartBlurFilter.js
Too large
View
src/pixi/filters/TiltShiftFilter.js 0 → 100644
Too large
View
src/pixi/filters/TiltShiftXFilter.js 0 → 100644
Too large
View
src/pixi/filters/TiltShiftYFilter.js 0 → 100644
Too large
View
src/pixi/filters/TwistFilter.js
Too large
View
src/pixi/geom/Circle.js 0 → 100644
Too large
View
src/pixi/geom/Ellipse.js 0 → 100644
Too large
View
src/pixi/geom/Matrix.js 0 → 100644
Too large
View
src/pixi/geom/Point.js 0 → 100644
Too large
View
src/pixi/geom/Polygon.js 0 → 100644
Too large
View
src/pixi/geom/Rectangle.js 0 → 100644
Too large
View
src/pixi/loaders/AssetLoader.js
Too large
View
src/pixi/loaders/AtlasLoader.js
Too large
View
src/pixi/loaders/BitmapFontLoader.js
Too large
View
src/pixi/loaders/ImageLoader.js
Too large
View
src/pixi/loaders/JsonLoader.js
Too large
View
src/pixi/loaders/SpineLoader.js
Too large
View
src/pixi/loaders/SpriteSheetLoader.js
Too large
View
src/pixi/primitives/Graphics.js
Too large
View
src/pixi/renderers/canvas/CanvasGraphics.js
Too large
View
src/pixi/renderers/canvas/CanvasRenderer.js
Too large
View
src/pixi/renderers/canvas/utils/CanvasBuffer.js 0 → 100644
Too large
View
src/pixi/renderers/canvas/utils/CanvasMaskManager.js
Too large
View
src/pixi/renderers/canvas/utils/CanvasTinter.js
Too large
View
src/pixi/renderers/webgl/WebGLRenderer.js
Too large
View
src/pixi/renderers/webgl/shaders/ComplexPrimitiveShader.js
Too large
View
src/pixi/renderers/webgl/shaders/PixiFastShader.js
Too large
View
src/pixi/renderers/webgl/shaders/PixiShader.js
Too large
View
src/pixi/renderers/webgl/shaders/PrimitiveShader.js
Too large
View
src/pixi/renderers/webgl/shaders/StripShader.js
Too large
View
src/pixi/renderers/webgl/utils/FilterTexture.js
Too large
View
src/pixi/renderers/webgl/utils/WebGLBlendModeManager.js
Too large
View
src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.js
Too large
View
src/pixi/renderers/webgl/utils/WebGLFilterManager.js
Too large
View
src/pixi/renderers/webgl/utils/WebGLGraphics.js
Too large
View
src/pixi/renderers/webgl/utils/WebGLMaskManager.js
Too large
View
src/pixi/renderers/webgl/utils/WebGLShaderManager.js
Too large
View
src/pixi/renderers/webgl/utils/WebGLShaderUtils.js
Too large
View
src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js 100644 → 100755
Too large
View
src/pixi/renderers/webgl/utils/WebGLStencilManager.js
Too large
View
src/pixi/text/BitmapText.js
Too large
View
src/pixi/text/Text.js
Too large
View
src/pixi/textures/BaseTexture.js
Too large
View
src/pixi/textures/RenderTexture.js
Too large
View
src/pixi/textures/Texture.js
Too large
View
src/pixi/utils/Detector.js
Too large
View
src/pixi/utils/EventTarget.js
Too large
View
src/pixi/utils/Polyk.js
Too large
View
src/pixi/utils/Utils.js
Too large
View
test/lib/pixi/core/Circle.js 0 → 100644
Too large
View
test/lib/pixi/display/DisplayObject.js
Too large
View
test/lib/pixi/display/DisplayObjectContainer.js
Too large
View
test/lib/pixi/textures/RenderTexture.js 0 → 100644
Too large
View
test/lib/pixi/textures/Texture.js
Too large
View
test/lib/pixi/utils/EventTarget.js
Too large
View
test/unit/pixi/core/Circle.js
Too large
View
test/unit/pixi/core/Matrix.js
Too large
View
test/unit/pixi/display/DisplayObjectContainer.js
Too large
View
test/unit/pixi/primitives/Graphics.js
Too large
View
test/unit/pixi/textures/BaseTexture.js
Too large
View
test/unit/pixi/textures/RenderTexture.js
Too large
View
test/unit/pixi/utils/EventTarget.js
Too large