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.

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

hotfix vrm0 data not being where we expect it #10236

Merged
merged 4 commits into from
May 24, 2024
Merged

Conversation

AidanCaruso
Copy link
Member

Summary

Subtasks Checklist

Breaking Changes

References

closes #insert number here

QA Steps

@anselm
Copy link
Collaborator

anselm commented May 24, 2024

it seems to stomp on my commit that was in this exactly location just about 20 minutes earlier?

@AidanCaruso
Copy link
Member Author

it seems to stomp on my commit that was in this exactly location just about 20 minutes earlier?

I just merged dev in - your change is visible now

@AidanCaruso AidanCaruso added this pull request to the merge queue May 24, 2024
Merged via the queue into dev with commit fcc5834 May 24, 2024
13 checks passed
@AidanCaruso AidanCaruso deleted the vrm0-loading-hotfix branch May 24, 2024 16:36
MbfloydIR added a commit that referenced this pull request May 24, 2024
* dev: (63 commits)
  hotfix vrm0 data not being where we expect it (#10236)
  Update tween.js version (#10241)
  Added ProjectPermissionDatabaseType
  physics bug fix (#10221)
  updated the background to use the color with when in wireframe render mode (#10231)
  vrm expressionmanager was being thrown away it is actually needed for viseme support to work (#10230)
  IR-1887-Asset-Preview-breaking-if-you-click-gltf-that-is-in-the-scene (#10208)
  query function fix (#10229)
  IR-2102 Material/Plugin Parameters (#10180)
  Fixed webcam light not turning off when camera paused. (#10224)
  Made client's server.js not bound to a specific host (#10223)
  Update FeathersHooks.tsx (#10228)
  Updated app name
  feat(setup): update logo and components props (#10204)
  Changes for feature flag schema to be string enum (#10225)
  Cleaned location hooks (#10216)
  Ir 1652 interactable input refactor (#10219)
  IR-2018 Refactor the Select component to disable search functionality for the dropdown only (#10206)
  refactor: Update Primus initialization to include pathname in server URL (#10205)
  Move physics enter/exit back to reactors (#10193)
  ...

# Conflicts:
#	packages/editor/src/components/element/ElementList.tsx
#	packages/editor/src/components/properties/PostProcessingSettingsEditor.tsx
#	packages/engine/src/scene/SceneModule.ts
#	packages/spatial/src/renderer/components/PostProcessingComponent.tsx
#	packages/spatial/src/renderer/functions/configureEffectComposer.ts
internetcharles pushed a commit that referenced this pull request May 29, 2024
* hotfix vrm0 data not being where we expect it

* fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants