Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

H

Hubs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

e98f8c0e

Commit e98f8c0e authored 7 years ago by netpro2k

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into features/mode-switching

parents d257d316 8e77089e

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/assets/avatars/BotDefault_Avatar_Unlit.glb 0 additions, 0 deletions

src/assets/avatars/BotDefault_Avatar_Unlit.glb
src/assets/avatars/Bot_SkinnedWithAnim.glb 0 additions, 0 deletions

src/assets/avatars/Bot_SkinnedWithAnim.glb
src/elements/a-gltf-entity.js 33 additions, 0 deletions

src/elements/a-gltf-entity.js
src/gltf-component-mappings.js 3 additions, 0 deletions

src/gltf-component-mappings.js
src/room.html 2 additions, 3 deletions

src/room.html
src/room.js 1 addition, 1 deletion

src/room.js

with 39 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment