Skip to content
This repository has been archived by the owner on Jun 14, 2024. It is now read-only.

Commit

Permalink
Merge pull request #3 from Microsoft/phone
Browse files Browse the repository at this point in the history
Phone: merge with upstream changes.
  • Loading branch information
Tim Gerken authored Aug 15, 2016
2 parents a6bd70d + c4182ae commit a461fc4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 9 additions & 1 deletion Assets/Scenes/Views/EarthView.unity
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ Prefab:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 11462598, guid: a5594a1a2c6c29647a9124ea0abfb953, type: 2}
propertyPath: speed
value: -10
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 8236412, guid: a5594a1a2c6c29647a9124ea0abfb953, type: 2}
- {fileID: 6453998, guid: a5594a1a2c6c29647a9124ea0abfb953, type: 2}
Expand Down Expand Up @@ -221,7 +225,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6bb4f31e4b806a3469cc9a17f127685a, type: 3}
m_Name:
m_EditorClassIdentifier:
rotateSpeed: {x: 0, y: -10, z: 0}
rotateSpeed: {x: 0, y: -2.5, z: 0}
RandomRotationSpeed: 0
RandomRotationDirection: 0
RotationSpeedMin: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -284,6 +288,10 @@ Prefab:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 11459584, guid: 6da2c9510ec42844ba8b1ec2349ff83a, type: 2}
propertyPath: speed
value: -10
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 6455996, guid: 6da2c9510ec42844ba8b1ec2349ff83a, type: 2}
- {fileID: 6438038, guid: 6da2c9510ec42844ba8b1ec2349ff83a, type: 2}
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

Galaxy Explorer is an open-source HoloLens application that was developed in 6-weeks as part of the Share Your Idea program where the community submitted and voted on ideas.

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

The following sections serve as guide posts to help navigate the code by explaining some of the larger systems, both how they work and how they interact.

#HoloLens Tools
Expand Down

0 comments on commit a461fc4

Please sign in to comment.