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

Adding example VR controls to webXr in viewer #155

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Adding example VR controls to webXr in viewer #155

wants to merge 8 commits into from

Commits on Jul 15, 2022

  1. Update base-types.ts 

    add webXR to constructor option
    @craigliesinger
    craigliesinger committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    0f0ba71 View commit details
    Browse the repository at this point in the history

  2. Update context to 'setAnimationLoop' for webXR if enabled

    @craigliesinger
    craigliesinger committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    8147518 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2022

  1. Adding example VR controls to webXr in viewer

    @craigliesinger
    craigliesinger committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    4bdd4e0 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2022

  1. trying to resolve merge conflict in context render function

    @craigliesinger
    craigliesinger committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    6e68c66 View commit details
    Browse the repository at this point in the history

  2. update fork

    @craigliesinger
    craigliesinger committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    0fafa72 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2022

  1. Update context.ts 

    trying to resolve conflict by confirming changes with small save
    @craigliesinger
    craigliesinger committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    48aec69 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from craigliesinger/merge-conflict-in-context-fix 

    Update context.ts
    @craigliesinger
    craigliesinger committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    e7d9609 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. Merge branch 'master' into master

    @craigliesinger
    craigliesinger committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    1ecbe9d View commit details
    Browse the repository at this point in the history