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

2ad5ef90

Commit 2ad5ef90 authored 6 years ago by Kevin Lee

Downloads
- Plain Diff

Merge branch 'feature/upgrade-aframe-0.8.2-master' into feature/carboard_cursor_support

parents 9ab2ba87 b01f761f

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

src/App.js 0 additions, 1 deletion

src/App.js
src/avatar-selector.html 2 additions, 2 deletions

src/avatar-selector.html
src/components/bone-mute-state-indicator.js 0 additions, 1 deletion

src/components/bone-mute-state-indicator.js
src/components/controls-shape-offset.js 1 addition, 1 deletion

src/components/controls-shape-offset.js
src/components/hand-controls2.js 1 addition, 2 deletions

src/components/hand-controls2.js
src/components/hide-when-quality.js 0 additions, 1 deletion

src/components/hide-when-quality.js
src/components/scene-shadow.js 0 additions, 12 deletions

src/components/scene-shadow.js
src/components/water.js 1 addition, 1 deletion

src/components/water.js
src/hub.html 2 additions, 2 deletions

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

src/hub.js
src/react-components/avatar-selector.js 2 additions, 2 deletions

src/react-components/avatar-selector.js
src/vendor/Water.js 1 addition, 1 deletion

src/vendor/Water.js
yarn.lock 4 additions, 4 deletions

yarn.lock

with 15 additions and 31 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