Merge branch 'master' of https://cgvrgit.ulno.net/valdisoo/VR_RageRoom

2025-05-02 17:01:15 +03:00
parent adc276605d 2b9e3ba6e5
commit aa34302c50
10 changed files with 22 additions and 13 deletions
--- a/Content/Characters/MannequinsXR/Meshes/SKM_MannyXR_left_Physics.uasset
+++ b/Content/Characters/MannequinsXR/Meshes/SKM_MannyXR_left_Physics.uasset
--- a/Content/Characters/MannequinsXR/Meshes/SKM_MannyXR_right_Physics.uasset
+++ b/Content/Characters/MannequinsXR/Meshes/SKM_MannyXR_right_Physics.uasset
--- a/Content/TimerWidget.uasset
+++ b/Content/TimerWidget.uasset
--- a/Content/VRTemplate/Blueprints/GrabComponent.uasset
+++ b/Content/VRTemplate/Blueprints/GrabComponent.uasset
--- a/Content/VRTemplate/Blueprints/GrabType.uasset
+++ b/Content/VRTemplate/Blueprints/GrabType.uasset
--- a/Content/VRTemplate/Blueprints/VRCharacter.uasset
+++ b/Content/VRTemplate/Blueprints/VRCharacter.uasset
--- a/Content/VRTemplate/Blueprints/VRGameMode.uasset
+++ b/Content/VRTemplate/Blueprints/VRGameMode.uasset
--- a/Content/VRTemplate/Blueprints/VRPawn.uasset
+++ b/Content/VRTemplate/Blueprints/VRPawn.uasset
--- a/Content/VRTemplate/Maps/VRTemplateMap.umap
+++ b/Content/VRTemplate/Maps/VRTemplateMap.umap
--- a/VRProject.uproject
+++ b/VRProject.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "{B9242CCE-49E4-6414-2863-E49B90D56B73}",
+	"EngineAssociation": "{E7F2F287-4A8F-0C62-8DF2-44B195CFFAA0}",
 	"Category": "",
 	"Description": "",
 	"Plugins": [