repo: janusweb action: commit revision: path_from: revision_from: 89a8020605ee3ac90f095a52260bad699b311dec: path_to: revision_to:
commit 89a8020605ee3ac90f095a52260bad699b311dec Author: James BaicoianuDate: Wed Apr 5 10:03:47 2017 -0700 Added daydream controller asset diff --git a/media/assets.json b/media/assets.json
--- a/media/assets.json
+++ b/media/assets.json
@@ -61,6 +61,7 @@
{ "assettype":"image", "name":"cursor_hand", "src":"assets/cursor/hand.png", "hasalpha": true },
+ { "assettype":"model", "name":"controller_daydream", "src":"assets/controllers/daydream/vr_controller_daydream.obj", "mtl":"vr_controller_daydream.mtl" },
{ "assettype":"model", "name":"controller_vive", "src":"assets/controllers/vive/ViveController.dae.gz" },
{ "assettype":"model", "name":"controller_touch_left", "src":"assets/controllers/oculus/TouchLeft.dae.gz" },
{ "assettype":"model", "name":"controller_touch_right", "src":"assets/controllers/oculus/TouchRight.dae.gz" }
-----END OF PAGE-----