Permalink
Browse files

Auto merge of #22095 - asajeffrey:magicleap-icon, r=jdm

Add icon for launching Magic Leap Servo

<!-- Please describe your changes on the following line: -->

Add an icon for launching Magic Leap Servo.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because we don't test ML

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22095)
<!-- Reviewable:end -->
  • Loading branch information...
bors-servo committed Nov 9, 2018
2 parents bb2c5e3 + 0b05df7 commit a767e80c69bc603d9dae518ce4bece9636c353fb

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,18 @@
{
"global" : {},
"materials" :
[
{
"albedo" : "Icon/Model/Model_UFO_Albedo.png",
"blendmode" : "opaque",
"name" : "com_magicleap_iconcreation_Model_UFO_Mat",
"shaderName" : "UnlitTextured"
},
{
"albedo" : "Icon/Model/Model_UFO_Albedo_Ring.png",
"blendmode" : "opaque",
"name" : "com_magicleap_iconcreation_Model_UFO_Ring_Mat",
"shaderName" : "UnlitTextured"
}
]
}
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,13 @@
{
"global" : {},
"materials" :
[
{
"albedo" : "Icon/Portal/InsidePortal_SkySphere.png",
"blendmode" : "opaque",
"name" : "com_magicleap_iconcreation_InsidePortal_SkySphere_Mat",
"shaderName" : "UnlitTextured"
}
]
}
Binary file not shown.
@@ -11,6 +11,9 @@
ml:visible_name="Servo2D"
ml:binary_name="bin/Servo2D"
ml:type="Universe">
<icon
ml:model_folder="Icon/Model/"
ml:portal_folder="Icon/Portal/" />
</component>
<uses-privilege ml:name="Internet"/>
</application>

0 comments on commit a767e80

Please sign in to comment.