diff --git a/Assets/Door.FBX.meta b/Assets/Door.FBX.meta new file mode 100644 index 0000000..ca5bbb4 --- /dev/null +++ b/Assets/Door.FBX.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: d605de6389f25e242a10f8980e131dbb +timeCreated: 1464200377 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: SM_Door + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleRotations: 1 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DoorFrame.FBX.meta b/Assets/DoorFrame.FBX.meta new file mode 100644 index 0000000..f9e1a1a --- /dev/null +++ b/Assets/DoorFrame.FBX.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: a9bc7dcee79b80e45a812fe5bcc3dcd2 +timeCreated: 1464200341 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: SM_DoorFrame + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleRotations: 1 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Banana.mat b/Assets/Materials/Banana.mat new file mode 100644 index 0000000..90f47c1 Binary files /dev/null and b/Assets/Materials/Banana.mat differ diff --git a/Assets/Materials/Banana.mat.meta b/Assets/Materials/Banana.mat.meta new file mode 100644 index 0000000..f4482a9 --- /dev/null +++ b/Assets/Materials/Banana.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 59333be441c0e8042b8c2e75ae9d5f29 +timeCreated: 1464201019 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/M_Door.mat b/Assets/Materials/M_Door.mat new file mode 100644 index 0000000..fd8552e Binary files /dev/null and b/Assets/Materials/M_Door.mat differ diff --git a/Assets/Materials/M_Door.mat.meta b/Assets/Materials/M_Door.mat.meta new file mode 100644 index 0000000..59847fb --- /dev/null +++ b/Assets/Materials/M_Door.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 14a81ba258471214992c8a8dd99f7e36 +timeCreated: 1464200377 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/M_Frame.mat b/Assets/Materials/M_Frame.mat new file mode 100644 index 0000000..4cff189 Binary files /dev/null and b/Assets/Materials/M_Frame.mat differ diff --git a/Assets/Materials/M_Frame.mat.meta b/Assets/Materials/M_Frame.mat.meta new file mode 100644 index 0000000..1390ec9 --- /dev/null +++ b/Assets/Materials/M_Frame.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 778ed9bad4929f04e874fb135e3f7636 +timeCreated: 1464200339 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/M_Glass.mat b/Assets/Materials/M_Glass.mat new file mode 100644 index 0000000..9e88cac Binary files /dev/null and b/Assets/Materials/M_Glass.mat differ diff --git a/Assets/Materials/M_Glass.mat.meta b/Assets/Materials/M_Glass.mat.meta new file mode 100644 index 0000000..eeaf092 --- /dev/null +++ b/Assets/Materials/M_Glass.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1ec97e2c165543448bdc502d495a3c1 +timeCreated: 1464200377 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/defaultMat.mat b/Assets/Materials/defaultMat.mat new file mode 100644 index 0000000..193793f Binary files /dev/null and b/Assets/Materials/defaultMat.mat differ diff --git a/Assets/Materials/defaultMat.mat.meta b/Assets/Materials/defaultMat.mat.meta new file mode 100644 index 0000000..8b9f56a --- /dev/null +++ b/Assets/Materials/defaultMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae7fe334022b0574cb52f4e90e3fa2b5 +timeCreated: 1464200340 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/pink-shirt-jeans_lasse_DIF.mat b/Assets/Materials/pink-shirt-jeans_lasse_DIF.mat new file mode 100644 index 0000000..23297d0 Binary files /dev/null and b/Assets/Materials/pink-shirt-jeans_lasse_DIF.mat differ diff --git a/Assets/Materials/pink-shirt-jeans_lasse_DIF.mat.meta b/Assets/Materials/pink-shirt-jeans_lasse_DIF.mat.meta new file mode 100644 index 0000000..a687cca --- /dev/null +++ b/Assets/Materials/pink-shirt-jeans_lasse_DIF.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a6a6c2e668ad79449b48ee55868b4e2d +timeCreated: 1464201025 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/OutLineMaterial.mat b/Assets/OutLineMaterial.mat new file mode 100644 index 0000000..aa576eb Binary files /dev/null and b/Assets/OutLineMaterial.mat differ diff --git a/Assets/OutLineMaterial.mat.meta b/Assets/OutLineMaterial.mat.meta new file mode 100644 index 0000000..c2adc6c --- /dev/null +++ b/Assets/OutLineMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90a52fc266c12ff41ab5b486a49bcb9c +timeCreated: 1464211843 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Outlined-Silhouette Only.shader b/Assets/Outlined-Silhouette Only.shader new file mode 100644 index 0000000..78c5cc9 --- /dev/null +++ b/Assets/Outlined-Silhouette Only.shader @@ -0,0 +1,81 @@ +Shader "Outlined/Silhouette Only" { + Properties { + _OutlineColor ("Outline Color", Color) = (0,0,0,1) + _Outline ("Outline width", Range (0.0, 0.03)) = .005 + } + +CGINCLUDE +#include "UnityCG.cginc" + +struct appdata { + float4 vertex : POSITION; + float3 normal : NORMAL; +}; + +struct v2f { + float4 pos : POSITION; + float4 color : COLOR; +}; + +uniform float _Outline; +uniform float4 _OutlineColor; + +v2f vert(appdata v) { + // just make a copy of incoming vertex data but scaled according to normal direction + v2f o; + o.pos = mul(UNITY_MATRIX_MVP, v.vertex); + + float3 norm = mul ((float3x3)UNITY_MATRIX_IT_MV, v.normal); + float2 offset = TransformViewToProjection(norm.xy); + + o.pos.xy += offset * o.pos.z * _Outline; + o.color = _OutlineColor; + return o; +} +ENDCG + + SubShader { + Tags { "Queue" = "Transparent" } + + Pass { + Name "BASE" + Cull Back + Blend Zero One + + // uncomment this to hide inner details: + //Offset -8, -8 + + SetTexture [_OutlineColor] { + ConstantColor (0,0,0,0) + Combine constant + } + } + + // note that a vertex shader is specified here but its using the one above + Pass { + Name "OUTLINE" + Tags { "LightMode" = "Always" } + Cull Front + + // you can choose what kind of blending mode you want for the outline + //Blend SrcAlpha OneMinusSrcAlpha // Normal + //Blend One One // Additive + Blend One OneMinusDstColor // Soft Additive + //Blend DstColor Zero // Multiplicative + //Blend DstColor SrcColor // 2x Multiplicative + +CGPROGRAM +#pragma vertex vert +#pragma fragment frag + +half4 frag(v2f i) :COLOR { + return i.color; +} +ENDCG + } + + + } + + Fallback "Diffuse" +} \ No newline at end of file diff --git a/Assets/Outlined-Silhouette Only.shader.meta b/Assets/Outlined-Silhouette Only.shader.meta new file mode 100644 index 0000000..06a775b --- /dev/null +++ b/Assets/Outlined-Silhouette Only.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: ae08e8618ad9dff4fa23d8d6b596537a +timeCreated: 1464211614 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WindowFrame.FBX.meta b/Assets/WindowFrame.FBX.meta new file mode 100644 index 0000000..2324afd --- /dev/null +++ b/Assets/WindowFrame.FBX.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 3c2e8f26d4b43044c865cdf257489a9e +timeCreated: 1464200339 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: SM_WindowFrame + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleRotations: 1 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/LED_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/LED_group1Mat.mat new file mode 100644 index 0000000..d63b05c Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/LED_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/LED_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/LED_group1Mat.mat.meta new file mode 100644 index 0000000..ea16005 --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/LED_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c69b52b8e87ea754994ac00acdfabfb8 +timeCreated: 1464200377 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/body_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/body_group1Mat.mat new file mode 100644 index 0000000..c37b1fb Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/body_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/body_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/body_group1Mat.mat.meta new file mode 100644 index 0000000..234b91c --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/body_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51041ad68e4c65d41a1a15d7590c2ff7 +timeCreated: 1464200341 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/l_gripper_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/l_gripper_group1Mat.mat new file mode 100644 index 0000000..12a6356 Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/l_gripper_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/l_gripper_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/l_gripper_group1Mat.mat.meta new file mode 100644 index 0000000..7beb81b --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/l_gripper_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e50a603b536606945b36631fc79b5aec +timeCreated: 1464200340 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/menu_but_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/menu_but_group1Mat.mat new file mode 100644 index 0000000..1f9714c Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/menu_but_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/menu_but_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/menu_but_group1Mat.mat.meta new file mode 100644 index 0000000..e800b6e --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/menu_but_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a916136b6f3b5504c9963795f4d7305d +timeCreated: 1464200338 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/r_gripper_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/r_gripper_group1Mat.mat new file mode 100644 index 0000000..0f3a653 Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/r_gripper_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/r_gripper_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/r_gripper_group1Mat.mat.meta new file mode 100644 index 0000000..e2999d2 --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/r_gripper_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1373b723e1243a243a66983d6dd78151 +timeCreated: 1464200377 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/scroll_wheel_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/scroll_wheel_group1Mat.mat new file mode 100644 index 0000000..772e631 Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/scroll_wheel_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/scroll_wheel_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/scroll_wheel_group1Mat.mat.meta new file mode 100644 index 0000000..4a63c9d --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/scroll_wheel_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c3f871ccb3da7a41826bb8fc6932aba +timeCreated: 1464200339 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/status_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/status_group1Mat.mat new file mode 100644 index 0000000..07967a9 Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/status_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/status_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/status_group1Mat.mat.meta new file mode 100644 index 0000000..96b84b7 --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/status_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 63630b5bb747d994c945f8b08587ad88 +timeCreated: 1464200375 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/sys_but_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/sys_but_group1Mat.mat new file mode 100644 index 0000000..8f92128 Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/sys_but_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/sys_but_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/sys_but_group1Mat.mat.meta new file mode 100644 index 0000000..4806a9e --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/sys_but_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e30caeb0f90385540a1cf220e1fd5411 +timeCreated: 1464200340 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/track_pad_scrollcut_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/track_pad_scrollcut_group1Mat.mat new file mode 100644 index 0000000..34a48c4 Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/track_pad_scrollcut_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/track_pad_scrollcut_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/track_pad_scrollcut_group1Mat.mat.meta new file mode 100644 index 0000000..1e9be14 --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/track_pad_scrollcut_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d0116a5581ef3a045a12d30788f2e607 +timeCreated: 1464200344 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/track_pip_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/track_pip_group1Mat.mat new file mode 100644 index 0000000..0099075 Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/track_pip_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/track_pip_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/track_pip_group1Mat.mat.meta new file mode 100644 index 0000000..808f07f --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/track_pip_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4a778ba9498cca45bf17a04e46a6d19 +timeCreated: 1464200339 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/trackpad_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/trackpad_group1Mat.mat new file mode 100644 index 0000000..45dafcd Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/trackpad_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/trackpad_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/trackpad_group1Mat.mat.meta new file mode 100644 index 0000000..28e001a --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/trackpad_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2934a9d54fa49394b886e4d68568cc03 +timeCreated: 1464200377 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/vr_controller_vive_1_5/Materials/trigger_group1Mat.mat b/Assets/vr_controller_vive_1_5/Materials/trigger_group1Mat.mat new file mode 100644 index 0000000..81d59c0 Binary files /dev/null and b/Assets/vr_controller_vive_1_5/Materials/trigger_group1Mat.mat differ diff --git a/Assets/vr_controller_vive_1_5/Materials/trigger_group1Mat.mat.meta b/Assets/vr_controller_vive_1_5/Materials/trigger_group1Mat.mat.meta new file mode 100644 index 0000000..4ce791f --- /dev/null +++ b/Assets/vr_controller_vive_1_5/Materials/trigger_group1Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d12d8e82a709c124e9dbbf0fa2104a3c +timeCreated: 1464200340 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 20a158c..ad2cad3 100755 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index c4684cd..558807b 100755 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.4f1 +m_EditorVersion: 5.3.5f1 m_StandardAssetsVersion: 0