Merge branch 'dev' into dev-geometry-update
# Conflicts:
#	src/mesh/Mesh.js
commit 07f0649aba62740a7839745af50c16f10bcd9bb7
2 parents e416a1e + 5f9e94d
@Mat Groves Mat Groves authored on 1 Jan 2017
Showing 19 changed files
View
.gitignore
View
package.json
View
src/core/renderers/webgl/WebGLRenderer.js
View
src/core/sprites/webgl/SpriteRenderer.js
View
src/core/text/Text.js
View
src/core/text/TextStyle.js
View
src/deprecation.js
View
src/extras/TextureTransform.js
View
src/loaders/bitmapFontParser.js
View
src/loaders/loader.js
View
src/loaders/spritesheetParser.js
View
src/loaders/textureParser.js
View
test/core/Text.js
View
test/index.js
View
test/loaders/bitmapFontParser.js 0 → 100644
View
test/loaders/index.js 0 → 100644
View
test/loaders/loader.js 0 → 100644
View
test/loaders/spritesheetParser.js 0 → 100644
View
test/loaders/textureParser.js 0 → 100644