Merge branch 'dev' into dev-geometry-round-2
# Conflicts:
#	src/core/Shader.js
#	src/core/renderers/webgl/filters/Filter.js
#	src/core/sprites/webgl/generateMultiTextureShader.js
#	src/extras/webgl/TilingSpriteRenderer.js
#	src/mesh/webgl/MeshRenderer.js
commit 101dda861935bf7328586490ff90450f54dff7f6
2 parents 9c28e61 + 58ccf33
@Mat Groves Mat Groves authored on 16 Nov 2016
Showing 47 changed files
View
.babelrc 0 → 100644
View
.eslintrc.json
View
.gitignore
View
.travis.yml
View
package.json
View
scripts/release.js
View
src/core/Shader.js 0 → 100644
View
src/core/const.js
View
src/core/display/DisplayObject.js
View
src/core/index.js
View
src/core/renderers/SystemRenderer.js
View
src/core/renderers/canvas/CanvasRenderer.js
View
src/core/renderers/canvas/utils/CanvasRenderTarget.js
View
src/core/renderers/canvas/utils/mapCanvasBlendModesToPixi.js
View
src/core/renderers/webgl/TextureGarbageCollector.js
View
src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js
View
src/core/renderers/webgl/managers/FilterManager.js
View
src/core/renderers/webgl/utils/RenderTarget.js
View
src/core/renderers/webgl/utils/mapWebGLBlendModesToPixi.js
View
src/core/renderers/webgl/utils/mapWebGLDrawModesToPixi.js
View
src/core/settings.js 0 → 100644
View
src/core/sprites/Sprite.js
View
src/core/sprites/webgl/SpriteRenderer.js
View
src/core/sprites/webgl/generateMultiTextureShader.js
View
src/core/text/Text.js
View
src/core/textures/BaseRenderTexture.js
View
src/core/textures/BaseTexture.js
View
src/core/textures/RenderTexture.js
View
src/core/textures/Texture.js
View
src/core/textures/VideoBaseTexture.js
View
src/core/ticker/Ticker.js
View
src/core/utils/createIndicesForQuads.js
View
src/core/utils/index.js
View
src/deprecation.js
View
src/extras/TilingSprite.js
View
src/extras/webgl/TilingSpriteRenderer.js
View
src/filters/colormatrix/ColorMatrixFilter.js
View
src/filters/displacement/DisplacementFilter.js
View
src/filters/fxaa/FXAAFilter.js
View
src/filters/noise/NoiseFilter.js
View
src/filters/void/VoidFilter.js
View
src/loaders/spritesheetParser.js
View
src/particles/webgl/ParticleBuffer.js
View
src/particles/webgl/ParticleRenderer.js
View
test/core/DisplayObject.js
View
test/core/TilingSprite.js
View
test/index.js