Skip to content
Snippets Groups Projects
Commit cc5ed151 authored by Häußermann Ben's avatar Häußermann Ben
Browse files

Merge remote-tracking branch 'origin/feature/menu'

# Conflicts:
#	Assets/ExampleAssets/Materials/Grid.mat
#	Assets/Materials.meta
#	Assets/Scenes/SampleScene.unity
#	Assets/Scenes/SampleSceneSettings.lighting.meta
#	Assets/Scripts.meta
#	Assets/SteamVR_Input.meta
#	Assets/SteamVR_Input/ActionSetClasses.meta
#	Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_buggy.cs.meta
#	Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs
#	Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs.meta
#	Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_mixedreality.cs.meta
#	Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_platformer.cs.meta
#	Assets/SteamVR_Input/SteamVR_Actions.asmdef.meta
#	Assets/SteamVR_Input/SteamVR_Input_ActionSets.cs
#	Assets/SteamVR_Input/SteamVR_Input_ActionSets.cs.meta
#	Assets/SteamVR_Input/SteamVR_Input_Actions.cs
#	Assets/SteamVR_Input/SteamVR_Input_Actions.cs.meta
#	Assets/SteamVR_Input/SteamVR_Input_Initialization.cs.meta
#	Assets/XR/XRGeneralSettings.asset
#	ProjectSettings/HDRPProjectSettings.asset
#	UserSettings/EditorUserSettings.asset
#	unityProject.vrmanifest
parents cc0e137a 558a4a56
No related branches found
No related tags found
No related merge requests found
Showing
with 4427 additions and 16 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment