Skip to content

Commit cf376f5

Browse files
committed
Merge branch 'master' into beta
2 parents a11be4e + 29aa1eb commit cf376f5

File tree

152 files changed

+3900
-3903
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+3900
-3903
lines changed

Assets/SteamVR/Editor/SteamVR_Editor.asmdef.meta

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

Assets/SteamVR/Input/Editor/SteamVR_Input_Editor.asmdef.meta

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

Assets/SteamVR/Input/ExampleJSON/binding_vive_tracker_camera.json.meta

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

Assets/SteamVR/Input/SteamVR_Action.cs.meta

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

Assets/SteamVR/Input/SteamVR_ActionDirections.cs.meta

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

Assets/SteamVR/Input/SteamVR_ActionSet.cs.meta

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

Assets/SteamVR/Input/SteamVR_ActionSet_Manager.cs.meta

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

Assets/SteamVR/Input/SteamVR_Action_Boolean.cs.meta

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

Assets/SteamVR/Input/SteamVR_Action_In.cs.meta

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

Assets/SteamVR/Input/SteamVR_Action_Out.cs.meta

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

0 commit comments

Comments
 (0)