Merge branch 'dev-primitive' into dev
Conflicts:
	bin/pixi.js
commit 4b6d45c4a06f8143a5a12995fceb8547a47ec10a
2 parents 6d166cb + 74f5a35
@Mat Groves Mat Groves authored on 20 Jun 2013
Showing 31 changed files
View
bin/pixi.dev.js
View
examples/example 1 - Basics/pixi.js
View
examples/example 10 - Text/pixi.js
View
examples/example 11 - RenderTexture/pixi.js
View
examples/example 13 - Graphics/index.html 0 → 100644
View
examples/example 13 - Graphics/pixi.js 0 → 100644
View
examples/example 13 - Graphics/spinObj_01.png 0 → 100644
View
examples/example 13 - Graphics/spinObj_02.png 0 → 100644
View
examples/example 13 - Graphics/spinObj_03.png 0 → 100644
View
examples/example 13 - Graphics/spinObj_04.png 0 → 100644
View
examples/example 13 - Graphics/spinObj_05.png 0 → 100644
View
examples/example 13 - Graphics/spinObj_06.png 0 → 100644
View
examples/example 13 - Graphics/spinObj_07.png 0 → 100644
View
examples/example 13 - Graphics/spinObj_08.png 0 → 100644
View
examples/example 2 - SpriteSheet/pixi.js
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/InteractionManager.js
View
src/pixi/primitives/Graphics.js 0 → 100644
View
src/pixi/primitives/Line.js 0 → 100644
View
src/pixi/renderers/CanvasGraphics.js 0 → 100644
View
src/pixi/renderers/CanvasRenderer.js
View
src/pixi/renderers/WebGLGraphics.js 0 → 100644
View
src/pixi/renderers/WebGLRenderGroup.js
View
src/pixi/renderers/WebGLRenderer.js
View
src/pixi/renderers/WebGLShaders.js