Merge branch 'dev' into dev-geometry-update
# Conflicts:
#	src/mesh/Mesh.js
commit 69b8919936024a1e36a50926ee1d42b3ff4808bd
2 parents c3c3830 + 33655ec
@Mat Groves Mat Groves authored on 17 Dec 2016
Showing 22 changed files
View
package.json
View
src/core/display/Transform.js
View
src/core/graphics/Graphics.js
View
src/core/renderers/webgl/ShaderManager.js
View
src/core/renderers/webgl/TextureGarbageCollector.js
View
src/core/renderers/webgl/WebGLRenderer.js
View
src/core/renderers/webgl/managers/FilterManager.js
View
src/core/renderers/webgl/utils/RenderTarget.js
View
src/core/sprites/Sprite.js
View
src/core/text/TextStyle.js
View
src/core/utils/index.js
View
src/extras/TilingSprite.js
View
src/filters/blur/BlurFilter.js
View
src/filters/blur/BlurXFilter.js
View
src/filters/blur/BlurYFilter.js
View
src/interaction/InteractionEvent.js
View
src/interaction/InteractionManager.js
View
src/loaders/spritesheetParser.js
View
src/mesh/Mesh.js
View
test/core/Graphics.js
View
test/interaction/InteractionManager.js 0 → 100644
View
test/interaction/index.js