Merge branch 'dev'
Conflicts:
	src/pixi/textures/BaseTexture.js
commit 3363ca6eebb571ff5f4d20c4d33b23ee1d74bb59
2 parents 14db370 + d5a71cb
@mathew groves mathew groves authored on 11 Nov 2014
Showing 218 changed files
View
Gruntfile.js
Too large
View
bin/pixi.dev.js
Too large
View
bin/pixi.dev.js.map
Too large
View
bin/pixi.js
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
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
Too large
View
docs/classes/BlurYFilter.html
Too large
View
docs/classes/CanvasBuffer.html
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
Too large
View
docs/classes/CrossHatchFilter.html
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
Too large
View
docs/classes/EventTarget.html
Too large
View
docs/classes/FilterBlock.html
Too large
View
docs/classes/FilterTexture.html
Too large
View
docs/classes/Graphics.html
Too large
View
docs/classes/GraphicsData.html
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/MovieClip.html
Too large
View
docs/classes/NoiseFilter.html
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
Too large
View
docs/classes/Rectangle.html
Too large
View
docs/classes/RenderTexture.html
Too large
View
docs/classes/Rope.html
Too large
View
docs/classes/Rounded Rectangle.html 0 → 100644
Too large
View
docs/classes/SepiaFilter.html
Too large
View
docs/classes/SmartBlurFilter.html
Too large
View
docs/classes/Spine.html
Too large
View
docs/classes/SpineLoader.html
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
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
Too large
View
docs/classes/TiltShiftXFilter.html
Too large
View
docs/classes/TiltShiftYFilter.html
Too large
View
docs/classes/TwistFilter.html
Too large
View
docs/classes/WebGLBlendModeManager.html
Too large
View
docs/classes/WebGLFastSpriteBatch.html
Too large
View
docs/classes/WebGLFilterManager.html
Too large
View
docs/classes/WebGLGraphics.html
Too large
View
docs/classes/WebGLGraphicsData.html
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
Too large
View
docs/classes/autoDetectRenderer.html
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_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
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
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
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
Too large
View
docs/files/src_pixi_filters_TiltShiftXFilter.js.html
Too large
View
docs/files/src_pixi_filters_TiltShiftYFilter.js.html
Too large
View
docs/files/src_pixi_filters_TwistFilter.js.html
Too large
View
docs/files/src_pixi_geom_Circle.js.html
Too large
View
docs/files/src_pixi_geom_Ellipse.js.html
Too large
View
docs/files/src_pixi_geom_Matrix.js.html
Too large
View
docs/files/src_pixi_geom_Point.js.html
Too large
View
docs/files/src_pixi_geom_Polygon.js.html
Too large
View
docs/files/src_pixi_geom_Rectangle.js.html
Too large
View
docs/files/src_pixi_geom_RoundedRectangle.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
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_textures_VideoTexture.js.html 0 → 100644
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 12 - Spine/index.html
Too large
View
examples/example 12 - Spine/index_dragon.html
Too large
View
examples/example 13 - Graphics/indexLineTest.html
Too large
View
examples/example 22 - Complex Masking/index.html
Too large
View
examples/example 25 - Video/bunny.png 0 → 100644
Too large
View
examples/example 25 - Video/index.html 0 → 100644
Too large
View
examples/example 25 - Video/testVideo.mp4 0 → 100644
Too large
View
package.json
Too large
View
src/pixi/InteractionData.js
Too large
View
src/pixi/Pixi.js
Too large
View
src/pixi/display/DisplayObject.js
Too large
View
src/pixi/display/DisplayObjectContainer.js
Too large
View
src/pixi/display/Sprite.js
Too large
View
src/pixi/extras/TilingSprite.js
Too large
View
src/pixi/filters/AsciiFilter.js
Too large
View
src/pixi/filters/ConvolutionFilter.js
Too large
View
src/pixi/filters/PixelateFilter.js
Too large
View
src/pixi/geom/RoundedRectangle.js 0 → 100644
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
Too large
View
src/pixi/renderers/webgl/WebGLRenderer.js
Too large
View
src/pixi/renderers/webgl/shaders/PixiShader.js
Too large
View
src/pixi/renderers/webgl/shaders/StripShader.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/WebGLSpriteBatch.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/textures/VideoTexture.js 0 → 100644
Too large
View
src/pixi/utils/EventTarget.js
Too large
View
test/unit/pixi/renderers/canvas/CanvasRenderer.js
Too large
View
test/unit/pixi/renderers/webgl/WebGLRenderer.js
Too large
View
test/unit/pixi/utils/EventTarget.js
Too large