Merge branch 'dev' into dev-geometry-update

Fork: 0

mark / pixi.js

Browse code Merge branch 'dev' into dev-geometry-update # Conflicts: # src/core/Shader.js # src/core/renderers/webgl/WebGLRenderer.js # src/core/renderers/webgl/filters/Filter.js # src/core/renderers/webgl/managers/FilterManager.js # src/core/utils/index.js # src/interaction/InteractionManager.js # src/interaction/InteractionTrackingData.js # src/interaction/interactiveTarget.js # 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 a8091c7d6107360960d6718c569f71527fcaf402 2 parents 009a60b + 5827e82 Mat Groves authored on 20 Feb 2017

Browse code

# Conflicts:
#	src/core/Shader.js
#	src/core/renderers/webgl/WebGLRenderer.js
#	src/core/renderers/webgl/filters/Filter.js
#	src/core/renderers/webgl/managers/FilterManager.js
#	src/core/utils/index.js
#	src/interaction/InteractionManager.js
#	src/interaction/InteractionTrackingData.js
#	src/interaction/interactiveTarget.js
#	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 a8091c7d6107360960d6718c569f71527fcaf402

2 parents 009a60b + 5827e82

Mat Groves authored on 20 Feb 2017

Patch

Unified Split

Showing 57 changed files

Ignore Space Show notes View package.json

Ignore Space Show notes View src/accessibility/AccessibilityManager.js

Ignore Space Show notes View src/core/Application.js

Ignore Space Show notes View src/core/Shader.js 0 → 100644

Ignore Space Show notes View src/core/const.js

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

Ignore Space Show notes View src/core/graphics/Graphics.js

Ignore Space Show notes View src/core/graphics/GraphicsData.js

Ignore Space Show notes View src/core/graphics/webgl/GraphicsRenderer.js

Ignore Space Show notes View src/core/graphics/webgl/utils/buildLine.js

Ignore Space Show notes View src/core/graphics/webgl/utils/buildRoundedRectangle.js

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

Ignore Space Show notes View src/core/math/Matrix.js

Ignore Space Show notes View src/core/renderers/SystemRenderer.js

Ignore Space Show notes View src/core/renderers/canvas/CanvasRenderer.js

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

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

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

Ignore Space Show notes View src/core/renderers/webgl/filters/Filter.js

Ignore Space Show notes View src/core/renderers/webgl/filters/extractUniformsFromSrc.js

Ignore Space Show notes View src/core/renderers/webgl/managers/FilterManager.js

Ignore Space Show notes View src/core/settings.js

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

Ignore Space Show notes View src/core/sprites/canvas/CanvasTinter.js

Ignore Space Show notes View src/core/sprites/webgl/SpriteRenderer.js

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

Ignore Space Show notes View src/core/textures/Spritesheet.js 0 → 100644

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

Ignore Space Show notes View src/core/ticker/Ticker.js

Ignore Space Show notes View src/core/utils/index.js

Ignore Space Show notes View src/core/utils/mixin.js 0 → 100644

Ignore Space Show notes View src/deprecation.js

Ignore Space Show notes View src/extras/BitmapText.js

Ignore Space Show notes View src/index.js

Ignore Space Show notes View src/interaction/InteractionManager.js

Ignore Space Show notes View src/interaction/InteractionTrackingData.js 0 → 100644

Ignore Space Show notes View src/interaction/interactiveTarget.js

Ignore Space Show notes View src/loaders/bitmapFontParser.js

Ignore Space Show notes View src/loaders/index.js

Ignore Space Show notes View src/loaders/loader.js

Ignore Space Show notes View src/loaders/spritesheetParser.js

Ignore Space Show notes View src/loaders/textureParser.js

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

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

Ignore Space Show notes View test/core/Spritesheet.js 0 → 100644

Ignore Space Show notes View test/core/Texture.js 0 → 100644

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

Ignore Space Show notes View test/core/filters.js 0 → 100644

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

Ignore Space Show notes View test/core/resources/building1.json 0 → 100755

Ignore Space Show notes View test/core/resources/building1.png 0 → 100755

Ignore Space Show notes View test/core/resources/building1@2x.json 0 → 100755

Ignore Space Show notes View test/core/resources/building1@2x.png 0 → 100755

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

Ignore Space Show notes View test/interaction/InteractionManager.js

Ignore Space Show notes View test/interaction/MockPointer.js

Ignore Space Show notes View test/withGL.js 0 → 100644

Show line notes below