-
- Downloads
Merge branch 'master' into feature/drawing
# Conflicts: # package-lock.json # src/components/super-spawner.js # src/hub.js # src/react-components/2d-hud.js
Showing
- .circleci/config.yml 20 additions, 0 deletions.circleci/config.yml
- .travis.yml 0 additions, 10 deletions.travis.yml
- doc/image_orientations.gif 0 additions, 0 deletionsdoc/image_orientations.gif
- package-lock.json 1150 additions, 654 deletionspackage-lock.json
- package.json 8 additions, 6 deletionspackage.json
- src/assets/hud/spawn_photo-hover.png 0 additions, 0 deletionssrc/assets/hud/spawn_photo-hover.png
- src/assets/hud/spawn_photo.png 0 additions, 0 deletionssrc/assets/hud/spawn_photo.png
- src/assets/stylesheets/2d-hud.scss 30 additions, 3 deletionssrc/assets/stylesheets/2d-hud.scss
- src/components/character-controller.js 14 additions, 11 deletionssrc/components/character-controller.js
- src/components/gltf-model-plus.js 15 additions, 10 deletionssrc/components/gltf-model-plus.js
- src/components/media-views.js 10 additions, 0 deletionssrc/components/media-views.js
- src/components/offset-relative-to.js 38 additions, 0 deletionssrc/components/offset-relative-to.js
- src/components/super-spawner.js 2 additions, 2 deletionssrc/components/super-spawner.js
- src/components/virtual-gamepad-controls.css 2 additions, 2 deletionssrc/components/virtual-gamepad-controls.css
- src/gltf-component-mappings.js 30 additions, 1 deletionsrc/gltf-component-mappings.js
- src/hub.js 22 additions, 5 deletionssrc/hub.js
- src/react-components/2d-hud.js 34 additions, 9 deletionssrc/react-components/2d-hud.js
- src/react-components/create-object-dialog.js 2 additions, 1 deletionsrc/react-components/create-object-dialog.js
- src/react-components/ui-root.js 4 additions, 2 deletionssrc/react-components/ui-root.js
- src/systems/nav.js 14 additions, 0 deletionssrc/systems/nav.js
Loading
Please register or sign in to comment