Merge branch 'dev' into dev-geometry-update
# Conflicts:
#	src/mesh/webgl/MeshRenderer.js
commit d665be3da8a426a2d3021cc60c493988f2b3672b
2 parents d00837f + c171137
@Mat Groves Mat Groves authored on 5 Jan 2017
Showing 12 changed files
View
src/core/display/Container.js
View
src/core/graphics/Graphics.js
View
src/core/sprites/webgl/SpriteRenderer.js
View
src/core/sprites/webgl/texture.vert
View
src/core/text/Text.js
View
src/extras/TilingSprite.js
View
src/extras/cacheAsBitmap.js
View
src/extras/webgl/TilingSpriteRenderer.js
View
src/index.js
View
src/mesh/geometry/Buffer.js
View
src/mesh/geometry/Geometry.js
View
src/particles/ParticleContainer.js