Merge branch 'Dev'
Conflicts:
	src/pixi/text/Text.js
commit 6a049c788e7675d6ef9224bb2043eb35004c7552
2 parents df77e6d + 88b8631
@Mat Groves Mat Groves authored on 22 May 2013
Showing 81 changed files
View
Gruntfile.js
View
bin/pixi.dev.js
View
docs/api.js
View
docs/classes/AssetLoader.html
View
docs/classes/BaseTexture.html
View
docs/classes/BitmapFontLoader.html
View
docs/classes/BitmapText.html
View
docs/classes/CanvasRenderer.html
View
docs/classes/DisplayObject.html
View
docs/classes/DisplayObjectContainer.html
View
docs/classes/ImageLoader.html
View
docs/classes/InteractionData.html
View
docs/classes/InteractionManager.html
View
docs/classes/MovieClip.html
View
docs/classes/Point.html
View
docs/classes/Rectangle.html
View
docs/classes/RenderTexture.html 0 → 100644
View
docs/classes/Sprite.html
View
docs/classes/SpriteSheetLoader.html
View
docs/classes/Stage.html
View
docs/classes/Text.html
View
docs/classes/Texture.html
View
docs/classes/TilingSprite.html
View
docs/classes/WebGLBatch.html
View
docs/classes/WebGLRenderer.html
View
docs/data.json
View
docs/files/src_pixi_DisplayObject.js.html
View
docs/files/src_pixi_DisplayObjectContainer.js.html
View
docs/files/src_pixi_InteractionManager.js.html
View
docs/files/src_pixi_Intro.js.html
View
docs/files/src_pixi_MovieClip.js.html
View
docs/files/src_pixi_Outro.js.html
View
docs/files/src_pixi_Pixi.js.html
View
docs/files/src_pixi_Point.js.html
View
docs/files/src_pixi_Rectangle.js.html
View
docs/files/src_pixi_Sprite.js.html
View
docs/files/src_pixi_Stage.js.html
View
docs/files/src_pixi_extras_Rope.js.html
View
docs/files/src_pixi_extras_Strip.js.html
View
docs/files/src_pixi_extras_TilingSprite.js.html
View
docs/files/src_pixi_loaders_AssetLoader.js.html
View
docs/files/src_pixi_loaders_BitmapFontLoader.js.html
View
docs/files/src_pixi_loaders_ImageLoader.js.html
View
docs/files/src_pixi_loaders_SpriteSheetLoader.js.html
View
docs/files/src_pixi_renderers_CanvasRenderer.js.html
View
docs/files/src_pixi_renderers_WebGLBatch.js.html
View
docs/files/src_pixi_renderers_WebGLRenderGroup.js.html 0 → 100644
View
docs/files/src_pixi_renderers_WebGLRenderer.js.html
View
docs/files/src_pixi_renderers_WebGLShaders.js.html
View
docs/files/src_pixi_text_BitmapText.js.html
View
docs/files/src_pixi_text_Text.js.html
View
docs/files/src_pixi_textures_BaseTexture.js.html
View
docs/files/src_pixi_textures_RenderTexture.js.html 0 → 100644
View
docs/files/src_pixi_textures_Texture.js.html
View
docs/files/src_pixi_utils_Detector.js.html
View
docs/files/src_pixi_utils_EventTarget.js.html
View
docs/files/src_pixi_utils_Utils.js.html
View
docs/index.html
View
docs/modules/PIXI.html
View
examples/example 1 - Basics/pixi.js
View
examples/example 10 - Text/pixi.js
View
examples/example 2 - SpriteSheet/pixi.js
View
examples/example 3 - MovieClip/index.html
View
examples/example 3 - MovieClip/pixi.js
View
examples/example 4 - Balls/pixi.js
View
examples/example 5 - Morph/pixi.js
View
examples/example 6 - Interactivity/pixi.js
View
examples/example 7 - Transparent Background/pixi.js
View
examples/example 8 - Dragging/pixi.js
View
examples/example 9 - Tiling Texture/pixi.js
View
src/pixi/DisplayObject.js
View
src/pixi/DisplayObjectContainer.js
View
src/pixi/InteractionManager.js
View
src/pixi/Stage.js
View
src/pixi/renderers/CanvasRenderer.js
View
src/pixi/renderers/WebGLBatch.js
View
src/pixi/renderers/WebGLRenderGroup.js 0 → 100644
View
src/pixi/renderers/WebGLRenderer.js
View
src/pixi/textures/BaseTexture.js
View
src/pixi/textures/RenderTexture.js 0 → 100644
View
src/pixi/textures/Texture.js