Browse code Merge branch 'dev' into dev-geometry-update # Conflicts: # test/core/WebGLRenderer.js batch-dev bugfix/polygon-offset dev dev-blendmode-add-again dev-canvas-renderer-dirty-transform dev-graphics-fix-batches dev-line-join dev-offscreen-canvas dev-renderTexture-pool dev-replace-buble-with-babel englercj/update-s3 fix-svg master multiple-pointer-down-events upgrade v5.0.4 v5.0.3 v5.0.2 v5.0.1 v5.0.0-rc.3 v5.0.0-rc.2 v5.0.0-rc v5.0.0-alpha.3 v5.0.0-alpha.2 v5.0.0-alpha v5.0.0 floattex

commit a08f6fe3c9990fb094c87ababd83b976e0e9fa10 2 parents bee25af + 6d6ae55 Mat Groves authored on 30 Jan 2017

Showing 14 changed files

• src/core/display/Container.js
• src/core/renderers/webgl/utils/RenderTarget.js
• src/core/sprites/Sprite.js
• src/core/text/Text.js
• src/core/text/TextStyle.js
• src/core/textures/BaseRenderTexture.js
• src/core/textures/BaseTexture.js
• src/core/textures/RenderTexture.js
• src/prepare/BasePrepare.js
• src/prepare/canvas/CanvasPrepare.js
• src/prepare/webgl/WebGLPrepare.js
• test/core/Graphics.js
• test/core/WebGLRenderer.js
• test/core/index.js

Ignore Space Show notes View src/core/display/Container.js

Ignore Space Show notes View src/core/renderers/webgl/utils/RenderTarget.js

Ignore Space Show notes View src/core/sprites/Sprite.js

Ignore Space Show notes View src/core/text/Text.js

Ignore Space Show notes View src/core/text/TextStyle.js

Ignore Space Show notes View src/core/textures/BaseRenderTexture.js

Ignore Space Show notes View src/core/textures/BaseTexture.js

Ignore Space Show notes View src/core/textures/RenderTexture.js

Ignore Space Show notes View src/prepare/BasePrepare.js

Ignore Space Show notes View src/prepare/canvas/CanvasPrepare.js

Ignore Space Show notes View src/prepare/webgl/WebGLPrepare.js

Ignore Space Show notes View test/core/Graphics.js

Ignore Space Show notes View test/core/WebGLRenderer.js

Ignore Space Show notes View test/core/index.js

Show line notes below