repo: janusweb
action: commit
revision: 
path_from: 
revision_from: e161e43d21be36cb1b0851a69fdaf6c954524321:
path_to: 
revision_to: 

commit e161e43d21be36cb1b0851a69fdaf6c954524321
Author: James Baicoianu 
Date:   Thu Jul 21 02:08:57 2016 -0700

    Added cursor and avatar assets

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

--- a/media/assets.json
+++ b/media/assets.json
@@ -47,8 +47,15 @@
   { "assettype":"image", "name":"skyrender_right", "src":"assets/skybox/skyrender_right.png" },
   { "assettype":"image", "name":"skyrender_up", "src":"assets/skybox/skyrender_up.png" },

+  { "assettype":"model", "name":"avatar", "src":"assets/avatar.obj", "tex0": "assets/avatar.png" },
+  { "assettype":"model", "name":"avatar_head", "src":"assets/avatar_head.obj", "tex0": "assets/avatar_head.png" },
+
+  { "assettype":"model", "name":"loading", "src":"assets/loading.obj" },
+
   { "assettype":"model", "name":"cursor3d", "src":"assets/cursor3d.obj", "tex0":"assets/cursor3d.png" },
+  { "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_arrow", "src":"assets/cursor_arrow.obj", "tex0":"assets/cursor_arrow.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" }

 ]

-----END OF PAGE-----