Browse code Merge branch 'next-3d-texture' into next # Conflicts: # src/core/shader/Program.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 e0a97eaad764a35037d56e448833bd111eb2155c 2 parents 3fbfdab + 71fb1c2 Mat Groves authored on 13 May 2017

Showing 13 changed files

• src/core/const.js
• src/core/index.js
• src/core/renderers/webgl/systems/shader/shader/defaultValue.js
• src/core/renderers/webgl/systems/shader/shader/mapType.js
• src/core/renderers/webgl/systems/shader/shader/setPrecision.js
• src/core/renderers/webgl/systems/textures/TextureSystem.js
• src/core/shader/Program.js
• src/core/shader/generateUniformsSync2.js
• src/core/textures/ArrayTexture.js
• src/core/textures/BaseTexture.js
• src/core/textures/Spritesheet.js
• src/core/textures/Texture.js
• src/core/textures/resources/ImageResource.js

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

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

Ignore Space Show notes View src/core/renderers/webgl/systems/shader/shader/defaultValue.js

Ignore Space Show notes View src/core/renderers/webgl/systems/shader/shader/mapType.js

Ignore Space Show notes View src/core/renderers/webgl/systems/shader/shader/setPrecision.js

Ignore Space Show notes View src/core/renderers/webgl/systems/textures/TextureSystem.js

Ignore Space Show notes View src/core/shader/Program.js

Ignore Space Show notes View src/core/shader/generateUniformsSync2.js

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

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

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

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

Ignore Space Show notes View src/core/textures/resources/ImageResource.js

Show line notes below