Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Diff against hubs-cloud to consider modular plugin refactor #62

Draft
wants to merge 234 commits into
base: hubs-cloud
Choose a base branch
from
Draft

Diff against hubs-cloud to consider modular plugin refactor #62

wants to merge 234 commits into from

Conversation

wmurphyrd
Copy link
Member

No description provided.

wmurphyrd added 30 commits May 10, 2020 14:05
@wmurphyrd
immers integration: login, arrive/leave, follow requests and friends …
be79e49 
…list with locations
@wmurphyrd
fix broken profile update
15b99fb
@wmurphyrd
authorize with immer on load, fetch authorized profile as part of ini…
40bd400 
…tialization
@wmurphyrd
undo obsolete changes to hubs source
467149c
@wmurphyrd
connect to home Immer for token actor lookup and update streaming
f97603e
@wmurphyrd
add authorization to friends request
3fca521
@wmurphyrd
updated immers auth paths and us tokens in requests
143386b
@wmurphyrd
authenticate socketio connections
ade011c
@wmurphyrd
arrive after socket connection, authorize prepared Leave
d6d0803
@wmurphyrd
wait until after phoenix connection for immers initialization to avoi…
bdda369 
…de a raced error with ui-root state change handler
@wmurphyrd
save avatar urls to profile so they can be fetched from other immers
23618e4
@wmurphyrd
Revert obosolete package.json changes
79299e9
@wmurphyrd
refactor local immer config to be compatible with hubs could admin pa…
ec9be50 
…nel config options
@wmurphyrd
hub redirect uri compatible with both query param and route params forms
cceb8c8
@wmurphyrd
add socket.io client
13caeea
@wmurphyrd
immers integration squash merge
40afe21
@wmurphyrd
fix home immer not identified correctly when tokens requested for alr…
d11b3c0 
…eady logged in users on trusted clients
@wmurphyrd
Merge branch 'immers' into immers-integration: immers v0.0.3
ed66b70
@wmurphyrd
fix profile entry panel to show one time per immer
5f759aa
@wmurphyrd
move immer credentials into store.state.credentials so hubs.link will…
029e3c5 
… sync them, resolve races in auth v. initalize and re-auth on bad/expired tokens
@wmurphyrd
Merge branch 'hubs-cloud' of https://github.com/mozilla/hubs into imm…
a8a000b 
…ers-integration
@wmurphyrd
Merge branch 'immers' into immers-integration
253942f
@wmurphyrd
update ui-root to avoid errors with early state updates; move initial…
8740b32 
…ize back to safe one-time only event handler now that race with hub channel join no longer an issue
@wmurphyrd
fix: tokens not getting reused
cfb2f74
@wmurphyrd
bump client version to match server
7574117
@wmurphyrd
Merge branch 'hubs-cloud' of https://github.com/mozilla/hubs into imm…
49f8000 
…ers-integration
@wmurphyrd
api for communicating monetization status to the A-Frame scene
1a6a348
@wmurphyrd
delay monetization scene events until loading finished to simplify ap…
b6dc530 
…i use
@wmurphyrd
add system for adding monetization logic to elements from spoke scene
c8a3118
@wmurphyrd
network monetization status and refactor monetization-visible system …
cd9d2f6 
…to match
@wmurphyrd wmurphyrd force-pushed the immers-integration branch from f22ac06 to 78d5832 Compare June 17, 2022 17:27
wmurphyrd and others added 24 commits June 17, 2022 12:30
@wmurphyrd
Merge pull request #64 from immers-space/hubs-cloud-june-2022
89494d7 
Hubs cloud june 2022
@wmurphyrd
1.8.0
274f6b5
@wmurphyrd
version
61a1f66
@wmurphyrd
fix troika text ignoring newlines
4cb4d0b
@wmurphyrd
fix text align & size on media share buttons
b1b5682
@wmurphyrd
1.8.1
baabb37
@wmurphyrd
version
351ac18
@wmurphyrd
fix room id omitted from shared location
4633826
@wmurphyrd
1.8.2
9c29108
@wmurphyrd
bump immers client, fixup package-lock
92f7010
@wmurphyrd
update shared hub metadata, handle HTML in location status updates
c9f556f
@wmurphyrd
version
7e4bcdb
@wmurphyrd
1.9.0
7630143
@quinn-madson
On branch hubs-cloud-aug-2022
b8e0c49 
 Changes to be committed:
	modified:   .circleci/config.yml
	modified:   .defaults.env
	new file:   .github/workflows/browser-stack.yml
	modified:   README.md
	modified:   admin/package-lock.json
	modified:   doc/best-practices.md
	modified:   habitat/plan.sh
	modified:   package-lock.json
	modified:   package.json
	modified:   scripts/deploy.js
	modified:   scripts/docker/run.sh
	modified:   src/App.js
	modified:   src/assets/images/app-logo-dark.png
	modified:   src/assets/images/app-logo.png
	deleted:    src/assets/images/cursor.svg
	modified:   src/components/ambient-light.js
	modified:   src/components/animation.js
	modified:   src/components/audio-feedback.js
	modified:   src/components/audio-params.js
	modified:   src/components/avatar-audio-source.js
	modified:   src/components/avatar-volume-controls.js
	modified:   src/components/bone-visibility.js
	modified:   src/components/camera-tool.js
	modified:   src/components/cursor-controller.js
	modified:   src/components/cylinder-texture.js
	modified:   src/components/directional-light.js
	modified:   src/components/emoji-hud.js
	modified:   src/components/environment-map.js
	modified:   src/components/follow-in-fov.js
	modified:   src/components/gltf-model-plus.js
	modified:   src/components/hoverable-visuals.js
	modified:   src/components/hud-controller.js
	modified:   src/components/ik-controller.js
	modified:   src/components/layers.js
	modified:   src/components/media-image.js
	modified:   src/components/media-loader.js
	modified:   src/components/media-pdf.js
	modified:   src/components/media-video.js
	modified:   src/components/name-tag.js
	modified:   src/components/point-light.js
	modified:   src/components/position-at-border.js
	deleted:    src/components/scale-in-screen-space.js
	modified:   src/components/scene-components.js
	new file:   src/components/slice9.js
	modified:   src/components/stats-plus.js
	modified:   src/components/super-spawner.js
	modified:   src/components/teleporter.js
	modified:   src/components/text-button.js
	modified:   src/components/tools/networked-drawing.js
	modified:   src/components/troika-text.js
	modified:   src/components/video-texture-target.js
	modified:   src/components/virtual-gamepad-controls.css
	modified:   src/components/virtual-gamepad-controls.js
	modified:   src/gltf-component-mappings.js
	modified:   src/hub.html
	modified:   src/hub.js
	modified:   src/loaders/HubsTextureLoader.js
	modified:   src/react-components/avatar-preview.js
	modified:   src/react-components/home/HomePage.js
	new file:   src/react-components/input/ToolbarMicButton.js
	modified:   src/react-components/layout/Header.js
	modified:   src/react-components/layout/LoadingScreenLayout.js
	modified:   src/react-components/layout/MobileNav.js
	modified:   src/react-components/layout/Page.js
	modified:   src/react-components/layout/PageContainer.js
	new file:   src/react-components/misc/AppLogo.js
	modified:   src/react-components/misc/LevelBar.js
	new file:   src/react-components/misc/VolumeLevelBar.js
	modified:   src/react-components/misc/useVolumeMeter.js
	modified:   src/react-components/preferences-screen.js
	modified:   src/react-components/room/AudioPopover.stories.js
	modified:   src/react-components/room/AudioPopoverButton.js
	modified:   src/react-components/room/AudioPopoverButtonContainer.js
	modified:   src/react-components/room/AudioPopoverContent.js
	modified:   src/react-components/room/AudioPopoverContentContainer.js
	modified:   src/react-components/room/ExitedRoomScreen.js
	modified:   src/react-components/room/ExitedRoomScreen.stories.js
	modified:   src/react-components/room/ExitedRoomScreenContainer.js
	modified:   src/react-components/room/LoadingScreen.js
	modified:   src/react-components/room/LoadingScreen.stories.js
	modified:   src/react-components/room/LoadingScreenContainer.js
	modified:   src/react-components/room/MicSetupModal.js
	modified:   src/react-components/room/MicSetupModal.stories.js
	modified:   src/react-components/room/MicSetupModalContainer.js
	modified:   src/react-components/room/RoomEntryModal.js
	modified:   src/react-components/room/RoomEntryModal.stories.js
	modified:   src/react-components/room/SharePopoverContainer.js
	modified:   src/react-components/room/useResizeViewport.js
	modified:   src/react-components/room/useSound.js
	modified:   src/react-components/scene-ui.js
	modified:   src/react-components/ui-root.js
	modified:   src/storage/store.js
	modified:   src/systems/audio-debug-system.js
	modified:   src/systems/camera-system.js
	modified:   src/systems/character-controller-system.js
	deleted:    src/systems/enter-vr-button-system.js
	modified:   src/systems/environment-system.js
	modified:   src/systems/haptic-feedback-system.js
	modified:   src/systems/hubs-systems.js
	modified:   src/systems/menu-animation-system.js
	modified:   src/systems/physics-system.js
	deleted:    src/systems/render-manager-system.js
	deleted:    src/systems/render-manager/hubs-batch-raw-uniform-group.js
	deleted:    src/systems/scale-in-screen-space.js
	modified:   src/systems/shadow-system.js
	modified:   src/systems/sound-effects-system.js
	modified:   src/systems/userinput/devices/vive-controller.js
	modified:   src/systems/userinput/devices/windows-mixed-reality-controller.js
	modified:   src/update-audio-settings.js
	modified:   src/utils/detect-safari.js
	modified:   src/utils/dpad.js
	modified:   src/utils/fullscreen.js
	modified:   src/utils/get-app-logo.js
	new file:   src/utils/isHmc.js
	modified:   src/utils/material-utils.js
	modified:   src/utils/media-utils.js
	new file:   src/utils/screen-orientation-utils.js
	modified:   src/utils/three-utils.js
	modified:   src/vendor/Water.js
	new file:   test/browser-stack/common/browserstack.js
	new file:   test/browser-stack/common/keep-alive.js
	new file:   test/browser-stack/package-lock.json
	new file:   test/browser-stack/package.json
	new file:   test/browser-stack/tests/ie11.js
	modified:   webpack.config.js
@wmurphyrd
use immersClient for avatar creation, upload claimed avatars to your …
3d78711 
…home immer, listen for external profile updates and sync local avatar & nametag
@wmurphyrd
1.10.0
4ebb823
@quinn-madson
Replaced mixins lost in merge. Removed "#" prefix from IDs in slice9 …
80389a0 
…component.
@wmurphyrd
Merge pull request #65 from immers-space/hubs-cloud-aug-2022
7819da1 
Hubs cloud aug 2022 merge
@wmurphyrd
Reverting August Hubs Cloud update because it gutted A-Frame
f9c8a1e 
Revert "Merge pull request #65 from immers-space/hubs-cloud-aug-2022"

This reverts commit 7819da1, reversing
changes made to 4ebb823.
@wmurphyrd
finish transitioning to ImmersClient login, fixes user handle not bei…
31fbd13 
…ng included in login request when known
@wmurphyrd
fix immers-uploaded media not renderable
42e4df8
@wmurphyrd
Merge pull request #68 from immers-space/fix-prefilled-handles
3a43f4f 
Fix prefilled handles
@wmurphyrd
1.10.1
527eed7
@wmurphyrd
version
02b7c05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@wmurphyrd @quinn-madson @brianpeiris @takahirox @metamanxr