Merge branch 'master' into dev
commit 9dbc1a6b47e64f6e9e0c3b72ebcdffe579231ace
2 parents 293d740 + f870103
@mathew groves mathew groves authored on 13 Jul 2014
Showing 37 changed files
View
.gitignore
View
Gruntfile.js
View
bin/pixi.dev.js
View
bin/pixi.dev.js.map
View
bin/pixi.js
View
docs/classes/BaseTexture.html
View
docs/classes/BitmapText.html
View
docs/classes/DisplayObject.html
View
docs/classes/DisplayObjectContainer.html
View
docs/classes/Graphics.html
View
docs/classes/MovieClip.html
View
docs/classes/Spine.html
View
docs/classes/Sprite.html
View
docs/classes/Stage.html
View
docs/classes/Strip.html
View
docs/classes/Text.html
View
docs/classes/Texture.html
View
docs/classes/TilingSprite.html
View
docs/data.json
View
docs/files/src_pixi_Pixi.js.html
View
docs/files/src_pixi_display_DisplayObject.js.html
View
docs/files/src_pixi_textures_BaseTexture.js.html
View
docs/files/src_pixi_textures_Texture.js.html
View
examples/example 1 - Basics/indexTest2.html 0 → 100644
View
examples/example 19 - CacheAsBitmap/index.html
View
examples/example 19 - CacheAsBitmap/tp/SpriteSheet.tps 0 → 100644
Not supported
View
examples/example 19 - CacheAsBitmap/tp/eggHead.png 0 → 100644
View
examples/example 19 - CacheAsBitmap/tp/flowerTop.png 0 → 100644
View
examples/example 19 - CacheAsBitmap/tp/helmlok.png 0 → 100644
View
examples/example 19 - CacheAsBitmap/tp/skully.png 0 → 100644
View
examples/example 20 - Strip/index.html
View
src/pixi/Pixi.js
View
src/pixi/display/DisplayObject.js
View
src/pixi/extras/Spine.js
View
src/pixi/textures/BaseTexture.js
View
src/pixi/textures/RenderTexture.js
View
src/pixi/textures/Texture.js