Skip to content

Commit 67a1975

Browse files
Merge branch 'stable' into mojiworks/master
* stable: (48 commits) [RELEASE] v1.26.0 [FIX] null access when pushing SpectorJS marker without camera (playcanvas#1933) [FIX] pc.XrHitTest when WebXR not available Update package-lock.json Downgrade mocha to 6.2.2 WebXR AR hit test support (playcanvas#1926) [ImgBot] Optimize images (playcanvas#1927) [DOCS] Make anim API private (playcanvas#1924) Update NPM dependencies. [FIX] Update some example paths Update to latest JSDoc template [FIX] Updating of particle systems local bounds Add pc.drawTexture to render texture to target using a shader (playcanvas#1920) Optimize Grab-Pass for WebGL 2 and fix when using anti-aliased RenderTarget (playcanvas#1918) [DOCS] Document drawQuadWithShader and copyRenderTarget (playcanvas#1919) [FIX] Mouse wheel events on elements (playcanvas#1916) glTF 2.0 support (playcanvas#1904) Update to latest JSDoc template. Add support for ES6 script classes (playcanvas#1908) Particle system randomize sprite animations (playcanvas#1911) ...
2 parents 950c16f + 223ae6d commit 67a1975

File tree

114 files changed

+6857
-1563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+6857
-1563
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.25.0-dev
1+
1.26.0

build/dependencies.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
../src/scene/sync-queue.js
9494
../src/scene/texture-atlas.js
9595
../src/scene/stencil-parameters.js
96+
../src/anim/anim.js
9697
../src/anim/animation.js
9798
../src/anim/skeleton.js
9899
../src/sound/manager.js
@@ -114,9 +115,13 @@
114115
../src/xr/xr-manager.js
115116
../src/xr/xr-input.js
116117
../src/xr/xr-input-source.js
118+
../src/xr/xr-hit-test.js
119+
../src/xr/xr-hit-test-source.js
117120
../src/net/http.js
118-
../src/script/script-registry.js
119121
../src/script/script.js
122+
../src/script/script-type.js
123+
../src/script/script-attributes.js
124+
../src/script/script-registry.js
120125
../src/bundles/bundle.js
121126
../src/bundles/bundle-registry.js
122127
../src/i18n/i18n-parser.js
@@ -242,9 +247,12 @@
242247
../src/resources/texture-atlas.js
243248
../src/resources/sprite.js
244249
../src/resources/parser/json-model.js
250+
../src/resources/parser/glb-parser.js
251+
../src/resources/parser/glb-model.js
245252
../src/resources/parser/scene.js
246253
../src/resources/parser/material/json-standard-material.js
247254
../src/resources/basis.js
255+
../src/resources/container.js
248256
../src/asset/asset.js
249257
../src/asset/asset-variants.js
250258
../src/asset/asset-registry.js

build/externs.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ var WebAssembly = {};
1414

1515
// WebXR
1616
var XRWebGLLayer = {};
17+
var XRRay = {};
18+
var DOMPoint = {};
-2.68 KB
Loading

examples/assets/fonts/arial.png

-3.41 KB
Loading

examples/assets/fonts/courier.png

-4.07 KB
Loading
-1.29 KB
Loading
-385 Bytes
Loading
-1.75 KB
Loading
-12.2 KB
Loading

0 commit comments

Comments
 (0)