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

Enable orphaned nodes editing #59

Merged
merged 8 commits into from
Jul 19, 2018
Merged

Enable orphaned nodes editing #59

merged 8 commits into from
Jul 19, 2018

Commits on Jul 18, 2018

  1. created a handler to update conflict infos of the scen and nodes.

    @tony056
    tony056 committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    e3187fa View commit details
    Browse the repository at this point in the history

  2. enabled editing children under missing roots.

    @tony056
    tony056 committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    810414a View commit details
    Browse the repository at this point in the history

  3. updates scene conflict info with the handler.

    @tony056
    tony056 committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    861efe2 View commit details
    Browse the repository at this point in the history

  4. two sample cases for conflict resolution.

    @tony056
    tony056 committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    8083fb6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:MozillaReality/hubs-editor into f… 

    …eatures/orphaned-nodes
    @tony056
    tony056 committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    d4298b1 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2018

  1. renamed class file.

    @tony056
    tony056 committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    d25fc0a View commit details
    Browse the repository at this point in the history

  2. renamed methods and used correct methods.

    @tony056
    tony056 committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    d02877a View commit details
    Browse the repository at this point in the history

  3. added gltf with duplicate names

    @tony056
    tony056 committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    4d4fc96 View commit details
    Browse the repository at this point in the history