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

e859bc22

Commit e859bc22 authored 7 years ago by Kevin Lee

Downloads
- Plain Diff

Merge branch 'master' into feature/unlocked-cursor

# Conflicts:
#	src/room.js

parents 0d155c0e c8c141b1

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/assets/avatars/BotDom_Avatar.glb 0 additions, 0 deletions

src/assets/avatars/BotDom_Avatar.glb
src/components/debug.js 25 additions, 0 deletions

src/components/debug.js
src/components/ik-controller.js 9 additions, 13 deletions

src/components/ik-controller.js
src/components/player-info.js 31 additions, 0 deletions

src/components/player-info.js
src/elements/a-gltf-entity.js 161 additions, 88 deletions

src/elements/a-gltf-entity.js
src/network-schemas.js 1 addition, 5 deletions

src/network-schemas.js
src/room.html 12 additions, 7 deletions

src/room.html
src/room.js 36 additions, 23 deletions

src/room.js

with 275 additions and 136 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