repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 129d6ac503daae5ee1355f5f3ea1603c226a6dff:
path_to: 
revision_to: 

commit 129d6ac503daae5ee1355f5f3ea1603c226a6dff
Author: James Baicoianu 
Date:   Mon Sep 26 01:28:23 2016 -0700

    Added vive/touch assets

diff --git a/media/assets.json b/media/assets.json

--- a/media/assets.json
+++ b/media/assets.json
@@ -56,6 +56,11 @@
   { "assettype":"model", "name":"cursor_arrow", "src":"assets/cursor_arrow.obj", "tex0":"assets/cursor_arrow.png" },
   { "assettype":"model", "name":"cursor_crosshair", "src":"assets/cursor_crosshair.obj", "tex0":"assets/cursor_crosshair.png" },
   { "assettype":"model", "name":"cursor_hand", "src":"assets/cursor_hand.obj", "tex0":"assets/cursor_hand.png" },
-  { "assettype":"model", "name":"cursor_sphere", "src":"assets/cursor_sphere.obj", "tex0":"assets/cursor_sphere.png" }
+  { "assettype":"model", "name":"cursor_sphere", "src":"assets/cursor_sphere.obj", "tex0":"assets/cursor_sphere.png" },
+
+
+  { "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-----