Skip to content
Permalink
Browse files

Merge pull request #1976 from ExtendRealityLtd/fix/various-fixes

Fix/various fixes - fixes #1975 - fixes #1974 - fixes #1970
  • Loading branch information...
thestonefox committed Apr 9, 2019
2 parents ef89e84 + b7381d2 commit c4c04852cfc31dba20136a587630ba4be4149c95
Showing with 2,269 additions and 2,096 deletions.
  1. +1 −1 Dependencies/Zinnia.Unity
  2. +6 −4 Prefabs/CameraRig/SimulatedCameraRig/SimulatedCameraRig.prefab
  3. +6 −6 Prefabs/CameraRig/UnityXRCameraRig/UnityXRCameraRig.prefab
  4. +99 −34 Prefabs/Interactions/Controllables/DirectionalJointDrive.prefab
  5. +55 −34 Prefabs/Interactions/Controllables/DirectionalTransformDrive.prefab
  6. +58 −38 Prefabs/Interactions/Controllables/RotationalTransformDrive.prefab
  7. +105 −40 Prefabs/Interactions/Controllables/RotationallJointDrive.prefab
  8. +8 −3 Prefabs/Interactions/Controllables/SharedResources/Scripts/DirectionalTransformDrive.cs
  9. +132 −23 Prefabs/Interactions/Interactables/Interactable.Primary_Grab.Secondary_ControlDirection.prefab
  10. +120 −11 Prefabs/Interactions/Interactables/Interactable.Primary_Grab.Secondary_None.prefab
  11. +125 −16 Prefabs/Interactions/Interactables/Interactable.Primary_Grab.Secondary_Scale.prefab
  12. +176 −7 Prefabs/Interactions/Interactables/Interactable.Primary_Grab.Secondary_Swap.prefab
  13. +152 −43 ...ons/Interactables/SharedResources/NestedPrefabs/Interactable.Primary_Climb.Secondary_Climb.prefab
  14. +7 −2 ...bs/Interactions/Interactables/SharedResources/Scripts/Grab/Action/GrabInteractableFollowAction.cs
  15. +5 −0 Prefabs/Interactions/Interactors/SharedResources/Scripts/GrabInteractorConfigurator.cs
  16. +1,034 −1,824 Samples/Farm/Prefabs/Interactable.Shotgun Variant.prefab
  17. +167 −2 Samples/Farm/Scenes/ExampleScene.unity
  18. +13 −8 Samples/Farm/Scripts/Editor/InputAxisCreator.cs

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit c4c0485

Please sign in to comment.
You can’t perform that action at this time.