Merge branch 'master' into feature/drawing
# Conflicts: # package-lock.json # src/hub.html # src/hub.js # src/utils/media-utils.js
No related branches found
No related tags found
Showing
- package-lock.json 2701 additions, 2581 deletionspackage-lock.json
- package.json 2 additions, 1 deletionpackage.json
- src/assets/stylesheets/create-object-dialog.scss 74 additions, 0 deletionssrc/assets/stylesheets/create-object-dialog.scss
- src/assets/stylesheets/info-dialog.scss 4 additions, 0 deletionssrc/assets/stylesheets/info-dialog.scss
- src/assets/stylesheets/ui-root.scss 1 addition, 1 deletionsrc/assets/stylesheets/ui-root.scss
- src/assets/translations.data.json 1 addition, 0 deletionssrc/assets/translations.data.json
- src/components/ambient-light.js 27 additions, 0 deletionssrc/components/ambient-light.js
- src/components/directional-light.js 35 additions, 0 deletionssrc/components/directional-light.js
- src/components/gltf-model-plus.js 17 additions, 11 deletionssrc/components/gltf-model-plus.js
- src/components/hemisphere-light.js 33 additions, 0 deletionssrc/components/hemisphere-light.js
- src/components/image-plus.js 121 additions, 105 deletionssrc/components/image-plus.js
- src/components/media-loader.js 107 additions, 16 deletionssrc/components/media-loader.js
- src/components/offset-relative-to.js 0 additions, 3 deletionssrc/components/offset-relative-to.js
- src/components/point-light.js 38 additions, 0 deletionssrc/components/point-light.js
- src/components/spot-light.js 47 additions, 0 deletionssrc/components/spot-light.js
- src/components/visible-to-owner.js 16 additions, 0 deletionssrc/components/visible-to-owner.js
- src/gltf-component-mappings.js 5 additions, 3 deletionssrc/gltf-component-mappings.js
- src/hub.html 15 additions, 0 deletionssrc/hub.html
- src/hub.js 35 additions, 20 deletionssrc/hub.js
- src/react-components/2d-hud.js 5 additions, 8 deletionssrc/react-components/2d-hud.js
Loading
Please register or sign in to comment