Merge conflicts

4c983992 · Geovanny Vera · de7c8ba5 · 50f7ad7d · 4c983992 · 4c983992
Commit 4c983992 authored Mar 01, 2021 by Geovanny Vera
125 changed files
--- a/src/Content/Campus/Maps/MainMenu.umap
+++ b/src/Content/Campus/Maps/MainMenu.umap
--- a/src/Content/Campus/Maps/MainMenuEvan.umap
+++ b/src/Content/Campus/Maps/MainMenuEvan.umap
--- a/src/Content/Campus/Maps/MainMenu_BuiltData.uasset
+++ b/src/Content/Campus/Maps/MainMenu_BuiltData.uasset
--- a/src/Content/VRKeyboards/Audio/Cue/Accept_Cue.uasset
+++ b/src/Content/VRKeyboards/Audio/Cue/Accept_Cue.uasset
--- a/src/Content/VRKeyboards/Audio/Cue/Blip_Cue.uasset
+++ b/src/Content/VRKeyboards/Audio/Cue/Blip_Cue.uasset
--- a/src/Content/VRKeyboards/Audio/Cue/Click_Cue.uasset
+++ b/src/Content/VRKeyboards/Audio/Cue/Click_Cue.uasset
--- a/src/Content/VRKeyboards/Audio/Wav/Accept_WAV.uasset
+++ b/src/Content/VRKeyboards/Audio/Wav/Accept_WAV.uasset
--- a/src/Content/VRKeyboards/Audio/Wav/Blip_WAV.uasset
+++ b/src/Content/VRKeyboards/Audio/Wav/Blip_WAV.uasset
--- a/src/Content/VRKeyboards/Audio/Wav/Click_WAV.uasset
+++ b/src/Content/VRKeyboards/Audio/Wav/Click_WAV.uasset
--- a/src/Content/VRKeyboards/Blueprints/Enums/EModifierKeys.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Enums/EModifierKeys.uasset
--- a/src/Content/VRKeyboards/Blueprints/Enums/EPointerKeyControl.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Enums/EPointerKeyControl.uasset
--- a/src/Content/VRKeyboards/Blueprints/GameModes/GM_Drum.uasset
+++ b/src/Content/VRKeyboards/Blueprints/GameModes/GM_Drum.uasset
--- a/src/Content/VRKeyboards/Blueprints/GameModes/GM_PointAndClick.uasset
+++ b/src/Content/VRKeyboards/Blueprints/GameModes/GM_PointAndClick.uasset
--- a/src/Content/VRKeyboards/Blueprints/Interfaces/BPI_KeyboardInteraction.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Interfaces/BPI_KeyboardInteraction.uasset
--- a/src/Content/VRKeyboards/Blueprints/KeyboardAddons/Blueprints/BP_ChatBox.uasset
+++ b/src/Content/VRKeyboards/Blueprints/KeyboardAddons/Blueprints/BP_ChatBox.uasset
--- a/src/Content/VRKeyboards/Blueprints/KeyboardAddons/Blueprints/BP_WebBrowser.uasset
+++ b/src/Content/VRKeyboards/Blueprints/KeyboardAddons/Blueprints/BP_WebBrowser.uasset
--- a/src/Content/VRKeyboards/Blueprints/KeyboardAddons/Blueprints/Widgets/WBP_ChatBox.uasset
+++ b/src/Content/VRKeyboards/Blueprints/KeyboardAddons/Blueprints/Widgets/WBP_ChatBox.uasset
--- a/src/Content/VRKeyboards/Blueprints/KeyboardAddons/Blueprints/Widgets/WBP_WebBrowser.uasset
+++ b/src/Content/VRKeyboards/Blueprints/KeyboardAddons/Blueprints/Widgets/WBP_WebBrowser.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/BasicPointAndClick/BP_BasicKeyboard.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/BasicPointAndClick/BP_BasicKeyboard.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/BasicPointAndClick/WBP_Button_Basic.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/BasicPointAndClick/WBP_Button_Basic.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/BasicPointAndClick/WBP_Keyboard_Basic.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/BasicPointAndClick/WBP_Keyboard_Basic.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/CustomExamples/CustomExample1/BP_CustomKeyboard_Example1.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/CustomExamples/CustomExample1/BP_CustomKeyboard_Example1.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/CustomExamples/CustomExample1/WBP_CustomButton.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/CustomExamples/CustomExample1/WBP_CustomButton.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/CustomExamples/CustomExample1/WBP_CustomKeyboard_Example1.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/CustomExamples/CustomExample1/WBP_CustomKeyboard_Example1.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/CustomExamples/CustomExample2/BP_CustomKeyboard_Example2.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/CustomExamples/CustomExample2/BP_CustomKeyboard_Example2.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/CustomExamples/CustomExample2/WBP_CustomKeyboard_Example2.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/CustomExamples/CustomExample2/WBP_CustomKeyboard_Example2.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/Drum/BP_DrumButton.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/Drum/BP_DrumButton.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/Drum/BP_DrumKeyboard.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/Drum/BP_DrumKeyboard.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/Drum/BP_DrumMallot.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/Drum/BP_DrumMallot.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/Drum/BP_DrumPawn.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/Drum/BP_DrumPawn.uasset
--- a/src/Content/VRKeyboards/Blueprints/Keyboards/KeyboardInteractionComponent.uasset
+++ b/src/Content/VRKeyboards/Blueprints/Keyboards/KeyboardInteractionComponent.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Blueprint/BP_DemoDisplay.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Blueprint/BP_DemoDisplay.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Blueprint/BP_DemoDisplay_Enum.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Blueprint/BP_DemoDisplay_Enum.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Materials/DefaultTextMaterialTranslucentUnlit.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Materials/DefaultTextMaterialTranslucentUnlit.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Materials/MF_FancyOccludedPixels.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Materials/MF_FancyOccludedPixels.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall_Inst.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall_Inst.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall_Inst2.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall_Inst2.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall_Inst_3.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall_Inst_3.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall_Inst_BaseFloor_Inst.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall_Inst_BaseFloor_Inst.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall_Inst_NamePlate.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Materials/M_DemoWall_Inst_NamePlate.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Materials/M_FancyGlow.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Materials/M_FancyGlow.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Materials/M_FancyGlowFade.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Materials/M_FancyGlowFade.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Meshes/SM_Base.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Meshes/SM_Base.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Meshes/SM_Base2.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Meshes/SM_Base2.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Meshes/SM_BaseRoom.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Meshes/SM_BaseRoom.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Meshes/SM_Base_FlatWall.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Meshes/SM_Base_FlatWall.uasset
--- a/src/Content/VRKeyboards/DemoRoom/Meshes/SM_NamePlate.uasset
+++ b/src/Content/VRKeyboards/DemoRoom/Meshes/SM_NamePlate.uasset
--- a/src/Content/VRKeyboards/Maps/DemoMap.umap
+++ b/src/Content/VRKeyboards/Maps/DemoMap.umap
--- a/src/Content/VRKeyboards/Maps/DemoMap_BuiltData.uasset
+++ b/src/Content/VRKeyboards/Maps/DemoMap_BuiltData.uasset
--- a/src/Content/VRKeyboards/Maps/DemoMap_DrumKeyboard.umap
+++ b/src/Content/VRKeyboards/Maps/DemoMap_DrumKeyboard.umap
--- a/src/Content/VRKeyboards/Maps/DemoMap_DrumKeyboard_BuiltData.uasset
+++ b/src/Content/VRKeyboards/Maps/DemoMap_DrumKeyboard_BuiltData.uasset
--- a/src/Content/VRKeyboards/Maps/DemoMap_PointAndClick.umap
+++ b/src/Content/VRKeyboards/Maps/DemoMap_PointAndClick.umap
--- a/src/Content/VRKeyboards/Materials/Keyboards/Drum/M_DrumButton.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/Drum/M_DrumButton.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/Drum/M_DrumMallot.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/Drum/M_DrumMallot.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/KeyboardBackground/MI_KeyboardBG.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/KeyboardBackground/MI_KeyboardBG.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/M_KeyboardButton_Master.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/M_KeyboardButton_Master.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_BackSpace_Normal.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_BackSpace_Normal.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_BackSpace_Pressed.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_BackSpace_Pressed.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Browser_Normal.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Browser_Normal.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Browser_Pressed.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Browser_Pressed.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_CapsLock_Normal.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_CapsLock_Normal.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_CapsLock_Pressed.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_CapsLock_Pressed.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_ChangeTheme_Normal.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_ChangeTheme_Normal.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_ChangeTheme_Pressed.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_ChangeTheme_Pressed.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_ChatBox_Normal.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_ChatBox_Normal.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_ChatBox_Pressed.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_ChatBox_Pressed.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Enter_Normal.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Enter_Normal.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Enter_Pressed.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Enter_Pressed.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Keyboard_Normal.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Keyboard_Normal.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Keyboard_Pressed.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/SpecialButtons/MI_Keyboard_Pressed.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/StandardButton/MI_StandardButton_Normal.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/StandardButton/MI_StandardButton_Normal.uasset
--- a/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/StandardButton/MI_StandardButton_Pressed.uasset
+++ b/src/Content/VRKeyboards/Materials/Keyboards/PointAndClick/StandardButton/MI_StandardButton_Pressed.uasset
--- a/src/Content/VRKeyboards/Meshes/Keyboards/Drum/Plane.uasset
+++ b/src/Content/VRKeyboards/Meshes/Keyboards/Drum/Plane.uasset
--- a/src/Content/VRKeyboards/Meshes/Keyboards/Drum/SM_Button.uasset
+++ b/src/Content/VRKeyboards/Meshes/Keyboards/Drum/SM_Button.uasset
--- a/src/Content/VRKeyboards/Meshes/Keyboards/Drum/SM_Shape_Cube.uasset
+++ b/src/Content/VRKeyboards/Meshes/Keyboards/Drum/SM_Shape_Cube.uasset
--- a/src/Content/VRKeyboards/Textures/PointAndClick/ChatBox_Blank.uasset
+++ b/src/Content/VRKeyboards/Textures/PointAndClick/ChatBox_Blank.uasset
--- a/src/Content/VRKeyboards/Textures/PointAndClick/T_BackspaceIcon_Blank.uasset
+++ b/src/Content/VRKeyboards/Textures/PointAndClick/T_BackspaceIcon_Blank.uasset
--- a/src/Content/VRKeyboards/Textures/PointAndClick/T_BrowserIcon_Blank.uasset
+++ b/src/Content/VRKeyboards/Textures/PointAndClick/T_BrowserIcon_Blank.uasset
--- a/src/Content/VRKeyboards/Textures/PointAndClick/T_BrowserIcon_Blank2.uasset
+++ b/src/Content/VRKeyboards/Textures/PointAndClick/T_BrowserIcon_Blank2.uasset
--- a/src/Content/VRKeyboards/Textures/PointAndClick/T_CapslockButton_Blank.uasset
+++ b/src/Content/VRKeyboards/Textures/PointAndClick/T_CapslockButton_Blank.uasset
--- a/src/Content/VRKeyboards/Textures/PointAndClick/T_ChangeThemeIcon.uasset
+++ b/src/Content/VRKeyboards/Textures/PointAndClick/T_ChangeThemeIcon.uasset
--- a/src/Content/VRKeyboards/Textures/PointAndClick/T_ChangeThemeIcon_Pressed.uasset
+++ b/src/Content/VRKeyboards/Textures/PointAndClick/T_ChangeThemeIcon_Pressed.uasset
--- a/src/Content/VRKeyboards/Textures/PointAndClick/T_EnterIcon_Blank.uasset
+++ b/src/Content/VRKeyboards/Textures/PointAndClick/T_EnterIcon_Blank.uasset
--- a/src/Content/VRKeyboards/Textures/PointAndClick/T_KeyboardBG_Blank.uasset
+++ b/src/Content/VRKeyboards/Textures/PointAndClick/T_KeyboardBG_Blank.uasset
--- a/src/Content/VRKeyboards/Textures/PointAndClick/T_KeyboardIcon_Blank.uasset
+++ b/src/Content/VRKeyboards/Textures/PointAndClick/T_KeyboardIcon_Blank.uasset
--- a/src/Content/VRKeyboards/Textures/PointAndClick/T_StandardButton_Blank.uasset
+++ b/src/Content/VRKeyboards/Textures/PointAndClick/T_StandardButton_Blank.uasset
--- a/src/Content/VRKeyboards/VRTemplate/Geometry/Meshes/1M_Cube.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/Geometry/Meshes/1M_Cube.uasset
--- a/src/Content/VRKeyboards/VRTemplate/Geometry/Meshes/1M_Cube_Chamfer.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/Geometry/Meshes/1M_Cube_Chamfer.uasset
--- a/src/Content/VRKeyboards/VRTemplate/Geometry/Meshes/CubeMaterial.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/Geometry/Meshes/CubeMaterial.uasset
--- a/src/Content/VRKeyboards/VRTemplate/Geometry/Meshes/TemplateFloor.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/Geometry/Meshes/TemplateFloor.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Animations/MannequinHand_Right_CanGrab.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Animations/MannequinHand_Right_CanGrab.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Animations/MannequinHand_Right_Grab.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Animations/MannequinHand_Right_Grab.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Animations/MannequinHand_Right_Open.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Animations/MannequinHand_Right_Open.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Animations/RightGrip_BS.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Animations/RightGrip_BS.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Materials/M_HandMat.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Materials/M_HandMat.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_PhysicsAsset.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_PhysicsAsset.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_Skeleton.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_Skeleton.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Textures/UE4_Mannequin_MAT_MASKA.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Textures/UE4_Mannequin_MAT_MASKA.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Textures/UE4_Mannequin__normals.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Mannequin/Character/Textures/UE4_Mannequin__normals.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/GenericHMDMaterial.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/GenericHMDMaterial.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MF_OccludedPixels.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MF_OccludedPixels.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MI_BaseMaterial2.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MI_BaseMaterial2.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MI_BaseMaterial3.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MI_BaseMaterial3.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MI_ChaperoneOutline.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MI_ChaperoneOutline.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MI_SmallCubes.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MI_SmallCubes.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MI_TeleportCylinderPreview.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/MI_TeleportCylinderPreview.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/M_ArcEndpoint.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/M_ArcEndpoint.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/M_BaseMaterial.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/M_BaseMaterial.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/M_SplineArcMat.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/M_SplineArcMat.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/M_TeleportPreviews.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/M_TeleportPreviews.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/TeleportMCP.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Materials/TeleportMCP.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Meshes/1x1_cube.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Meshes/1x1_cube.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Meshes/BeaconDirection.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Meshes/BeaconDirection.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Meshes/BeamMesh.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Meshes/BeamMesh.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Meshes/GenericHMD.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Meshes/GenericHMD.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualReality/Meshes/SM_FatCylinder.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualReality/Meshes/SM_FatCylinder.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualRealityBP/Blueprints/BP_MotionController.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualRealityBP/Blueprints/BP_MotionController.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualRealityBP/Blueprints/GripEnum.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualRealityBP/Blueprints/GripEnum.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualRealityBP/Blueprints/MotionControllerHaptics.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualRealityBP/Blueprints/MotionControllerHaptics.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset
--- a/src/Content/VRKeyboards/VRTemplate/VirtualRealityBP/Blueprints/PickupActorInterface.uasset
+++ b/src/Content/VRKeyboards/VRTemplate/VirtualRealityBP/Blueprints/PickupActorInterface.uasset
--- a/src/VRClassroom.uproject
+++ b/src/VRClassroom.uproject
 {
 	"FileVersion": 3,
+<<<<<<< HEAD
 	"EngineAssociation": "{0506F437-410D-A1AD-0DE5-36A1D1C0C5F7}",
+=======
+	"EngineAssociation": "{7E4506D0-4E9A-9CE5-C703-1FAFBE0E6174}",
+>>>>>>> 50f7ad7d559929fa644f71b77304290f2c4d15cf
 	"Category": "",
 	"Description": "",
 	"Modules": [