Skip to content

Commit f643df1

Browse files
Merge pull request #6424 from MenelvagorMilsom/ux/manipulation-handler-rework-physics
Proper collisions while manipulating
2 parents 0e19dca + 6f864db commit f643df1

File tree

12 files changed

+5898
-30
lines changed

12 files changed

+5898
-30
lines changed

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/ObjectManipulator/PhysicsMaterials.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!134 &13400000
4+
PhysicMaterial:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: ManipulatorMaterial
10+
dynamicFriction: 0.6
11+
staticFriction: 0.6
12+
bounciness: 0.4
13+
frictionCombine: 0
14+
bounceCombine: 0

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/ObjectManipulator/PhysicsMaterials/ManipulatorMaterial.physicMaterial.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)