VR-Sexe/Phillipes_Fablab
5
0
Fork 0
generated from VR-Sexe/Unity3DTemplate
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Axel Galand 2023-01-13 14:47:02 +01:00
parent 171a64d061
commit 53046b8d06
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Models/hammer.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fd5b13c999c2bf347b65add3dca90221
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Poses/Hammer.asset
View File

@ -21,11 +21,7 @@ MonoBehaviour:
pinkyFingerMovementType: 0 pinkyFingerMovementType: 0
ignoreRootPoseData: 1 ignoreRootPoseData: 1
ignoreWristPoseData: 1 ignoreWristPoseData: 1
<<<<<<< Updated upstream
position: {x: -0.004079017, y: 0.07426304, z: -0.014719886} position: {x: -0.004079017, y: 0.07426304, z: -0.014719886}
=======
position: {x: -0.007730892, y: 0.119067214, z: 0.030084359}
>>>>>>> Stashed changes
rotation: {x: -0.38252518, y: 0.011014178, z: -0.026590543, w: -0.9234967} rotation: {x: -0.38252518, y: 0.011014178, z: -0.026590543, w: -0.9234967}
bonePositions: bonePositions:
- {x: -0, y: 0, z: 0} - {x: -0, y: 0, z: 0}
@ -100,11 +96,7 @@ MonoBehaviour:
pinkyFingerMovementType: 0 pinkyFingerMovementType: 0
ignoreRootPoseData: 1 ignoreRootPoseData: 1
ignoreWristPoseData: 1 ignoreWristPoseData: 1
<<<<<<< Updated upstream
position: {x: 0.004079017, y: 0.07426304, z: -0.014719886} position: {x: 0.004079017, y: 0.07426304, z: -0.014719886}
=======
position: {x: 0.007838003, y: 0.12038135, z: 0.031398486}
>>>>>>> Stashed changes
rotation: {x: 0.38252518, y: 0.011014178, z: -0.026590543, w: 0.9234967} rotation: {x: 0.38252518, y: 0.011014178, z: -0.026590543, w: 0.9234967}
bonePositions: bonePositions:
- {x: -0, y: 0, z: 0} - {x: -0, y: 0, z: 0}