From 1c80ebaab4b23354c1cea869e4e9b43fd2e3cecb Mon Sep 17 00:00:00 2001 From: Viljam Ilves Date: Sun, 26 May 2024 21:42:03 +0300 Subject: [PATCH] Merge commit --- Config/DefaultEngine.ini | 2 +- Content/Blueprints/BP_Ballista_Projectile.uasset | 4 ++-- Content/Blueprints/BP_Ballista_v2.uasset | 4 ++-- Content/Models/Ballista_bolt.uasset | 4 ++-- Content/Models/Ballista_bow.uasset | 4 ++-- Content/Models/Ballista_frame.uasset | 4 ++-- Content/VRTemplate/Blueprints/GrabComponent.uasset | 4 ++-- Content/VRTemplate/Blueprints/VRPawn.uasset | 4 ++-- Content/VRTemplate/Maps/VRTemplateMap.umap | 4 ++-- VRTowerDefense.uproject | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 7ca93eb..c2d7c6c 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -213,7 +213,7 @@ bEnableUniversalAPK=True bBundleABISplit=True bBundleLanguageSplit=True bBundleDensitySplit=True -ExtraApplicationSettings= +ExtraApplicationSettings= ExtraActivitySettings= bAndroidVoiceEnabled=False bEnableMulticastSupport=False diff --git a/Content/Blueprints/BP_Ballista_Projectile.uasset b/Content/Blueprints/BP_Ballista_Projectile.uasset index 1c2ed9e..091912f 100644 --- a/Content/Blueprints/BP_Ballista_Projectile.uasset +++ b/Content/Blueprints/BP_Ballista_Projectile.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b800a7e672a56060d79e11eeb96284cdd9c1807dca82adc13327390acfe0c8d3 -size 74312 +oid sha256:574f83544875d9f89c2a617c3bf5ca607cf374bab80c317e09d238ee4dfce6c2 +size 83027 diff --git a/Content/Blueprints/BP_Ballista_v2.uasset b/Content/Blueprints/BP_Ballista_v2.uasset index fa07300..cc57cfd 100644 --- a/Content/Blueprints/BP_Ballista_v2.uasset +++ b/Content/Blueprints/BP_Ballista_v2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80451d72378abefbe966fe5ac4e981315649663c1248246b744dbe34623ef820 -size 190331 +oid sha256:5cfc713afab86bc2deb70059d675d443bc9ab1ce190e6c310d991428f1c6ef63 +size 189177 diff --git a/Content/Models/Ballista_bolt.uasset b/Content/Models/Ballista_bolt.uasset index 3ac4a22..bb4eada 100644 --- a/Content/Models/Ballista_bolt.uasset +++ b/Content/Models/Ballista_bolt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d13c3296fb41f5c64aacea90f094eba61b63afac42695be0ffec5ccf3f53163 -size 24934 +oid sha256:ed34443aae35dd6f0a8ab64be7b30093bc71b4c338b890011d21e5f15a17fa83 +size 23717 diff --git a/Content/Models/Ballista_bow.uasset b/Content/Models/Ballista_bow.uasset index d9b0908..b49f5c3 100644 --- a/Content/Models/Ballista_bow.uasset +++ b/Content/Models/Ballista_bow.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e2df8d98e928a9b0e268d0ff5c609ee65f7c1bce740737323b93288db9a348b -size 39317 +oid sha256:2bf9711684667553cb6eb0f25e52576092d5d697700356036ba2c248600b8772 +size 54766 diff --git a/Content/Models/Ballista_frame.uasset b/Content/Models/Ballista_frame.uasset index 3c0f780..27a3fa3 100644 --- a/Content/Models/Ballista_frame.uasset +++ b/Content/Models/Ballista_frame.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:411ca9b6288d8f3ddf56d8b9740f16b4598d82496099decea2bbba8ec3be3760 -size 49334 +oid sha256:a16b9034de6ee4ed43c8c5bc7673359d8e2cc45d001d021910cbc20c0e4f4d9a +size 72665 diff --git a/Content/VRTemplate/Blueprints/GrabComponent.uasset b/Content/VRTemplate/Blueprints/GrabComponent.uasset index af7b905..d30150d 100644 --- a/Content/VRTemplate/Blueprints/GrabComponent.uasset +++ b/Content/VRTemplate/Blueprints/GrabComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab566b5e4620dfafafc6d105d8df0e0c710978348f4fdd2e3267a7c75ea7b13e -size 532257 +oid sha256:bd923e9386fa8b4c636cfbd2e9d4f1e8b0711e5319b28867a6da8edaf4d5a44f +size 527829 diff --git a/Content/VRTemplate/Blueprints/VRPawn.uasset b/Content/VRTemplate/Blueprints/VRPawn.uasset index 5207e15..eb54746 100644 --- a/Content/VRTemplate/Blueprints/VRPawn.uasset +++ b/Content/VRTemplate/Blueprints/VRPawn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b40080274bb176f857455d69d315688b135d76fd5b0c0ebb7c1f5b3b996a906a -size 1312719 +oid sha256:b72f604c2deb7a4e3b375cfee868ba7be0ce5d543c909b23fdfd405eede51c10 +size 1313634 diff --git a/Content/VRTemplate/Maps/VRTemplateMap.umap b/Content/VRTemplate/Maps/VRTemplateMap.umap index 5f0f7f1..61d9de9 100644 --- a/Content/VRTemplate/Maps/VRTemplateMap.umap +++ b/Content/VRTemplate/Maps/VRTemplateMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eaa8ad34f3636f359bfbf5fb1a04e9525618d7ab0d29910d72e1c527a0a396f7 -size 146970 +oid sha256:7904afd93260cdb9b2cf9512081966b753b9392858cc25562ff4247116553acc +size 143136 diff --git a/VRTowerDefense.uproject b/VRTowerDefense.uproject index 7f089d5..703d191 100644 --- a/VRTowerDefense.uproject +++ b/VRTowerDefense.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.3", + "EngineAssociation": "5.4", "Category": "", "Description": "", "Plugins": [ -- 2.25.1