Merge pull request #10 from OSVR/renderManager_v0.6.38

Render manager v0.6.38
OSVR · Feb 11, 2016 · fb2ce09 · fb2ce09
2 parents 0a36062 + fad713b
commit fb2ce09
Show file tree

Hide file tree

Showing 137 changed files with 2,082 additions and 182 deletions.
diff --git a/Assets/OSVRUnity.meta b/Assets/OSVRUnity.meta
diff --git a/Assets/OSVRUnity/Prefabs.meta b/Assets/OSVRUnity/Prefabs.meta
diff --git a/Assets/OSVRUnity/Resources.meta b/Assets/OSVRUnity/Resources.meta
diff --git a/Assets/OSVRUnity/Sample.meta b/Assets/OSVRUnity/Sample.meta
diff --git a/Assets/OSVRUnity/Sample/Demo.meta b/Assets/OSVRUnity/Sample/Demo.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Materials.meta b/Assets/OSVRUnity/Sample/Demo/Materials.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Materials/Effects.meta b/Assets/OSVRUnity/Sample/Demo/Materials/Effects.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models.meta b/Assets/OSVRUnity/Sample/Demo/Models.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Environment.meta b/Assets/OSVRUnity/Sample/Demo/Models/Environment.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Environment/Geometry.meta b/Assets/OSVRUnity/Sample/Demo/Models/Environment/Geometry.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Environment/Materials.meta b/Assets/OSVRUnity/Sample/Demo/Models/Environment/Materials.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Environment/Textures.meta b/Assets/OSVRUnity/Sample/Demo/Models/Environment/Textures.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Sword.meta b/Assets/OSVRUnity/Sample/Demo/Models/Sword.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Sword/Geometry.meta b/Assets/OSVRUnity/Sample/Demo/Models/Sword/Geometry.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Sword/Materials.meta b/Assets/OSVRUnity/Sample/Demo/Models/Sword/Materials.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Sword/Textures.meta b/Assets/OSVRUnity/Sample/Demo/Models/Sword/Textures.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Prefabs.meta b/Assets/OSVRUnity/Sample/Demo/Prefabs.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Scenes.meta b/Assets/OSVRUnity/Sample/Demo/Scenes.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Scripts.meta b/Assets/OSVRUnity/Sample/Demo/Scripts.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Scripts/Managers.meta b/Assets/OSVRUnity/Sample/Demo/Scripts/Managers.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Scripts/Managers/ColorManager.cs b/Assets/OSVRUnity/Sample/Demo/Scripts/Managers/ColorManager.cs
@@ -121,7 +121,7 @@ public void ChangeColor( int index )
 	{
 		if ( index > colors.Length - 1 || index < 0 )
 		{
-			Debug.LogError( "Color value out of range." );
+            Debug.LogError("[OSVR-Unity-Samples] Color value out of range.");
 			return;
 		}
 
@@ -145,7 +145,7 @@ public void ChangeColor( string name )
 		{
 			ApplyColor( found.color );
 		}else{
-			Debug.LogError( "Color not found." );
+            Debug.LogError("[OSVR-Unity-Samples] Color not found.");
 		}
 	}
 

diff --git a/Assets/OSVRUnity/Sample/Demo/Scripts/Objects.meta b/Assets/OSVRUnity/Sample/Demo/Scripts/Objects.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Shaders.meta b/Assets/OSVRUnity/Sample/Demo/Shaders.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Textures.meta b/Assets/OSVRUnity/Sample/Demo/Textures.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Textures/Effects.meta b/Assets/OSVRUnity/Sample/Demo/Textures/Effects.meta