Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/package-prep' into devel…
Browse files Browse the repository at this point in the history
…opment
  • Loading branch information
mtschoen-unity committed Feb 2, 2020
2 parents f24f3e2 + 5063495 commit 8c9d58f
Show file tree
Hide file tree
Showing 51 changed files with 187 additions and 34 deletions.
66 changes: 32 additions & 34 deletions Documentation~/com.unity.labs.editorxr.md

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Documentation~/images.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Documentation~/images/annotation_01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/annotation_02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/blink.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/blockselection.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/closeworkspace.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/delete.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/editor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/editorxr_02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/example.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/fly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/hierarchy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/image10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/image24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/image46.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/image5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/image7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/inputsystem.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/inspector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/locked.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/mainmenu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/mainmenu_02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/manipulator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/manipulator_04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/manipulatorgizmo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/menurotate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Documentation~/images/miniworld.png
3 changes: 3 additions & 0 deletions Documentation~/images/miniworld_01.png
3 changes: 3 additions & 0 deletions Documentation~/images/miniworld_02.png
3 changes: 3 additions & 0 deletions Documentation~/images/miniworld_03.png
3 changes: 3 additions & 0 deletions Documentation~/images/miniworld_moveuser.png
3 changes: 3 additions & 0 deletions Documentation~/images/miniworld_refresh.png
3 changes: 3 additions & 0 deletions Documentation~/images/miniworld_reset.png
3 changes: 3 additions & 0 deletions Documentation~/images/multiselect.png
3 changes: 3 additions & 0 deletions Documentation~/images/oculuscontrols.png
3 changes: 3 additions & 0 deletions Documentation~/images/placement.png
3 changes: 3 additions & 0 deletions Documentation~/images/primitives.png
3 changes: 3 additions & 0 deletions Documentation~/images/projectworkspace.png
3 changes: 3 additions & 0 deletions Documentation~/images/radialmenu.png
3 changes: 3 additions & 0 deletions Documentation~/images/ray.png
3 changes: 3 additions & 0 deletions Documentation~/images/rescaling.png
3 changes: 3 additions & 0 deletions Documentation~/images/scale.png
3 changes: 3 additions & 0 deletions Documentation~/images/scaling.png
3 changes: 3 additions & 0 deletions Documentation~/images/snapping.png
3 changes: 3 additions & 0 deletions Documentation~/images/snapping_02.png
3 changes: 3 additions & 0 deletions Documentation~/images/snapping_rotate.png
3 changes: 3 additions & 0 deletions Documentation~/images/vivecontrols.png
3 changes: 3 additions & 0 deletions Documentation~/images/workspacemove.png
3 changes: 3 additions & 0 deletions Documentation~/images/workspaces_scroll.png
3 changes: 3 additions & 0 deletions Documentation~/images/workspacescale.png

0 comments on commit 8c9d58f

Please sign in to comment.