Merge branch 'master' into feature/interactables
# Conflicts: # package.json # yarn.lock
No related branches found
No related tags found
Showing
- package.json 1 addition, 1 deletionpackage.json
- src/assets/avatars/BotDefault_Avatar.glb 0 additions, 0 deletionssrc/assets/avatars/BotDefault_Avatar.glb
- src/assets/avatars/BotDefault_Avatar_Unlit.glb 0 additions, 0 deletionssrc/assets/avatars/BotDefault_Avatar_Unlit.glb
- src/assets/avatars/Bot_SingleSkin_Rigged.glb 0 additions, 0 deletionssrc/assets/avatars/Bot_SingleSkin_Rigged.glb
- src/components/animated-robot-hands.js 11 additions, 14 deletionssrc/components/animated-robot-hands.js
- src/components/animation-mixer.js 36 additions, 0 deletionssrc/components/animation-mixer.js
- src/components/loop-animation.js 58 additions, 0 deletionssrc/components/loop-animation.js
- src/gltf-component-mappings.js 1 addition, 0 deletionssrc/gltf-component-mappings.js
- src/room.html 9 additions, 2 deletionssrc/room.html
- src/room.js 2 additions, 3 deletionssrc/room.js
- yarn.lock 2 additions, 2 deletionsyarn.lock
Loading
Please register or sign in to comment