Merge remote-tracking branch 'upstream/dev' into more_container_tests
commit 79b3a29eadd53740948d89086d6a59aba6e869eb
2 parents 27fbb78 + 2821565
@Stafford Williams Stafford Williams authored on 11 Oct 2016
Showing 14 changed files
View
src/core/textures/Texture.js
View
src/extras/getGlobalPosition.js
View
src/filters/blur/BlurFilter.js
View
src/mesh/Mesh.js
View
src/mesh/canvas/CanvasMeshRenderer.js 0 → 100644
View
src/mesh/index.js
View
src/mesh/webgl/MeshRenderer.js 0 → 100644
View
src/mesh/webgl/MeshShader.js 100644 → 0
View
src/mesh/webgl/mesh.frag 0 → 100644
View
src/mesh/webgl/mesh.vert 0 → 100644
View
test/core/Container.js
View
test/core/Sprite.js
View
test/core/getGlobalPosition.js 0 → 100644
View
test/core/index.js