Граф коммитов

49 Коммитов

Автор SHA1 Сообщение Дата
Greg Fodor a8daf72227 Merge master 2018-10-17 21:56:58 +00:00
Greg Fodor 053b99e75d Add youtube player 2018-10-16 22:17:09 +00:00
Greg Fodor fdc1058a80 Flip to a new emoji plugin 2018-10-14 04:31:15 +00:00
Greg Fodor c13be6f200 Add emojis 2018-10-13 03:20:39 +00:00
Greg Fodor e57fe81bf6 Linkify chat 2018-10-13 01:54:17 +00:00
Greg Fodor 20e33eb944 Bump naf-janus-adapter 2018-10-06 03:59:11 +00:00
Brian Peiris bee5d1842f Project position and snap to closest nav mesh poly
For https://github.com/MozillaReality/Spoke/issues/302
2018-10-05 18:32:58 -07:00
Robert Long 02ae6cd0da Update naf-janus-adapter-0.13.1 2018-10-03 12:05:24 -07:00
Brian Peiris 9ee8737f8b yarn/npm churn 2018-10-02 12:23:20 -07:00
Brian Peiris a26c8de0ec Bump three-pathfinding with fix to remove pathfinding distance limits 2018-10-02 12:22:13 -07:00
Robert Long d178fc42f0 Bump naf-janus-adapter version 2018-10-01 15:03:42 -07:00
Brian Peiris f54a75890a use hubs master 2018-09-28 16:50:20 -07:00
Brian Peiris 68a8ad9575 package lock churn 2018-09-28 16:02:15 -07:00
Brian Peiris f9b621c38c some npm churn 2018-09-28 09:32:05 -07:00
Brian Peiris cc4c02a648 Use latest three-pathfinding 2018-09-28 09:02:47 -07:00
Greg Fodor 5b6716d9d7 Revert "Roll back to old phoenix.js"
This reverts commit 17fbb3d5cf.
2018-09-19 19:32:20 +00:00
Greg Fodor 17fbb3d5cf Roll back to old phoenix.js 2018-09-19 19:20:33 +00:00
Greg Fodor c0e7b447fc
Merge pull request #572 from mozilla/feature/phoenix-channels
Feature/phoenix channels
2018-09-18 14:23:10 -07:00
Greg Fodor f5c1d36219 Bump networked-aframe fork 2018-09-18 18:36:19 +00:00
Greg Fodor a50bfa7f4e Clean up reconnect and rejoin logic 2018-09-15 17:30:14 +00:00
Greg Fodor c245b1de3f Bump naf janus adapter 2018-09-15 06:57:25 +00:00
Greg Fodor 64cd93f98c Use phoenix.js unreliable API for NAF messages 2018-09-15 06:54:22 +00:00
Marshall Quander 18105ac193 Try out data over Phoenix channel 2018-09-14 16:39:07 -07:00
Brian Peiris 526d1393d1 Add auth channel logic and UI for Spoke auth verification 2018-09-14 10:51:42 -07:00
Marshall Quander 855b784bea Upgrade naf-janus-adapter, enable websocket data transport 2018-09-13 19:10:47 -07:00
Kevin Lee 2136fbb9d3 update segment counts again 2018-09-11 14:48:17 -07:00
Kevin Lee 2621784e94 Memory optimizations.
Only use the amount of memory needed in sharedbuffergeometry based on networked-drawing configuration. Only create a sharedbuffergeometry object when a pen is first spawned.
Also, reduce the amount of memory used by primitive entities (cursor, spawned pens, teleport-controls)
2018-09-10 17:55:13 -07:00
Kevin Lee 7ff3f47144 Merge branch 'master' into feature/drawing
# Conflicts:
#	package-lock.json
#	src/components/super-spawner.js
#	src/hub.js
#	src/react-components/2d-hud.js
2018-09-05 16:29:01 -07:00
Robert Long 4f9bfd5cf7 Use aframe-inspector npm package and fix file-loader path 2018-09-04 14:57:47 -07:00
Dominick D'Aniello 8564408ecb
Merge pull request #531 from mozilla/bugfix/oculus-go-controller-reconnect
Fix Oculus Go controller reconnection
2018-09-04 11:31:05 -07:00
Marshall Quander fe71f79e7e node-sass 4.9.2 -> 4.9.3 2018-08-31 14:38:11 -07:00
Marshall Quander 0821de9b9c webpack-dev-server 3.1.5 -> 3.1.7 2018-08-31 14:33:44 -07:00
Marshall Quander 0580bdc448 Dump aframe-extras, write nav system ourselves 2018-08-31 00:54:33 -07:00
Kevin Lee 73e2cc6898 Merge branch 'master' into feature/drawing 2018-08-30 16:11:42 -07:00
Marshall Quander 103dc5037a Update aframe-extras, three-pathfinding 2018-08-29 19:26:16 -07:00
Marshall Quander ebe6ce9441 Update networked-aframe 2018-08-29 18:26:40 -07:00
netpro2k 9250aca913 Fix Oculus Go controller reconnection 2018-08-28 11:45:45 -07:00
Kevin Lee c1eeb51da7 allow changing color and scale via mouse when holding alt or shift keys; fixing/changing input for rift. 2018-08-21 16:05:18 -07:00
Kevin Lee 59b8cfe9d1 Merge branch 'master' into feature/drawing
# Conflicts:
#	package-lock.json
#	src/hub.html
#	src/hub.js
#	src/utils/media-utils.js
2018-08-16 15:26:17 -07:00
Marshall Quander 91cf85cabf Bump naf-janus-adapter to 0.11.0 2018-08-13 15:12:33 -07:00
Marshall Quander bcafde92fc Update package-lock.json w/npm 6.3.0 2018-08-13 15:11:57 -07:00
Marshall Quander c98d15a920 Make WDS CORS settings correct 2018-08-13 13:49:43 -07:00
Kevin Lee 645e576cb6 Merge branch 'master' into feature/drawing
# Conflicts:
#	package.json
#	src/hub.js
#	yarn.lock
2018-08-08 13:56:18 -07:00
Robert Long 6818e1cfb0 Update naf-janus-adapter 2018-08-07 10:59:11 -07:00
Robert Long 154f63fa05 Update GLTFLoader to dev/hubs-v2 + envMap and gamma 2018-08-02 19:03:46 -07:00
Greg Fodor eb24ce6572 Remove A-Frame XR due to its use of eval 2018-07-31 00:40:15 +00:00
netpro2k 40435169b4 Fix package.lock merge issues 2018-07-30 16:09:59 -07:00
netpro2k 04880e57a4 Update package-lock.json 2018-07-26 15:00:38 -07:00
Marshall Quander ab4287246b Use npm instead of yarn 2018-07-25 18:21:20 -07:00