Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upstream updates #2

Merged
merged 6,613 commits into from
Feb 26, 2021
Merged

upstream updates #2

merged 6,613 commits into from
Feb 26, 2021

Conversation

beginor
Copy link
Owner

@beginor beginor commented Feb 26, 2021

No description provided.

mrdoob and others added 30 commits February 10, 2021 09:41
@mrdoob
USDZExporter: Improved material parameters handling
dcfd6c3
@mrdoob
USDZExporter: Flip uvs instead of textures.
6b4152a
@mrdoob
USDZExporter: Improved texture handling
ea2db58
@fraguada
3dmLoader updates
9f87ab4 
Added null checking for extrusions, modified example, updated docs, updated library
@mrdoob
Merge pull request #21247 from mrdoob/usdz
6a51509 
USDZExporter: Improved texture handling
@fraguada
Fix a few formatting mistakes
5439049
@fraguada
Cleanup commented code and check
c4cca9d
@fraguada
Trying to fix sample css
293476e
@mrdoob
Merge pull request #21248 from mcneel/wip/3DMLoader
a43d238 
3dmLoader: Updates
@Mugen87
Exampels: Simplify instanced colors in scatter example.
57ed386
@mrdoob
Added USDZExporter example
1b316d6
@mrdoob
Merge pull request #21251 from mrdoob/usdz
5ca7462 
Added USDZExporter example
@mrdoob
Merge pull request #21250 from Mugen87/dev2
db6ee25 
Examples: Simplify instanced colors in scatter example.
@mrdoob
Examples: Removed some not so useful examples
ce4b420
@mrdoob
Merge pull request #21252 from mrdoob/cleanup
e3940ae 
Examples: Removed some not so useful examples
@sunag
rename ModelViewProjectionMatrixNode -> ModelViewProjectionNode
8d4da02
@mrdoob
Merge pull request #21253 from sunag/nodematerial-mvp
dbd5d99 
NodeMaterial: Rename ModelViewProjectionMatrixNode -> ModelViewProjectionNode
@mrdoob
USDZExporter: Improved material parameter nodes.
d5326ca
@mrdoob
USDZExporter: Resize textures to 1024 by default.
aa5bb10
@mrdoob
USDZExporter: Clean up
ff0e2e1
@mrdoob
USDZExporter: Define emissiveColor only when required.
ec77181
@mrdoob
GLTFExporter: Fixed accessor reference.
9d8ed27
@Mugen87
WebGLRenderLists: Use stack approach.
4c18162
@mrdoob
Merge pull request #21254 from Mugen87/dev2
1da7835 
WebGLRenderLists: Use stack approach.
@mrdoob
Updated builds.
00904c5
@mrdoob
WebGLRenderLists/WebGLRenderStats: Simplified.
af07e8a
@mrdoob
Updated builds.
ce55022
@Mugen87
Docs: Update CDN links in Installation guide.
31eede4
@mrdoob
Updated fflate to 0.6.2 and removed fflate-deflate.
388d909
@mrdoob
USDZExporter: Implemented 64byte alignment.
8000053
mrdoob and others added 29 commits February 23, 2021 22:29
@mrdoob
Editor: Rescued VR mode.
312ee7b
@fraguada
3dmLoader: Updates (#21347)
9522135 
* extract name and value properties from objects

* Extract object userStrings
@mrdoob
Editor: Restore camera when exiting VR.
068f7c1
@Mugen87
Controls: Remove calls of stopPropagation().
b68664c
@sunag
compile node material per object
59e8e47
@sunag
cleanup
bf85611
@sunag
add example webgpu_instance_uniform
9b443e3
@Mugen87
Examples: Clean up.
1c55bb2
@sunag
Merge remote-tracking branch 'upstream/dev' into nodematerial-shared-…
c56f3df 
…uniforms
@sunag
fix title
e935137
@sunag
add missing default value
015a27c
@sunag
use default value
c3f8316
@mrdoob
Editor: Implemented clicking HTML from inside VR
77c2e00
@mrdoob
Merge pull request #21351 from mrdoob/editor
672e9de 
Editor: Implemented clicking HTML from inside VR
@mrdoob
Merge pull request #21349 from Mugen87/dev51
a2126eb 
Examples: Clean up.
@mrdoob
Merge pull request #21350 from sunag/nodematerial-shared-uniforms
29fbc87 
WebGPU: Fix material compile per object and new instance uniform example
@mrdoob
Examples: Added screenshot for webgpu_instance_uniform
7f802ff
@mrdoob
Editor: VR code clean up.
292e51c
@mrdoob
r126
dd55c01
@jj-plane
Typo fix in the documentation
b1409f8
@mrdoob
Editor: Fixed sidebar resizing in VR
e1a99a1
@Mugen87
FunctionNode: Improve regex.
3bc8b3a
@mrdoob
Merge pull request #21354 from jj-plane/objectDisposalTypoFix
4b83517 
Typo fix in the documentation
@mrdoob
Merge pull request #21356 from Mugen87/dev51
0fc1974 
FunctionNode: Improve regex.
@mrdoob
Merge pull request #21348 from Mugen87/dev48
2196f00 
Controls: Remove calls of stopPropagation().
@Mugen87
WebGLBackground: Remove support for WebGLCubeRenderTarget.
de40fd3
@mrdoob
Merge pull request #21360 from Mugen87/dev51
37862f1 
WebGLBackground: Remove support for WebGLCubeRenderTarget.
@Mugen87
Update Scene.html
2d09c20
@Mugen87
Update Scene.html
8514f00
@beginor beginor merged commit ec70f9a into beginor:dev Feb 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.