Fork: 0
mark / pixi.js
Browse code
Merge branch 'dev' into dev-v4.0.0
# Conflicts:
#	bin/pixi.js
#	bin/pixi.js.map
#	bin/pixi.min.js
#	bin/pixi.min.js.map
#	package.json
#	src/core/index.js
#	src/core/renderers/webgl/WebGLRenderer.js
#	src/core/sprites/Sprite.js
#	src/core/textures/Texture.js
#	src/core/textures/TextureUvs.js
#	src/loaders/spritesheetParser.js
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 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 floattex
commit c0d0f26521e6779438b3ee43f3678da73e484902
2 parents 9640350 + e877f74
@Mat Groves Mat Groves authored on 10 Feb 2016
Patch
Unified Split
Showing 11 changed files
View
Pixi_mini.jpg 0 → 100644
View
README.md
View
bin/pixi.js
View
bin/pixi.js.map
View
gulp/util/bundle.js
View
package.json
View
src/core/display/DisplayObject.js
View
src/core/sprites/Sprite.js
View
src/core/textures/BaseTexture.js
View
src/core/textures/TextureUvs.js
View
src/interaction/InteractionManager.js