Merge pull request 'mergebranch' (#3) from mergebranch into main

Reviewed-on: #3
2024-05-26 19:03:25 +00:00
parent 98b2e5d1ad 723de18aa4
commit 9a84f66b13
10 changed files with 18 additions and 18 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -213,7 +213,7 @@ bEnableUniversalAPK=True
 bBundleABISplit=True
 bBundleLanguageSplit=True
 bBundleDensitySplit=True
-ExtraApplicationSettings=<meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2|questpro|quest3" />
+ExtraApplicationSettings=<meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2|questpro" />
 ExtraActivitySettings=
 bAndroidVoiceEnabled=False
 bEnableMulticastSupport=False
--- a/Content/Blueprints/BP_Ballista_Projectile.uasset
+++ b/Content/Blueprints/BP_Ballista_Projectile.uasset
--- a/Content/Blueprints/BP_Ballista_v2.uasset
+++ b/Content/Blueprints/BP_Ballista_v2.uasset
--- a/Content/Models/Ballista_bolt.uasset
+++ b/Content/Models/Ballista_bolt.uasset
--- a/Content/Models/Ballista_bow.uasset
+++ b/Content/Models/Ballista_bow.uasset
--- a/Content/Models/Ballista_frame.uasset
+++ b/Content/Models/Ballista_frame.uasset
--- a/Content/VRTemplate/Blueprints/GrabComponent.uasset
+++ b/Content/VRTemplate/Blueprints/GrabComponent.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/VRTowerDefense.uproject
+++ b/VRTowerDefense.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "5.4",
+	"EngineAssociation": "5.3",
 	"Category": "",
 	"Description": "",
 	"Plugins": [