Merge branch 'main' into mergebranch

revert 1c80ebaab4
revert Merge commit
2024-05-26 19:02:37 +00:00 · 2024-05-26 19:01:38 +00:00 · 2024-05-26 18:52:14 +00:00 · 2024-05-26 21:42:03 +03:00
8 changed files with 16 additions and 16 deletions
--- 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
Author	SHA1	Message	Date
Villui	723de18aa4	Merge branch 'main' into mergebranch	2024-05-26 19:02:37 +00:00
Villui	bb82cc5da7	revert `1c80ebaab4` revert Merge commit	2024-05-26 19:01:38 +00:00
Villui	98b2e5d1ad	Merge pull request 'Merge commit' (#1 ) from mergebranch into main Reviewed-on: #1	2024-05-26 18:52:14 +00:00
Viljam Ilves	1c80ebaab4	Merge commit	2024-05-26 21:42:03 +03:00