Merge branch 'master' into feature/auth_for_allhands
# Conflicts: # .gitignore
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- Jenkinsfile 17 additions, 0 deletionsJenkinsfile
- README.md 36 additions, 3 deletionsREADME.md
- package.json 6 additions, 2 deletionspackage.json
- public/assets/environments/CliffVista_mesh.glb 0 additions, 0 deletionspublic/assets/environments/CliffVista_mesh.glb
- public/assets/environments/MeetingSpace1_mesh.glb 0 additions, 0 deletionspublic/assets/environments/MeetingSpace1_mesh.glb
- public/assets/environments/OutdoorFacade_mesh.glb 0 additions, 0 deletionspublic/assets/environments/OutdoorFacade_mesh.glb
- src/components/cached-gltf-model.js 126 additions, 0 deletionssrc/components/cached-gltf-model.js
- src/components/networked-video-player.css 8 additions, 3 deletionssrc/components/networked-video-player.css
- src/components/networked-video-player.js 12 additions, 3 deletionssrc/components/networked-video-player.js
- src/index.js 1 addition, 0 deletionssrc/index.js
- templates/HandlebarsTemplatePlugin.js 69 additions, 0 deletionstemplates/HandlebarsTemplatePlugin.js
- templates/index.hbs 1 addition, 1 deletiontemplates/index.hbs
- templates/room.hbs 19 additions, 21 deletionstemplates/room.hbs
- webpack.common.js 27 additions, 2 deletionswebpack.common.js
- yarn.lock 50 additions, 7 deletionsyarn.lock
Loading
Please register or sign in to comment