Browse code Merge branch 'dev---spine' into dev batch-dev bugfix/polygon-offset dev dev-blendmode-add-again dev-canvas-renderer-dirty-transform dev-graphics-fix-batches dev-line-join dev-offscreen-canvas dev-renderTexture-pool dev-replace-buble-with-babel englercj/update-s3 feature-nine-slice-canvas-tint fix-svg master multiple-pointer-down-events upgrade v2.x v3.x v4.x v5.0.4 v5.0.3 v5.0.2 v5.0.1 v5.0.0-rc.3 v5.0.0-rc.2 v5.0.0-rc v5.0.0-alpha.3 v5.0.0-alpha.2 v5.0.0-alpha v5.0.0 v4.8.8 v4.8.7 v4.8.6 v4.8.5 v4.8.4 v4.8.3 v4.8.2 v4.8.1 v4.8.0 v4.7.3 v4.7.2 v4.7.1 v4.7.0 v4.6.2 v4.6.1 v4.6.0 v4.5.6 v4.5.5 v4.5.4 v4.5.3 v4.5.2 v4.5.1 v4.5.0 v4.0.3 v4.0.2 v4.0.1 v4.0.0-rc4 v4.0.0-rc3 v4.0.0-rc2 v4.0.0-rc1 v4.0.0 v3.0.9 v3.0.8 v3.0.7 v3.0.6 v3.0.5 v3.0.4 v3.0.3 v3.0.2 v3.0.11 v3.0.10 v3.0.1 v3.0.0-rc4 v3.0.0-rc3 v3.0.0-rc2 v3.0.0-rc1 v3.0.0 v2.2.9 v2.2.8 v2.2.7 v2.2.6 v2.2.5 v2.2.4 v2.2.3 v2.2.2 v2.2.1 v2.2.0 v2.1.1 v2.1.01 v2.1.0 v2.0.0 v1.6.1 v1.6.0 v1.5.3 v1.5.2.1 v1.5.2 v1.5.1 v1.5.0 v1.4.3 v1.4.2 v1.4.1 v1.4.0 v1.3.0 v1.2.0 floattex 2.0.0 1.5.3 1.4.2

commit ddb711437f780888537f9daa5c5d3b170cec9082 2 parents 60c348b + 4b5ef3e Mat Groves authored on 12 Jun 2013

Showing 22 changed files

• Gruntfile.js
• examples/example 12 - Spine/data/Pixie.json
• examples/example 12 - Spine/data/Pixie.png
• examples/example 12 - Spine/data/PixieSpineData.json
• examples/example 12 - Spine/data/dragonBones.json
• examples/example 12 - Spine/data/dragonBones.png
• examples/example 12 - Spine/data/powerUp.json
• examples/example 12 - Spine/data/powerUp.png
• examples/example 12 - Spine/data/spineboy.anim
• examples/example 12 - Spine/data/spineboy.json
• examples/example 12 - Spine/data/spineboy.png
• examples/example 12 - Spine/index.html
• examples/example 12 - Spine/index_dragon.html
• examples/example 12 - Spine/index_pixie.html
• examples/example 12 - Spine/pixi.js
• src/pixi/Stage.js
• src/pixi/extras/Spine.js
• src/pixi/loaders/AssetLoader.js
• src/pixi/loaders/JsonLoader.js
• src/pixi/loaders/SpineLoader.js
• src/pixi/renderers/WebGLBatch.js
• src/pixi/renderers/WebGLRenderGroup.js

Ignore Space Show notes View Gruntfile.js

Ignore Space Show notes View examples/example 12 - Spine/data/Pixie.json 0 → 100644

Ignore Space Show notes View examples/example 12 - Spine/data/Pixie.png 0 → 100644

Ignore Space Show notes View examples/example 12 - Spine/data/PixieSpineData.json 0 → 100644

Ignore Space Show notes View examples/example 12 - Spine/data/dragonBones.json 0 → 100644

Ignore Space Show notes View examples/example 12 - Spine/data/dragonBones.png 0 → 100644

Ignore Space Show notes View examples/example 12 - Spine/data/powerUp.json 0 → 100644

Ignore Space Show notes View examples/example 12 - Spine/data/powerUp.png 0 → 100644

Ignore Space Show notes View examples/example 12 - Spine/data/spineboy.anim 0 → 100755

Ignore Space Show notes View examples/example 12 - Spine/data/spineboy.json 0 → 100755

Ignore Space Show notes View examples/example 12 - Spine/data/spineboy.png 0 → 100755

Ignore Space Show notes View examples/example 12 - Spine/index.html 0 → 100644

Ignore Space Show notes View examples/example 12 - Spine/index_dragon.html 0 → 100644

Ignore Space Show notes View examples/example 12 - Spine/index_pixie.html 0 → 100644

Ignore Space Show notes View examples/example 12 - Spine/pixi.js 0 → 100644

Ignore Space Show notes View src/pixi/Stage.js

Ignore Space Show notes View src/pixi/extras/Spine.js 0 → 100644

Ignore Space Show notes View src/pixi/loaders/AssetLoader.js

Ignore Space Show notes View src/pixi/loaders/JsonLoader.js

Ignore Space Show notes View src/pixi/loaders/SpineLoader.js 0 → 100644

Ignore Space Show notes View src/pixi/renderers/WebGLBatch.js

Ignore Space Show notes View src/pixi/renderers/WebGLRenderGroup.js

Show line notes below