From c6e2c203aae1d551de65803b107eeb7b05792a11 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 9 May 2025 14:52:47 +0200 Subject: [PATCH 01/56] Rewrote Slice/Midi System as Midi per Note Data is limited --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/DT_MidiEvents.uasset | 3 +++ .../Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset | 4 ++-- .../Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset | 4 ++-- .../Content/Audio/MIdi_HarmonixPlugin/TestSong/asd.uasset | 3 --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/DT_MidiEvents.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/asd.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index edf2536..894a99f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afdd12d1f567393244b604e9432ca80013ba0bf96ed6665341d71a14a66acb7b -size 894513 +oid sha256:62427d97267c700beb332ebe7b8f414548481f805879a6036ed2d0eb892cb808 +size 885198 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index c46e0ea..b21c6c2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f18a620176b563a705a21e7ebf18364a4075689a9a3f8469876f2c01c92e6167 -size 365979 +oid sha256:f4dc3e964a6247d9f693c8b00aa002f5f602fd5fe642c8efd32310dc47be0fb1 +size 371259 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/DT_MidiEvents.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/DT_MidiEvents.uasset new file mode 100644 index 0000000..a91bdfd --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/DT_MidiEvents.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21a4442aca5b146da95af3b2d48caeb4e32b5f4f8bcd1666992c921a97e6e376 +size 8321 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset index 33b5eea..0e5c3ce 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17df7eb98167ee247a9988e7833059254aff8207ac7547a390e1cfd085d791e7 -size 386877 +oid sha256:aa08e1f21177fc6a71f25a61eaeb44c046b553a97408c9d803ce406d1ee2117d +size 295679 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset index daf1897..2957b53 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a177b427b765d8823ed923f020062ed3bb389e7c5db73adbd81ec1218089cfc -size 4563 +oid sha256:1b0b8b90cb067b8d16e8a87d329d0c61a92fb569ff863111b511390e6cbf84bc +size 4635 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/asd.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/asd.uasset deleted file mode 100644 index 5f4b68f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/asd.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d7196dc1680abb7d7f9cf412d06c2882aec4be1961f403119b0115c9f028960 -size 3765 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index cb5e86d..7257891 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d1e8cea61949721884e83f8535599a7b50f1576c1a419eb1104397a7f137ac0 +oid sha256:7f8c5b9475e644df04446d59289dd45d9e1c05a5a1a581e7d0490aa8ffdabb95 size 54438 From 21bddafc63f1f273be8ccb219db6429d3a495f51 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Mon, 12 May 2025 15:56:05 +0200 Subject: [PATCH 02/56] Misc Fixes on Slicegame, Building a Gamestart System --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- .../MIdi_HarmonixPlugin/TestSong/WB_StartSliceGame.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/UI/MainMenu/WB_Button.uasset | 4 ++-- .../Content/UI/MainMenu/WB_Button_StyleMain.uasset | 4 ++-- .../Content/VRE/Core/Character/BP_Trace_Controller.uasset | 4 ++-- 8 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_StartSliceGame.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index 894a99f..4a5ab8c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62427d97267c700beb332ebe7b8f414548481f805879a6036ed2d0eb892cb808 -size 885198 +oid sha256:1bff60b6e6ae602268ac8108ea1f9fbde2b2fafbcc14be6717eb90c5c72f5700 +size 846062 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index b21c6c2..4062b8c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4dc3e964a6247d9f693c8b00aa002f5f602fd5fe642c8efd32310dc47be0fb1 -size 371259 +oid sha256:01194e0a7b59e59b27ff46b4d3d6d7464b82ec8c86667b722df6a34162e4bc07 +size 541808 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index cd5fc06..90b4cb3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:146c7577731c4dc389ec00272e7ff9debcd2ae2ba4e263df5a40348a834d3e45 -size 33395 +oid sha256:a00d37df1f938ac0b73772a3d1d06ff799d534ba58fd8ad9578932f2ca3e0988 +size 33508 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_StartSliceGame.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_StartSliceGame.uasset new file mode 100644 index 0000000..cc0b57c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_StartSliceGame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bfa30e1c265857e497e8d47715eb41a877f4c88036ebe16bfdb3ba813c05330 +size 34016 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 7257891..c9a6718 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f8c5b9475e644df04446d59289dd45d9e1c05a5a1a581e7d0490aa8ffdabb95 -size 54438 +oid sha256:fb3daa9541026317d557c7472be0a48f2c7692e9f516589c3c3b3f8734319431 +size 54940 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button.uasset index 7e3eae3..7f0d698 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b0bed14d35353a4cdf20593203c625269eeafc7292d8e67da78a487d3835a25 -size 232603 +oid sha256:0d03547abf62d1335cc3ae29f048e5e6d8dfd8356e2e32121d9daa474d25b711 +size 232202 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button_StyleMain.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button_StyleMain.uasset index 5e86ad5..9eb83ec 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button_StyleMain.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button_StyleMain.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6b805315a87ffd836fc557ea285c3009e8995f1816d4f419315014e080ffbfd -size 29685 +oid sha256:35904a1f2a58610d993b6c22af90955d6b6c8bfce3cd1ad3307d895454743daf +size 30781 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index bedd486..3b53cc6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d3254d603cc25fd6a8a17513f21e8cf7a9e11bc19b3ed7b376a99848988a104 -size 1811554 +oid sha256:d2fab41fdd6aaa6ac125962b23aad63fc9aca94a100757a7e7c5452f23a93979 +size 1821983 From 7fd7a5d2ad533640d943e4de5fb327ea95e0d265 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 13 May 2025 15:34:03 +0200 Subject: [PATCH 03/56] Work SliceGame, Startmechanics workjs now, Usability fixes --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset | 3 +++ .../MIdi_HarmonixPlugin/TestSong/WB_StartSliceGame.uasset | 3 --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_StartSliceGame.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index 4a5ab8c..baf2646 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bff60b6e6ae602268ac8108ea1f9fbde2b2fafbcc14be6717eb90c5c72f5700 -size 846062 +oid sha256:d84ffa0a9223d1176934119386cf312fc7426d7cfb5c6cfaa3b5d60dc6be9cc0 +size 850550 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index 4062b8c..3cf2d98 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01194e0a7b59e59b27ff46b4d3d6d7464b82ec8c86667b722df6a34162e4bc07 -size 541808 +oid sha256:ec4ca671f565ff613429d91bf13f737b856c3a3999f3b31f688c37d0b868cf66 +size 833592 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset new file mode 100644 index 0000000..bc55652 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35a5fde8317f882b4be75a66804b0de4f9bea6372a689fb17ee04597f7386044 +size 45846 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_StartSliceGame.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_StartSliceGame.uasset deleted file mode 100644 index cc0b57c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_StartSliceGame.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bfa30e1c265857e497e8d47715eb41a877f4c88036ebe16bfdb3ba813c05330 -size 34016 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index c9a6718..a6b2c40 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb3daa9541026317d557c7472be0a48f2c7692e9f516589c3c3b3f8734319431 -size 54940 +oid sha256:9305b10493709d5a25d33e2d8538329bbb019e7d3ca5e3ad04c2c8b3743a571d +size 55377 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 9dfc5e1..3bd973b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5eab2a9b4100759cd86c10c196e495bb75f6c988867fc600bde368d1e8e269d -size 1616181 +oid sha256:a31e9dd5961ff050dce827a9a90322cdec5b9ab4f093141c996e9b44d8870cf8 +size 1616327 From a47d7a9cf9ba045a3a78931c212cbba56469d32c Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Wed, 14 May 2025 15:40:42 +0200 Subject: [PATCH 04/56] Some work on the SliceGame (Health) and correcting Grips on the Recorder (mirror Axis) --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Animations/A_MannequinXR_GrabAnimationFist.uasset | 3 +++ .../VRHandMeshes/Animations/GrabAnimation.uasset | 4 ++-- .../VRHandMeshes/Meshes/A_MannequinsXR_TwoFingerPull.uasset | 3 +++ .../Interactibles/Electrical/Recorder/BP_Cassette.uasset | 4 ++-- .../Interactibles/Electrical/Recorder/BP_Recorder.uasset | 4 ++-- .../Furniture/Doors/MetalDoor/BP_SliderDoor.uasset | 4 ++-- 12 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/A_MannequinXR_GrabAnimationFist.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinsXR_TwoFingerPull.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index baf2646..74b45d2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d84ffa0a9223d1176934119386cf312fc7426d7cfb5c6cfaa3b5d60dc6be9cc0 -size 850550 +oid sha256:8cd85da102196e77d3f44e3bd95db1e88cc28ebc32d16ffb08e877d025a822b9 +size 819673 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index 3cf2d98..5b559f4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec4ca671f565ff613429d91bf13f737b856c3a3999f3b31f688c37d0b868cf66 -size 833592 +oid sha256:1049b575cfc6a855cfb80e8f3993948db91d298499984b9d954821c744fc1b48 +size 766369 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset index bc55652..6bcc300 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35a5fde8317f882b4be75a66804b0de4f9bea6372a689fb17ee04597f7386044 -size 45846 +oid sha256:abe639e7137c49e4f86bcdc7ee5794f2f63ac25ab887fa4a4443b73231a381d2 +size 42730 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 27bcfc9..bf9649e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c263e95ff8aa91a11032b6bdd5384188c27a09c040e55b1a4a76e1896e27b8e5 -size 606007 +oid sha256:c4087c0ab319fc51e8690dd45a6d48e8239753b19cb316f7ebcbf5dbb3e8efa1 +size 637296 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index a6b2c40..e920d15 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9305b10493709d5a25d33e2d8538329bbb019e7d3ca5e3ad04c2c8b3743a571d -size 55377 +oid sha256:cd00e479629d658175886941dfce4c4532b0f6dc63577e0e5029ffaca7b956c5 +size 55678 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 3bd973b..d299a45 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a31e9dd5961ff050dce827a9a90322cdec5b9ab4f093141c996e9b44d8870cf8 -size 1616327 +oid sha256:e1de712400a0c00c42202fab9196f89937980bfe8e1589039c2065311d67837f +size 1617854 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/A_MannequinXR_GrabAnimationFist.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/A_MannequinXR_GrabAnimationFist.uasset new file mode 100644 index 0000000..970c890 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/A_MannequinXR_GrabAnimationFist.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4ae94cb50ac541aaae78ca7ffa323af87883429e6b7809b6eb351bb7bf86b24 +size 54389 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/GrabAnimation.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/GrabAnimation.uasset index 7b5b519..b8068ef 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/GrabAnimation.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/GrabAnimation.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29d60663acdcf836b1f18af8160e55605eed835f7860998f77bf8c5c64b935e7 -size 18098 +oid sha256:6a7146154aac6ba15f90376e90d5776676e592cd6b9a6bc8c3eb9f983206da26 +size 1733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinsXR_TwoFingerPull.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinsXR_TwoFingerPull.uasset new file mode 100644 index 0000000..2e2f8f5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinsXR_TwoFingerPull.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2ebff62229729b127a38117492f4220f524366642c5401e484ae55d14945da5 +size 69996 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset index 690fc74..3b0da13 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be5374bdc0c866347ff1065558c16f82aa627ee3310ec81812e475a4f2e325a2 -size 50891 +oid sha256:a4bf7c04c4cc959ef75b7fed0762e2319453487d837130a8740020880c80fee0 +size 51650 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset index d3da03a..6c274f7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:817d63d7f4fb2bbe7530b2df0107cc16c8358ab83ca38b5a977ae8c1a245f567 -size 260751 +oid sha256:3b1d1fc65b1a67d26e02e7d08538c84465deabc434d8676541dd519c729dc7cf +size 347233 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset index 7e1b998..eaea6ac 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6551f28d6cacb11857b3223733f99216655c6b0a0e848fef3ff5a0da4f53f557 -size 280020 +oid sha256:4d50a4544e17bf874bd915acaa3bd26a37884dee9766fa8ff7230177eaa10f5e +size 281424 From eca83406f10865a1c0362aa1f5fb850d2b46f4b0 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 3 Jun 2025 17:49:42 +0200 Subject: [PATCH 05/56] Misc Changes to SliceGame, Added Gloabal Audio Component to Gamestate --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor.uasset | 4 ++-- .../MIdi_HarmonixPlugin/TestSong/M_CrossFloor_Inst.uasset | 2 +- .../Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset | 4 ++-- .../Content/Core/BP_GlobalMusicManager.uasset | 3 +++ .../Content/Core/BP_VRGameState.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/Map_TestInstancedMolecules.umap | 3 +++ .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Content/UI/MainMenu/Logo/BP_Logo.uasset | 3 --- .../UI/MainMenu/UI_Materials/M_ButtonHover_Inst.uasset | 3 --- .../Content/UI/MainMenu/UI_Materials/TestWidget.uasset | 3 --- .../Content/UI/MainMenu/UI_Sound/MenuHover.uasset | 3 --- .../Content/VRE/Core/VRGameMode.uasset | 4 ++-- .../Content/World/VFX/Projector/MI_Projector.uasset | 3 +++ .../Content/World/VFX/Projector/MI_SliceTest.uasset | 3 +++ .../Content/World/VFX/Projector/M_Projector.uasset | 4 ++-- .../Content/World/VFX/Projector/M_Projector_Inst.uasset | 4 ++-- 20 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/BP_GlobalMusicManager.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/BP_VRGameState.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Maps/Map_TestInstancedMolecules.umap delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/Logo/BP_Logo.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/M_ButtonHover_Inst.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/TestWidget.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MenuHover.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_Projector.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_SliceTest.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index 74b45d2..3203098 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cd85da102196e77d3f44e3bd95db1e88cc28ebc32d16ffb08e877d025a822b9 -size 819673 +oid sha256:75a33bd81d9345924d571ecc5d83fa85c77e30503c96d72abf415fe75f5baeb4 +size 810597 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index 5b559f4..f98c207 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1049b575cfc6a855cfb80e8f3993948db91d298499984b9d954821c744fc1b48 -size 766369 +oid sha256:12b52567efcfe9d3d4254c7cf7b0abb3ccd437f650734fad7c61ff60e298daf8 +size 767573 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset index 0e5c3ce..9f5953d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa08e1f21177fc6a71f25a61eaeb44c046b553a97408c9d803ce406d1ee2117d -size 295679 +oid sha256:26f929f3d1bf8b7e22b237a7785bf0d12a7102d7dbffbd03b2ac09e4d7d0026d +size 283448 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor.uasset index f8bc964..514e477 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fc87ec476ffe0b5886e9440c7da6ccd466df67bebe74ec2a00d8411b2d8e0a7 -size 26784 +oid sha256:4af4b7087ace72c117adf04ac0ded847d346ce1aa8587d1d560ec6e2b95cad62 +size 27186 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor_Inst.uasset index 863ff01..a95f6fa 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2b3207052e7b0000d7a68e07979bedd979bdce9a204e68126693c0806629f3c +oid sha256:5912cef7e08ed0334b484da583ff979c3b24e9f2da3b86cb1ef4b39d8e79e7cd size 13876 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset index 2957b53..fe4c06d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b0b8b90cb067b8d16e8a87d329d0c61a92fb569ff863111b511390e6cbf84bc -size 4635 +oid sha256:db70615acbe34c61ecf1cde789816f8beca70d2faca56ea1720ba3471a8532cf +size 5326 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_GlobalMusicManager.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_GlobalMusicManager.uasset new file mode 100644 index 0000000..6e4c273 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_GlobalMusicManager.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e908d6676237abe6178c6bf8cb520774f7d6f70df56c5becc41b1ec00a3b2a4e +size 30793 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_VRGameState.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_VRGameState.uasset new file mode 100644 index 0000000..4face57 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_VRGameState.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f9a8e03eb9b18713b3a7769b581ae00c945d2312764710f73f6389fa0922ad7 +size 21638 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index e920d15..48885e6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd00e479629d658175886941dfce4c4532b0f6dc63577e0e5029ffaca7b956c5 -size 55678 +oid sha256:60ba7a72fb2d19f03ccd3516f854b42d3f35daae52bf8a081c5d75f6becc75ae +size 59439 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_TestInstancedMolecules.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_TestInstancedMolecules.umap new file mode 100644 index 0000000..d24fc74 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_TestInstancedMolecules.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98f8f88f076bb7a9be683e8c4ff85ac7be4c1075f4d38c2a17595786c0e78987 +size 6767 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index d299a45..cf599e8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1de712400a0c00c42202fab9196f89937980bfe8e1589039c2065311d67837f -size 1617854 +oid sha256:963604a268a0deb1779918f039a8d5f4c9ce593bb3261da88b58aac8ef1494a7 +size 1617846 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/Logo/BP_Logo.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/Logo/BP_Logo.uasset deleted file mode 100644 index 7c8f253..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/Logo/BP_Logo.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28df46f41ee60f8492cadbe5f42cb1ebc5f4e52690b0cbb31abafe5e093d3377 -size 66489 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/M_ButtonHover_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/M_ButtonHover_Inst.uasset deleted file mode 100644 index 425a302..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/M_ButtonHover_Inst.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fbc57da2e7613e3e4ee9852114fdc230ba2dd1826b742f6405faf393e18cd107 -size 29401 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/TestWidget.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/TestWidget.uasset deleted file mode 100644 index d320c20..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/TestWidget.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ba18f91e28a6c9a91c8c2d457bb9f5f405ec8a5e37de7bdf0540f582d72e6e3 -size 25782 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MenuHover.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MenuHover.uasset deleted file mode 100644 index 617ea5c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MenuHover.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf51cf13105bf2ec527e1bfca6045373f1e9e8251e79f4c5248597d580b97736 -size 45510 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameMode.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameMode.uasset index ed10686..f48e7db 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameMode.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff2a09974e04b0cb5e29b828479eab8d9eeb50a464db264533519340783ebcf1 -size 26008 +oid sha256:52d6e590826d51c2da4979e456de3c0750a041fdfbb4f583c6580f336275bbf8 +size 28295 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_Projector.uasset new file mode 100644 index 0000000..82c2c83 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_Projector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5655dd1097508875fe3a5a4df5bb81404370e541607ed468f2b5637868671e18 +size 22811 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_SliceTest.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_SliceTest.uasset new file mode 100644 index 0000000..0eef19d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_SliceTest.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff56836b7eb36e8d8ea038cde4280acad96e5b46dc38d739c7530fe741cd3809 +size 10837 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector.uasset index 07b7144..1de70f1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8874d7f21769e477686a3bd76cf4b90ce6d86d0a06aff641f0a14829c5f450eb -size 33871 +oid sha256:f12167d851cd437f102830b31fd5edb94a0e41c0210e42f5e3fb4db20e29d25a +size 33947 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector_Inst.uasset index b7b265c..b0e1fd8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b03a3969df24f55ee3188d7578d34a43279ab4a4d2c562a7fed60a6023d2dd7f -size 16695 +oid sha256:3f148f5628344cd928aaa44d9a63f96742e89a51a1b87c9abfaa5a8b1de8fd18 +size 1588 From db31b30ad85688c540a2d0a535ed87400f070d61 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 6 Jun 2025 13:13:02 +0200 Subject: [PATCH 06/56] Computer was down for broken Graphics Card, so late update (misc) --- VIRTUOS_ExpansionPluginTests/Content/Maps/EMpty/NewWorld.umap | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Outside_Default.umap | 4 ++-- .../Content/Maps/Map_Room_Kitchen.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../VRHandMeshes/Meshes/A_MannequinXR_TwoFingerGrab.uasset | 3 +++ .../VRHandMeshes/Meshes/A_MannequinsXR_TwoFingerPull.uasset | 3 --- .../Misc/Examples/DrawerBase/Locker/Cabinet1.uasset | 4 ++-- .../Misc/Examples/DrawerBase/Locker/LockerBody.uasset | 4 ++-- .../Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset | 4 ++-- .../Interactibles/FreezingChamber/BP_FreezingChamber.uasset | 4 ++-- .../World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset | 4 ++-- .../World/Static/Furniture/BookShelfLarge/BOoksshlef.uasset | 3 +++ .../World/Static/Furniture/StorageShelf/Furniture7.uasset | 3 +++ .../StorageShelf/MergedBake_StorageShelf_PBR_Diffuse.uasset | 3 --- .../StorageShelf/MergedBake_StorageShelf_PBR_Mat.uasset | 4 ++-- .../StorageShelf/MergedBake_StorageShelf_PBR_Normal.uasset | 3 --- .../Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset | 4 ++-- 19 files changed, 37 insertions(+), 31 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Maps/EMpty/NewWorld.umap create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinXR_TwoFingerGrab.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinsXR_TwoFingerPull.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/BookShelfLarge/BOoksshlef.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/Furniture7.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Diffuse.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Normal.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/EMpty/NewWorld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/EMpty/NewWorld.umap new file mode 100644 index 0000000..387a8d8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/EMpty/NewWorld.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2384ab119ba0b9620ef9f2d4a6de2af08b0c4ecb190b7d5617f1483e6a73b62d +size 6677 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index bf9649e..c36c74c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4087c0ab319fc51e8690dd45a6d48e8239753b19cb316f7ebcbf5dbb3e8efa1 -size 637296 +oid sha256:e797116219b10c6e3067d8c111bbe0324dfe89e2b4d637938614f20d37f1ed0a +size 477774 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index 65f30b4..6edfdbf 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90ba846d38a56cf8b77ca644997c5741dd83456bf08920b357ee5f75c96a636e -size 18449 +oid sha256:3b66fe408cc6b34d099059b3e7af07793340f93b9d8d8594f3d59ec5a8c58eaa +size 20981 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index c093fd5..fc47554 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4de2b31057968ab2b690cacac28f5da172c4a7d2c46a2d2c254d16b4685cd439 -size 9257 +oid sha256:182347fdfb12785e2ea2841b5b18c0df7dcc7e3829e3131dbf7a96a29778bdef +size 135935 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap new file mode 100644 index 0000000..fcf7d97 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98449a5e585ea635e85461c01fab7dcac92719700fe1d53649e25ad87cf8f222 +size 55509 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 5af439a..1ca25dd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7940d7ba3df039310e9a1ded0a08a7de2da0ba67acb281e1439f0cc7228d53fa -size 132180 +oid sha256:92c964949d1a9dd00187645697bb4579957263a71445c85522dd27304b624074 +size 132626 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinXR_TwoFingerGrab.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinXR_TwoFingerGrab.uasset new file mode 100644 index 0000000..57494e4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinXR_TwoFingerGrab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65e55e048a557609dc32545aa3ef0bb22e1e19f3e8e5d8b46f1ade2fa4932a77 +size 84615 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinsXR_TwoFingerPull.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinsXR_TwoFingerPull.uasset deleted file mode 100644 index 2e2f8f5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinsXR_TwoFingerPull.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2ebff62229729b127a38117492f4220f524366642c5401e484ae55d14945da5 -size 69996 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset index 5bc9b50..042730f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f0087acf45130e43f64ef709573a736d8101152923d61809bb452a7d0798fd1 -size 84647 +oid sha256:6bec3bdc8d9d73f11ffb56cc09a66e92d53ff23ba8df94ee82af7f032eeaa3da +size 85039 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/LockerBody.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/LockerBody.uasset index f1ff7d2..7cee4f0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/LockerBody.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/LockerBody.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1822d084f6b0f74c9c5db0df0863385829651c6a02a7ee0288687c65b379309c -size 109886 +oid sha256:4a542106e66b321d29bbf627540746bc72fff8da5c386c46e9c4fec6bf942336 +size 114220 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index d1dcb35..75966ca 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9be1536edac86f8f17aa87ec4ffd1c68bf203c782e0831a5020e0d53867e2fb -size 5624872 +oid sha256:efb47ee87d1b5e90642646e19936a1481e02b276b3f0794547af6abff4c49c43 +size 5635331 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset index fe1c876..4deb4c5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:142e0b4e2b87118cc699d12f63ba6e9c9a6193959397a03a0b6259bb302b191e -size 40870 +oid sha256:755ddbc7d903257846d3b1c6ef574af7b8212fd3b46540d1791328ede60ee1e4 +size 68891 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset index a965466..067eb1d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b37894731dbfcea4290ae3e6a224a268b37f800ebcdcd1649a081b51209ba702 -size 229879 +oid sha256:358a278ad3d9245e25997dfb27b32e83d508ff72e4a65a14ae62c163e5792d5f +size 229854 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/BookShelfLarge/BOoksshlef.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/BookShelfLarge/BOoksshlef.uasset new file mode 100644 index 0000000..9978cb0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/BookShelfLarge/BOoksshlef.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17e8c86104abf639af39684268873dd945ca7189c4890e2c1905266629db6a70 +size 89963 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/Furniture7.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/Furniture7.uasset new file mode 100644 index 0000000..e5b955c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/Furniture7.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:201583dc9d05118c8a45af0c10c4ebc44c78c01d220bae79003969c2e2acb2e0 +size 203684 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Diffuse.uasset deleted file mode 100644 index 75f5e8a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2870e9d71d7a1191c0feac3b552a773b003eeabc4bc6518b3b15fd1d541cbd53 -size 29683621 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Mat.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Mat.uasset index 98cf9b0..da5e6d1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Mat.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Mat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f89f8a6050b9aac4cc37fab98bc70c753c7a9c81a45e4e28fbf2ea4cb7c0a34 -size 13513 +oid sha256:3ebc10b3483a0e37e944e26a3f2cc338199a19455207d3e9b09ad28c00dae521 +size 18051 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Normal.uasset deleted file mode 100644 index b940e80..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bc10b86fa5b38daf99d60307da5fef65d72b22e6f4bccab73506c8edf1a0cda -size 77890804 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset index 7ae1e05..55efa3f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00b8295b5a4ea8aa61d8c68b9ff42c6528f8f28801a69e00444e92cfd8619c45 -size 12801 +oid sha256:e239bf899fdabb214b4d072136e49807600d9e94b8ab9652e26a33d75ebd0d6e +size 13472 From 732c20e958ef76d480d0ab87fc8e6f4529327f42 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 13 Jun 2025 14:35:18 +0200 Subject: [PATCH 07/56] Changed Sword, Work on Weapon Trail --- VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini | 2 +- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- .../MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/Map_Stream_MachineRoom.umap | 3 +++ .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Weapons/SciFiKatana/Corp_Bake1_PBR_Diffuse.uasset | 3 +++ .../SciFiKatana/Corp_Bake1_PBR_Emission_Strength.uasset | 3 +++ .../Weapons/SciFiKatana/Corp_Bake1_PBR_Metalness.uasset | 3 +++ .../Weapons/SciFiKatana/Corp_Bake1_PBR_Roughness.uasset | 3 +++ .../Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset | 3 +++ .../Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset | 3 +++ 13 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Emission_Strength.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Metalness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Roughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini index 67cc6e4..4f9fc16 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini @@ -7,7 +7,7 @@ +Profiles=(ProfileName="Default",DirectionalLightIntensity=2.620000,DirectionalLightColor=(R=0.990000,G=0.839850,B=0.732600,A=1.000000),SkyLightIntensity=0.880000,bRotateLightingRig=False,bShowEnvironment=True,bShowFloor=True,EnvironmentCubeMapPath="",PostProcessingSettings=(bOverride_WhiteTemp=True,bOverride_WhiteTint=False,bOverride_ColorSaturation=True,bOverride_ColorContrast=True,bOverride_ColorGamma=True,bOverride_ColorGain=True,bOverride_ColorOffset=True,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_FilmWhitePoint=False,bOverride_FilmSaturation=False,bOverride_FilmChannelMixerRed=False,bOverride_FilmChannelMixerGreen=False,bOverride_FilmChannelMixerBlue=False,bOverride_FilmContrast=False,bOverride_FilmDynamicRange=False,bOverride_FilmHealAmount=False,bOverride_FilmToeAmount=False,bOverride_FilmShadowTint=False,bOverride_FilmShadowTintBlend=False,bOverride_FilmShadowTintAmount=False,bOverride_FilmSlope=True,bOverride_FilmToe=True,bOverride_FilmShoulder=True,bOverride_FilmBlackClip=True,bOverride_FilmWhiteClip=True,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomIntensity=True,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_AutoExposureMethod=True,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=True,bOverride_AutoExposureMaxBrightness=True,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=True,bOverride_HistogramLogMin=True,bOverride_HistogramLogMax=True,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=True,bOverride_GrainIntensity=False,bOverride_GrainJitter=False,bOverride_AmbientOcclusionIntensity=True,bOverride_AmbientOcclusionStaticFraction=True,bOverride_AmbientOcclusionRadius=True,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionDistance=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=True,bOverride_AmbientOcclusionBias=True,bOverride_AmbientOcclusionQuality=True,bOverride_AmbientOcclusionMipBlend=True,bOverride_AmbientOcclusionMipScale=True,bOverride_AmbientOcclusionMipThreshold=True,bOverride_LPVIntensity=False,bOverride_LPVDirectionalOcclusionIntensity=False,bOverride_LPVDirectionalOcclusionRadius=False,bOverride_LPVDiffuseOcclusionExponent=False,bOverride_LPVSpecularOcclusionExponent=False,bOverride_LPVDiffuseOcclusionIntensity=False,bOverride_LPVSpecularOcclusionIntensity=False,bOverride_LPVSize=False,bOverride_LPVSecondaryOcclusionIntensity=False,bOverride_LPVSecondaryBounceIntensity=False,bOverride_LPVGeometryVolumeBias=False,bOverride_LPVVplInjectionBias=False,bOverride_LPVEmissiveInjectionIntensity=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=True,bOverride_ColorGradingLUT=True,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=True,bOverride_DepthOfFieldMaxBokehSize=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_DepthOfFieldMethod=True,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldBokehShape=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldColorThreshold=False,bOverride_DepthOfFieldSizeThreshold=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ScreenPercentage=False,bOverride_ScreenSpaceReflectionIntensity=True,bOverride_ScreenSpaceReflectionQuality=True,bOverride_ScreenSpaceReflectionMaxRoughness=True,bOverride_ScreenSpaceReflectionRoughnessScale=False,WhiteTemp=6700.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.005000,Y=0.005000,Z=0.005000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionShadowsMax=0.090000,ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,FilmWhitePoint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),FilmShadowTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),FilmShadowTintBlend=0.500000,FilmShadowTintAmount=0.000000,FilmSaturation=1.000000,FilmChannelMixerRed=(R=1.000000,G=0.000000,B=0.000000,A=1.000000),FilmChannelMixerGreen=(R=0.000000,G=1.000000,B=0.000000,A=1.000000),FilmChannelMixerBlue=(R=0.000000,G=0.000000,B=1.000000,A=1.000000),FilmContrast=0.030000,FilmToeAmount=1.000000,FilmHealAmount=0.180000,FilmDynamicRange=4.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,BloomIntensity=1.000000,BloomThreshold=1.000000,BloomSizeScale=4.000000,Bloom1Size=1.000000,Bloom2Size=4.000000,Bloom3Size=16.000000,Bloom4Size=32.000000,Bloom5Size=64.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom2Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom3Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom4Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom5Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom6Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),BloomDirtMaskIntensity=1.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),BloomDirtMask=None,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,AutoExposureMethod=AEM_Histogram,AutoExposureLowPercent=80.000000,AutoExposureHighPercent=98.300003,AutoExposureMinBrightness=1.000000,AutoExposureMaxBrightness=1.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,AutoExposureBias=0.330000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.161468,GrainJitter=0.000000,GrainIntensity=0.000000,AmbientOcclusionIntensity=1.000000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=73.477997,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionDistance=80.000000,AmbientOcclusionPower=1.200000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=100.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,ColorGradingIntensity=0.000000,ColorGradingLUT=Texture2D'/Engine/EditorResources/RGBTable16x1_AssetViewer.RGBTable16x1_AssetViewer',DepthOfFieldMethod=DOFM_BokehDOF,bMobileHQGaussian=False,DepthOfFieldFstop=4.000000,DepthOfFieldSensorWidth=24.576000,DepthOfFieldFocalDistance=1000.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldMaxBokehSize=15.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldBokehShape=None,DepthOfFieldOcclusion=0.400000,DepthOfFieldColorThreshold=1.000000,DepthOfFieldSizeThreshold=0.080000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurPerObjectSize=0.500000,LPVIntensity=1.000000,LPVVplInjectionBias=0.640000,LPVSize=5312.000000,LPVSecondaryOcclusionIntensity=0.000000,LPVSecondaryBounceIntensity=0.000000,LPVGeometryVolumeBias=0.384000,LPVEmissiveInjectionIntensity=1.000000,LPVDirectionalOcclusionIntensity=0.000000,LPVDirectionalOcclusionRadius=8.000000,LPVDiffuseOcclusionExponent=1.000000,LPVSpecularOcclusionExponent=7.000000,LPVDiffuseOcclusionIntensity=1.000000,LPVSpecularOcclusionIntensity=1.000000,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=100.000000,ScreenSpaceReflectionMaxRoughness=1.000000,ScreenPercentage=100.000000,WeightedBlendables=(Array=),Blendables=),bPostProcessingEnabled=True,LightingRigRotation=109.389069,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-39.999985,Yaw=-67.500015,Roll=0.000000)) [/Script/AdvancedPreviewScene.SharedProfiles] -+Profiles=(ProfileName="Epic Headquarters",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=1.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=1.000000,bRotateLightingRig=False,bShowEnvironment=True,bShowFloor=True,bShowGrid=False,EnvironmentColor=(R=0.200000,G=0.200000,B=0.200000,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/EpicQuadPanorama_CC+EV1.EpicQuadPanorama_CC+EV1",bPostProcessingEnabled=True,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=True,bShowMeshEdges=False) ++Profiles=(ProfileName="Epic Headquarters",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=1.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=1.000000,bRotateLightingRig=False,bShowEnvironment=True,bShowFloor=False,bShowGrid=False,EnvironmentColor=(R=0.200000,G=0.200000,B=0.200000,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/EpicQuadPanorama_CC+EV1.EpicQuadPanorama_CC+EV1",bPostProcessingEnabled=True,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=True,bShowMeshEdges=False) +Profiles=(ProfileName="Grey Wireframe",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=1.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=1.000000,bRotateLightingRig=False,bShowEnvironment=False,bShowFloor=False,bShowGrid=True,EnvironmentColor=(R=0.039216,G=0.039216,B=0.039216,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/EpicQuadPanorama_CC+EV1.EpicQuadPanorama_CC+EV1",bPostProcessingEnabled=False,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=False,bShowMeshEdges=True) [/Script/UnrealEd.EditorPerformanceProjectSettings] diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index 90b4cb3..ced6dd0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a00d37df1f938ac0b73772a3d1d06ff799d534ba58fd8ad9578932f2ca3e0988 -size 33508 +oid sha256:094052db0416d47ad653a809581112800cb1db1c57ed95bf0ea122cf3b5a7f88 +size 30692 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset new file mode 100644 index 0000000..1d9c7e6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:130aaf25ac75e23d51223b8431265df767fb99adc5d7366a3a5dc59cb943d316 +size 175574 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index c36c74c..84ec0a1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e797116219b10c6e3067d8c111bbe0324dfe89e2b4d637938614f20d37f1ed0a -size 477774 +oid sha256:422b77f2af5b3d6088a20df004480558b3700c1edc0f17edbe1b14783662f632 +size 474309 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 48885e6..edeff38 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60ba7a72fb2d19f03ccd3516f854b42d3f35daae52bf8a081c5d75f6becc75ae -size 59439 +oid sha256:f289bd15752a11f3f9dd79d53beca448828c6b2a25d8b5642ba04949207c1fe3 +size 60809 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap new file mode 100644 index 0000000..0db4d8c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba89907a8cc8252d9aec1ee275601526e452440d91dd2ecb23d20f838c663d8d +size 22144 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index cf599e8..5722e35 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:963604a268a0deb1779918f039a8d5f4c9ce593bb3261da88b58aac8ef1494a7 -size 1617846 +oid sha256:d5085905e234feab717a2c9f304593ed0e0ead97c6059309637bb1fbfcc810e0 +size 1620090 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..1c95ee6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ca1628ad7eab12731dbab1fcc1faa9f44056ebe89dfda8b46f99517d1b8b361 +size 151172 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Emission_Strength.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Emission_Strength.uasset new file mode 100644 index 0000000..ad9673b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Emission_Strength.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:715cea92a1606ea68a9387f90778adaa09693c18ec01dcaa823c36b99cd3a314 +size 69147 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Metalness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Metalness.uasset new file mode 100644 index 0000000..ce1776b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Metalness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a82092b04ea7def67c9c35621929cf0aa3d8fccdd32a266e30e32a86014da36b +size 67353 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Roughness.uasset new file mode 100644 index 0000000..7d21c39 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78c7dcefa518dd6951e830fb4b2cddce2f80691a63010cde4536a3ffc291e8e9 +size 76435 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset new file mode 100644 index 0000000..f1d9649 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7d42de363e0d31f9731a6fc4a84dad384cfc99b0cd83e2ef2fe4e04073d5178 +size 21381 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset new file mode 100644 index 0000000..74c88b0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e561118954774625522efc114e62ccf1bcdbd73527c942fd02a95d6b2409328 +size 253892 From 2b4aaceb177d1c3476254763e9ba07191da368c1 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Mon, 16 Jun 2025 18:03:59 +0200 Subject: [PATCH 08/56] Weapon Trail --- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/GetOwnerSpeed.uasset | 3 +++ .../Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset | 3 +++ .../MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset | 4 ++-- 6 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/GetOwnerSpeed.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index ced6dd0..72c9196 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:094052db0416d47ad653a809581112800cb1db1c57ed95bf0ea122cf3b5a7f88 -size 30692 +oid sha256:d581dd2171fc7ea12fafce8f57cee49895d5ed986cae23b90238468dd1d6e660 +size 69870 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/GetOwnerSpeed.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/GetOwnerSpeed.uasset new file mode 100644 index 0000000..5c225e7 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/GetOwnerSpeed.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb1578d482d4c20a37a02a7f316da5af175a8ed906962b035d89e59d7b283733 +size 20382 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset new file mode 100644 index 0000000..8a37c06 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:619296add26d6bce0fa48045a30c09e6913121cdacf9dcb5df8216193e180524 +size 23482 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset index 1d9c7e6..bb646b9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:130aaf25ac75e23d51223b8431265df767fb99adc5d7366a3a5dc59cb943d316 -size 175574 +oid sha256:b2f3b4419780abfe717a17593c6a4510da299c0be39e8d947e1b6422534660f9 +size 194151 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index edeff38..47db8ff 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f289bd15752a11f3f9dd79d53beca448828c6b2a25d8b5642ba04949207c1fe3 -size 60809 +oid sha256:3ffade7f894fc844aafaf55a55e0ea7c661a580587fac9ef613c1c9d724bdeb0 +size 61958 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset index 74c88b0..852f95f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e561118954774625522efc114e62ccf1bcdbd73527c942fd02a95d6b2409328 -size 253892 +oid sha256:138fba8d0dcbfaa389abc4a6270cf81d764ffdfb7804ec3f745d700d86ea8a81 +size 254227 From 096a7a94208f4ca0630ce236e800f80156574af4 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 17 Jun 2025 14:35:47 +0200 Subject: [PATCH 09/56] Added Captcha, Misc --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Room_Kitchen.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Misc/Examples/Button/CaptchaButtonComponent.uasset | 3 +++ .../World/Interactibles/Captchas/BP_BaseCaptcha.uasset | 3 +++ .../Content/World/Materials/Master/M_WorldAlignedBump.uasset | 2 +- .../World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset | 4 ++-- .../World/Materials/StoneTiles/tiles_0130_height_4k.uasset | 4 ++-- .../Content/World/Static/Furniture/Shelf01/Shelf_01.uasset | 4 ++-- 14 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index 3203098..31fb86a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75a33bd81d9345924d571ecc5d83fa85c77e30503c96d72abf415fe75f5baeb4 -size 810597 +oid sha256:2a6b9f1a972fbb718df7880917801d331472c35c3ab9acae490b71f5fc1d516f +size 817560 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index f98c207..1c0ed20 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12b52567efcfe9d3d4254c7cf7b0abb3ccd437f650734fad7c61ff60e298daf8 -size 767573 +oid sha256:194262c43317b7d5550ef60113921b0eea88a5ca0b6bec57d6b19b8b4bd35e16 +size 764569 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index 72c9196..42c47c0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d581dd2171fc7ea12fafce8f57cee49895d5ed986cae23b90238468dd1d6e660 -size 69870 +oid sha256:f8aae6b8cd6f149cb9908e34f5c00b4cb4cdde54f40d6f7db7adf9e48d41280f +size 73439 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset index 8a37c06..e8228c8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:619296add26d6bce0fa48045a30c09e6913121cdacf9dcb5df8216193e180524 -size 23482 +oid sha256:dc5fc04bbf4ed572ac9414d1fb81fac56bbf4b511b537779fc98c92eab7fa165 +size 24691 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 84ec0a1..41d59a0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:422b77f2af5b3d6088a20df004480558b3700c1edc0f17edbe1b14783662f632 -size 474309 +oid sha256:ed4a9efda5f84e0035d9a320f8fa93612a80b25ac841aff84ab5ca5f104ca4df +size 457533 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index fc47554..3aaaf99 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:182347fdfb12785e2ea2841b5b18c0df7dcc7e3829e3131dbf7a96a29778bdef -size 135935 +oid sha256:3f40364a19f7c2df8e7cba1a2b93ad74f563f93a2375d13c9a6556df5458caf3 +size 148750 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 47db8ff..4a602f8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ffade7f894fc844aafaf55a55e0ea7c661a580587fac9ef613c1c9d724bdeb0 -size 61958 +oid sha256:f40d53d98185318ae988fe34990dc2d9f991fb55462a6695f182c303732ed235 +size 62469 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 1ca25dd..20f3fd7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92c964949d1a9dd00187645697bb4579957263a71445c85522dd27304b624074 -size 132626 +oid sha256:1407a09796b8e7219ed8c15f46dc8d2e0a92676c60d21e51bba7c88d74e60c44 +size 154957 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset new file mode 100644 index 0000000..65ef079 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2722a8e09fde2d5794dc1ee73d8ae148d3a263a08b9070d83f4cf8ca7485bf2e +size 45879 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset new file mode 100644 index 0000000..5a764eb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7cf67baae45f4915720db60933244037ac6a47b5a6ad22c2423af3d0b557ff4 +size 109271 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset index 27354c2..e03400a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93163bc9acb6955ed1d446f2e7169f122daa6329ace48b8cb7c2d02b9358d206 +oid sha256:5b6595f4335e7a62fab61f02da6641ee2d471a11ac9631320d9b6c072862be63 size 96380 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset index f3959b4..469cfde 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f4242831ac396c4ba9c0a4eb09c0b66f524194a6d4baa04795185c1ed6be5da -size 18879 +oid sha256:d8acdfa955b7783811637c14911f8d1116ec32da78fd00a29b3075cfcb275b5c +size 19262 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/tiles_0130_height_4k.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/tiles_0130_height_4k.uasset index 8467aa3..24326a3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/tiles_0130_height_4k.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/tiles_0130_height_4k.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f6a6b9b74398b61fe07ada8edd404b009c1e6a05954403dbef12e887692342f -size 9461764 +oid sha256:e157aa5b532a24ce3db2004f4fcd9df48bff5fe6ff1408816f6048ea80793ac5 +size 9466574 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/Shelf01/Shelf_01.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/Shelf01/Shelf_01.uasset index cd36f79..2f0951b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/Shelf01/Shelf_01.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/Shelf01/Shelf_01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba8db114df8d10c9e0b77e7a98e49db9a3dc785ad61337a5384026a9f13d85eb -size 59581 +oid sha256:c2c4d067b4d61941d492b75f0107f16d37e06484ae45674054882b3225ee94cf +size 59130 From 2eac213deb39cdd5cd2c05dffe02fdcdb2d4b542 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Sat, 28 Jun 2025 14:15:59 +0200 Subject: [PATCH 10/56] Captcha Door --- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Misc/Examples/Button/CaptchaButtonComponent.uasset | 4 ++-- .../World/Interactibles/Captchas/BP_BaseCaptcha.uasset | 4 ++-- .../Content/World/Interactibles/Captchas/M_Captcha.uasset | 3 +++ .../World/Interactibles/Captchas/M_Captcha_Inst.uasset | 3 +++ .../Content/World/Interactibles/Captchas/Untitled-1.uasset | 3 +++ .../Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset | 3 +++ .../Content/World/Interactibles/Electrical/Doors/Cube.uasset | 3 +++ .../World/Interactibles/Electrical/Doors/Cube_001.uasset | 3 +++ .../World/Interactibles/Electrical/Doors/Cube_002.uasset | 3 +++ .../Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset | 3 +++ .../Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset | 3 +++ .../Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset | 3 +++ .../World/Interactibles/Electrical/Doors/NewMaterial.uasset | 3 +++ .../Interactibles/Electrical/Generator/BP_Generator.uasset | 4 ++-- 17 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha_Inst.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/Untitled-1.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_001.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_002.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/NewMaterial.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index 1c0ed20..4387d34 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:194262c43317b7d5550ef60113921b0eea88a5ca0b6bec57d6b19b8b4bd35e16 -size 764569 +oid sha256:bbfe334a9573c51f208c99634ea6424b8bb6b8ec989c9cc2e9f407adf7e02850 +size 765750 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 41d59a0..9469af8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed4a9efda5f84e0035d9a320f8fa93612a80b25ac841aff84ab5ca5f104ca4df -size 457533 +oid sha256:141f6d09c2f387d10a0405f9a3e3d2bcd90052ace6aa0ffcf5b239b598e6c23d +size 478508 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 20f3fd7..8215694 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1407a09796b8e7219ed8c15f46dc8d2e0a92676c60d21e51bba7c88d74e60c44 -size 154957 +oid sha256:becbab6951dec4c7e2485e23bf67d79c13accf65c87715355b6e842906b70b3d +size 149629 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset index 65ef079..3ebd06d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2722a8e09fde2d5794dc1ee73d8ae148d3a263a08b9070d83f4cf8ca7485bf2e -size 45879 +oid sha256:af361fae4b8642150f282d8f1869e8bcbad6dc0ba2d3cb18182da2190620f374 +size 36186 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset index 5a764eb..81d1e6f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7cf67baae45f4915720db60933244037ac6a47b5a6ad22c2423af3d0b557ff4 -size 109271 +oid sha256:82179f888d9f208fcc7b7a2e8f9215682435964b9c8cdbb0c0f442e22a8751b0 +size 193707 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset new file mode 100644 index 0000000..26d3111 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:886df15472895255aceb343481994ed7081f4048c8b248ce146f274c3266c97a +size 24861 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha_Inst.uasset new file mode 100644 index 0000000..207d2a2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbd03ff241afeea661aedeb952a3a5c748630dbda01fe36a7941de1a14800413 +size 12023 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/Untitled-1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/Untitled-1.uasset new file mode 100644 index 0000000..8e0411c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/Untitled-1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e29b5c7bf0f9a2ba6d158ca2abf3e1c594080ac3a9f37dd7d9ff8c4d998f0c1d +size 169674 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset new file mode 100644 index 0000000..9b2539f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0767af7f646a2f76672d22b022ab49f1553032b7e65af4044ae2de146ff90c17 +size 66937 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube.uasset new file mode 100644 index 0000000..90d0c4d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04ea9a2549ae4c594a4ef4534b0651874db69a5a24fe7bfc7eb693d6f7918091 +size 74593 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_001.uasset new file mode 100644 index 0000000..62b9300 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1053f1659705b9a98c42fd5fd2e69b180b51cadee378c555f8cd253f4f1ebf4 +size 58990 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_002.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_002.uasset new file mode 100644 index 0000000..e60d3a3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10ad76a08c8bd989747bcd84ebb6423aed37bcae4014812c54147186fa4b9d2e +size 79443 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..390eb53 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea762696a57538ec2ecf77f9f735bea10eda1016b131a120010a17a01c57657a +size 18763797 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset new file mode 100644 index 0000000..1d5bebf --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a797009fec205efdfea0c003dff1cbad7623bdcfee471e48daa30831288745ae +size 83266079 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset new file mode 100644 index 0000000..d34a630 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f9d0ccaac0f1e6fcb97ae258d50ce642d16b704e0b8b2ffc0afd0a3db087afa +size 17848784 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/NewMaterial.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/NewMaterial.uasset new file mode 100644 index 0000000..f82fd7c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/NewMaterial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dda27355b295a03cf961a23e247ec7b0c72b23654ed889fdfc63a820069c5c3 +size 18859 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset index 7d187ba..5879891 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b3775c2e5fd2ce7f610fa6612732b551cc0ac839bc7d9e7c4d3a6cee4476148 -size 46325 +oid sha256:3db99065b2fe5879ff5f910187739ce6c7e9f67c3b8edeb40a9c54eb5ac059e8 +size 46235 From b327fd6faabac0dc296069be39e4a0bfbc5bb626 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Wed, 2 Jul 2025 20:32:35 +0200 Subject: [PATCH 11/56] Lots of fixes on Clarice and Gilbert --- VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini | 1 + .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset | 4 ++-- .../VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../Content/World/Characters/Clarice/BP_Clarice.uasset | 4 ++-- .../Content/World/Characters/CustomAIController.uasset | 4 ++-- .../World/Characters/Gilbert/BP_GilbertThirdPerson.uasset | 4 ++-- .../NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset | 4 ++-- .../NewFolder/Animations/Test/Gilbert_Actions__Jump.uasset | 4 ++-- .../Animations/Test/Gilbert_Actions__WalkBackwward.uasset | 4 ++-- .../Animations/Test/Gilbert_Actions__WalkForward.uasset | 4 ++-- .../Animations/Test/Gilbert_Actions__WalkLeft.uasset | 4 ++-- .../Animations/Test/Gilbert_Actions__WalkRight.uasset | 4 ++-- .../Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/GilbertAnimBP.uasset | 3 +++ .../World/Characters/Gilbert/NewFolder/GilbertMesh.uasset | 3 --- .../World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset | 4 ++-- .../Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset | 4 ++-- .../Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset | 4 ++-- .../Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/Material_004.uasset | 3 --- .../World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset | 3 +++ .../World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset | 3 +++ .../Gilbert/NewFolder/WatercanRobot3_Cube_008.uasset | 3 --- .../Content/World/Characters/Gilbert/NewFolder/gloss.uasset | 3 --- .../Content/World/Characters/Gilbert/NewFolder/normal.uasset | 3 --- 27 files changed, 46 insertions(+), 51 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertAnimBP.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Material_004.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/WatercanRobot3_Cube_008.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/gloss.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/normal.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini index 39bb7ef..90b4f5e 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini @@ -173,6 +173,7 @@ bSendAnonymousUsageDataToEpic=False +DefaultChannelResponses=(Channel=ECC_GameTraceChannel4,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="TossableTrace") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel5,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="UI") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel6,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="CharacterSphere") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel7,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="CharacterProp") +EditProfiles=(Name="PhysicsActor",CustomResponses=((Channel="VRTraceChannel"))) +EditProfiles=(Name="BlockAllDynamic",CustomResponses=((Channel="VRTraceChannel"))) -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 5722e35..5f4dd6c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5085905e234feab717a2c9f304593ed0e0ead97c6059309637bb1fbfcc810e0 -size 1620090 +oid sha256:6cb95604d988ffd2e8d971d2cd8d79ade07857ce9b2913040cb8259ea59e897c +size 1695813 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index 75966ca..eaee4f6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efb47ee87d1b5e90642646e19936a1481e02b276b3f0794547af6abff4c49c43 -size 5635331 +oid sha256:c46b0d46bdb2e93c1f0725bb29e960dddcba2213ff7c3b6791be8d967c4c9054 +size 5637387 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset index ada61c7..f730a3f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b8836e2f24974e56fddcc78bf24694f41a57d5699dae728be51ce7c6cc55412 -size 2543406 +oid sha256:de8d71e5d3491d8e7365c86590d55a730f61046ae5a3c445c72c007fb679cce6 +size 2545075 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 44a62b7..8b64905 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1029e4eed6b4dde09e6b6635c01697c978a805b59bdaeb1d8d83f6d50b489017 -size 284935 +oid sha256:fe8b372263d002859ff05d4501c6b532114eb9569a8da7cdea9898e58859423c +size 286390 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index b3aa289..2da44b5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23636b9029ace66b88bbebcad08ae0ef88b7cdb38b3b1cbb4ca690616f96b32d -size 357348 +oid sha256:1766cd15bfe3f7714b0ef7d92fa33c2738e14f22a2c3380820b2fbf4a4ed2aa6 +size 356785 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset index 6d6350a..c90f58d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2e180be37a696f52b5bf00c3194f720fc169d80ead564a78a60312bee03474a -size 215383 +oid sha256:6eca3bb0dbb8e2f01ccbe16e0ec62f76c6b70458dfbea8c071d5e4d6e4740e4a +size 224608 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset index b39d01e..b6871c3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da996cc89f890b394aac745f0cf1d6abbcc2487f5f123c5c6ffd9157379bd5e0 -size 210177 +oid sha256:eaca46a89fe46258397002a8a1f3e38b4d158a8ddc8287be37c976cd4e95703c +size 218573 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset index d13e9a6..bda5a8b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:482e3ffd7858e13ec8884478025abd1c4173e6856d50b2cce3e6a77da9d1af17 -size 213657 +oid sha256:95f4885585e53aa35ba8c7ad14fb598e5033054dca7f0afe2cdc165186e6bee5 +size 219424 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Jump.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Jump.uasset index ae39fa0..8fe6dc9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Jump.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Jump.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df97a36de90e1db04aa5ad852738fda3719cfa9ad350347c13fdfaae1990613a -size 136212 +oid sha256:64c1382dc15bafe5eb9950c846610d8906b1b0cea939b6b56736740689c66c60 +size 142006 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset index ca4f4ec..9673ec0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76c38fae80c39b08feecdb3bc5a5341466c164d6d80e7dcb0b6e2cd20c42b5da -size 196656 +oid sha256:a8ac54db2c291067c4e730e987029c45dce847d5085d3015ad50f290c2cea700 +size 202516 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset index 792c306..7cfce77 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0217346f18f4ab8dc407580b80b49267ad1074d323fd0debf497b32bd252a4de -size 195831 +oid sha256:c5f5059055a5a5b9490df9a2fe648a2fe0f31b21f5cd6ec480f808c771832abe +size 201679 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset index 092afbc..66c6871 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd853012f614f8f119070d541fd697b6d0838e7eeff64809282123c9a6fd09cb -size 192590 +oid sha256:43249951e902da1cc74b72bc0130d7e9155d8a980d3564b401e543a1096af3a1 +size 198313 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset index a187c22..99b4312 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c60c18ed9e89007c38b010a15d484a747001aca98efe415efe8d683d5facac76 -size 192601 +oid sha256:e4e455000db9c9e8552efcd7a0ff4a0f9eea30179cf5b2bf2a63c7eedd7c6f31 +size 198457 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset index 5e82818..3068778 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2103d37669223d51ed3d07c38948d601a05ff20b512afaf5035c4061eb6a8b9 -size 31157 +oid sha256:bccc6ec32be3f963bde1bf1b406ad831a2eff4bcb2a87d1723e0701b7baff378 +size 33146 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertAnimBP.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertAnimBP.uasset new file mode 100644 index 0000000..008b810 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertAnimBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8c2698b6b5b11df1a5c6bc1b0cf3e7b286427c7ea965995533c3f8a246f2e9e +size 61965 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh.uasset deleted file mode 100644 index 0b587d2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fcf1745bf071502376bc3de90a959b4f96ee6e001a5d13f71f2a913e3d79bb3b -size 2409429 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset index 9886bea..6bc8e81 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0dc57cb7df5b057c04850dd0adcc2247c279f78c5751475d863ef6ce2903a573 -size 56353 +oid sha256:8f6e934906e869097a9c2b1bb83df72e8e1cbd36e58f7f3be92b7e9a238b8097 +size 56954 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset index 7cc544f..2e1fc8f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8066791f09f41a7f398dc7c4711bdcb8277e3f071c8658f9d8777c2396a6381 -size 54403 +oid sha256:35792cbc97f730cfe434cf084141fec43b5a6baf0d249b26fe9fe02a813e75d2 +size 54711 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset index 96d301a..9ccfa59 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c55d3722861500b885e47b78563fb70d2784297bb394cca4601f85008e9eb1fc -size 16301 +oid sha256:d70ca240f4fe710302a8006fb030019ab328aeee46c67b68ce01953259384ce8 +size 17020 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset index 1e1421e..c4d192c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cccc0e4562e5cf5e1215ee7cc4fa6be1ae18c92dc3466608769004d8c90b2754 -size 231618 +oid sha256:558f983e517673f4f3db034b828c06b4f1e1dee3c162376b5cee001f029b690d +size 252209 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Material_004.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Material_004.uasset deleted file mode 100644 index de452b1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Material_004.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae1fad0d4ff1c82285d5647be69845737ebc3ba059bc15bf46d00cf79913f289 -size 52698 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset new file mode 100644 index 0000000..36015b5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94594ab8831af98fa6f627007f0d84bb46e007175598cbd9600a89f952a0e5c4 +size 2409736 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset new file mode 100644 index 0000000..f6fe29d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e5f07668727e3328efab2f7645b5999b10fa849fe58cb226745743810e82645 +size 391032 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/WatercanRobot3_Cube_008.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/WatercanRobot3_Cube_008.uasset deleted file mode 100644 index 1f086b6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/WatercanRobot3_Cube_008.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0ff288497361a48a44df6efdcdd33a3d93b708c7852fb67e5780e4d76cbeda7 -size 1087490 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/gloss.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/gloss.uasset deleted file mode 100644 index 8d965ca..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/gloss.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48af078e8ab583aca90fcd202b2a9623faef148b147621dc8072ea17ba99cd34 -size 1483811 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/normal.uasset deleted file mode 100644 index 1ee4eb5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7879e557937d30961993a8892b0d2e83da85b602e69169ecad0c4bc2b75c8a23 -size 4511544 From 2d15abf70e4e6599b5955b117c1ec580dd78ed33 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Wed, 2 Jul 2025 20:32:53 +0200 Subject: [PATCH 12/56] Addendum --- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset | 4 ++-- .../Content/World/Characters/BP_BaseCharacter.uasset | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 2 +- .../Content/World/Characters/Clarice/BP_Clarice.uasset | 4 ++-- .../World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset | 4 ++-- .../Content/World/Characters/CustomAIController.uasset | 4 ++-- .../World/Characters/Gilbert/BP_GilbertThirdPerson.uasset | 4 ++-- .../Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset | 4 ++-- .../Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset | 4 ++-- .../Content/World/Interactibles/PotionTest/PotionActor.uasset | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 5f4dd6c..4d93beb 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cb95604d988ffd2e8d971d2cd8d79ade07857ce9b2913040cb8259ea59e897c -size 1695813 +oid sha256:c93dfdf9cef647751bd9bb0d37ec72d6140cd8151be58dce1427de87dfb362ce +size 1696702 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index eaee4f6..411eb1a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c46b0d46bdb2e93c1f0725bb29e960dddcba2213ff7c3b6791be8d967c4c9054 -size 5637387 +oid sha256:0c41415a7814014d161505b16c156146c5252ca1fd47aeeff7d966ed870df51a +size 5645811 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset index 17f210c..2b683b7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfe7e82bef2758bb70ccbf82671cc0edfa4d0d5a4e0df22c1bd55d17d76de8dd -size 73443 +oid sha256:3539df9273aa487e8dbeaa83a5f3c03fde0664b1745c050101379b9df2782970 +size 75069 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 8b64905..9fd1fee 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe8b372263d002859ff05d4501c6b532114eb9569a8da7cdea9898e58859423c +oid sha256:d9cb5d090a29e15513184fae1ddd890be45878049c45ca74444bfeb00c92c445 size 286390 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index 2da44b5..5a4f690 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1766cd15bfe3f7714b0ef7d92fa33c2738e14f22a2c3380820b2fbf4a4ed2aa6 -size 356785 +oid sha256:175ce982a7a256a793a547a4bd4525f79ab4b85fe4fb0d68058f3d69759b9681 +size 362254 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset index 3337538..49a06e8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e4513d55fb3e0e3f74c3875697b51ff14ba961508dbcf6a152c649ca1694c97 -size 42292 +oid sha256:84059487710bca0564b0bff4d106a15d9dc141f8d6445f39b2a7def693b611ca +size 42365 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset index c90f58d..43e6da1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6eca3bb0dbb8e2f01ccbe16e0ec62f76c6b70458dfbea8c071d5e4d6e4740e4a -size 224608 +oid sha256:68247428043b52ea2a4a92f8dba4a37aba85646639acbe0462fe536ee182fd6c +size 231740 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset index b6871c3..991f04a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eaca46a89fe46258397002a8a1f3e38b4d158a8ddc8287be37c976cd4e95703c -size 218573 +oid sha256:e1c8f0385e625cc3ea22ad45f65b4508f9e2b33bde7c0ba71644e94b48434e25 +size 262225 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset index 3068778..c0ceaa5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bccc6ec32be3f963bde1bf1b406ad831a2eff4bcb2a87d1723e0701b7baff378 -size 33146 +oid sha256:a041aa670ba25995f4c53026ed133628ef131e43123b8992e01d9564e1b0de22 +size 36524 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset index c4d192c..5fd0b5b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:558f983e517673f4f3db034b828c06b4f1e1dee3c162376b5cee001f029b690d -size 252209 +oid sha256:2885add349f31c36e4b791a63a31f0b2538f6cd597d6b871dd5f7493e9800aee +size 243779 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/PotionTest/PotionActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/PotionTest/PotionActor.uasset index 7678037..bf0d830 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/PotionTest/PotionActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/PotionTest/PotionActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3881eaeb98f38e93c924cab270ad56120a24621c21add4bcf7adc9a47b0d12e9 -size 289242 +oid sha256:e60d732d7621d985e717656a8c6814222d51e48d35996dcba5ff2d244328a305 +size 293016 From ca1e9b6da2fef7bee94cfe4688d7658ea5ebaa5d Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Wed, 2 Jul 2025 23:40:03 +0200 Subject: [PATCH 13/56] Long night but fixed toss/grab issues on Clarice --- .../Content/Maps/MotionControllerMap.umap | 2 +- .../Content/VRE/Core/Character/BP_Trace_Controller.uasset | 4 ++-- .../Content/World/Characters/Clarice/BP_Clarice.uasset | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 4d93beb..3552f67 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c93dfdf9cef647751bd9bb0d37ec72d6140cd8151be58dce1427de87dfb362ce +oid sha256:dcb910fc4997b9a7b3f8ee954e4aa5feb2ac69b9e627a65895d22fe7744fb949 size 1696702 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index 3b53cc6..38b5cad 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2fab41fdd6aaa6ac125962b23aad63fc9aca94a100757a7e7c5452f23a93979 -size 1821983 +oid sha256:26fc81abea5e8c3a0cdafcc11cb1b498591b695ed3ce3e5dabc9f83f4e78d328 +size 1838619 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index 5a4f690..a7a59db 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:175ce982a7a256a793a547a4bd4525f79ab4b85fe4fb0d68058f3d69759b9681 -size 362254 +oid sha256:1164db074a041c9945182fd885e11f1aff21ddda4655b2419ba1583a6606e3f8 +size 387564 From 8c07468c20d509120282167fddf9016a21687d39 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Thu, 3 Jul 2025 23:00:17 +0200 Subject: [PATCH 14/56] Misc Character Optimization, Can Collision --- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../Content/World/Characters/Clarice/BP_Clarice.uasset | 4 ++-- .../Content/World/Characters/CustomAIController.uasset | 4 ++-- .../World/Characters/Gilbert/BP_GilbertThirdPerson.uasset | 4 ++-- .../Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset | 4 ++-- .../Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject | 4 ++++ 9 files changed, 20 insertions(+), 16 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 3552f67..ba37906 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcb910fc4997b9a7b3f8ee954e4aa5feb2ac69b9e627a65895d22fe7744fb949 -size 1696702 +oid sha256:4e0cb38a00ca18f04c381efd879fb4e00f9d2781208582b23d8386d7a8522f21 +size 1696623 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 9fd1fee..5a20705 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9cb5d090a29e15513184fae1ddd890be45878049c45ca74444bfeb00c92c445 -size 286390 +oid sha256:561049162d93c3492363722ca356fc459e86641de27f27f733a0075247e979f2 +size 275524 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index a7a59db..4a3714e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1164db074a041c9945182fd885e11f1aff21ddda4655b2419ba1583a6606e3f8 -size 387564 +oid sha256:41de03fce8deb5c04cba7681ed9f223030102b9d6727b335b710a4883debddde +size 417967 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset index 43e6da1..ac86bfd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68247428043b52ea2a4a92f8dba4a37aba85646639acbe0462fe536ee182fd6c -size 231740 +oid sha256:2404080c5421a4c7ff7667e17981287cf432e4d4f468e45f0e1976d57ee6af64 +size 230972 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset index 991f04a..64c5064 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1c8f0385e625cc3ea22ad45f65b4508f9e2b33bde7c0ba71644e94b48434e25 -size 262225 +oid sha256:ecc66070774d90a091c273d7fa40d2b3a98ec802cecde591ca0f606946c59b9f +size 210927 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset index c0ceaa5..93f06c7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a041aa670ba25995f4c53026ed133628ef131e43123b8992e01d9564e1b0de22 -size 36524 +oid sha256:9d160194f2ea08d11cb777e79aacc0754dce65debe3f54fc7798fe74d787957f +size 35009 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset index 9ccfa59..0a2c3c7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d70ca240f4fe710302a8006fb030019ab328aeee46c67b68ce01953259384ce8 -size 17020 +oid sha256:9f708d003b171dbd7aeaabc3d67869e7ebe733a7efb5dfefb3f0e785d3aed9e5 +size 17134 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset index f6fe29d..78e1d97 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e5f07668727e3328efab2f7645b5999b10fa849fe58cb226745743810e82645 -size 391032 +oid sha256:7efae81877d4225525aded93050be7cedf92e909feb50a5715bbf944a01b0155 +size 448095 diff --git a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject index 9425187..5790317 100644 --- a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject +++ b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject @@ -115,6 +115,10 @@ { "Name": "Harmonix", "Enabled": true + }, + { + "Name": "DisasterRecoveryClient", + "Enabled": true } ], "TargetPlatforms": [ From 51efd2eb29d9da9b37dbbdd1d5c1528e7b25c225 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 4 Jul 2025 15:30:41 +0200 Subject: [PATCH 15/56] Continued work on character interaction --- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Content/World/Characters/BPI_Character.uasset | 2 +- .../Content/World/Characters/BP_BaseCharacter.uasset | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../Content/World/Characters/Clarice/BP_Clarice.uasset | 4 ++-- .../World/Characters/Gilbert/BP_GilbertThirdPerson.uasset | 4 ++-- .../Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/GilbertAnimBP.uasset | 3 --- .../Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/NavLink_AI.uasset | 4 ++-- 10 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertAnimBP.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index ba37906..19bd12f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e0cb38a00ca18f04c381efd879fb4e00f9d2781208582b23d8386d7a8522f21 -size 1696623 +oid sha256:4f148140721c270d679e24173d53061487e1a66cf578c7486e16a5c255bef724 +size 1696758 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BPI_Character.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BPI_Character.uasset index 1c6a4c0..6c47f54 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BPI_Character.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BPI_Character.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47c57977bdd6b4e1426bf6ef065bcd4411138af6773e8b274f833566cc817995 +oid sha256:030027383ccf9c65f094f6eb64655867e582ff56a2e90a00fbc0685174618d59 size 10591 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset index 2b683b7..9738708 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3539df9273aa487e8dbeaa83a5f3c03fde0664b1745c050101379b9df2782970 -size 75069 +oid sha256:184bce21637afb1cd63d11cc0c39c5a593b62ff7be8a22250611f9fd076e19f9 +size 150999 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 5a20705..b9a2422 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:561049162d93c3492363722ca356fc459e86641de27f27f733a0075247e979f2 -size 275524 +oid sha256:7d687c16686441d96aa44f6f49f5cd76cc268151becba6f5b32c5e25a5ac8bd7 +size 354341 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index 4a3714e..aa3ff72 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41de03fce8deb5c04cba7681ed9f223030102b9d6727b335b710a4883debddde -size 417967 +oid sha256:7ab963346d31347e33916801112f0d8a95e5c7cc9d24aa103d4f0348bbf54760 +size 411223 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset index 64c5064..5df0954 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecc66070774d90a091c273d7fa40d2b3a98ec802cecde591ca0f606946c59b9f -size 210927 +oid sha256:d9af4f2b56ba36a95e2b78e5780d0813400ab3949e9281c6718608b9b0d9a95d +size 208816 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset index 93f06c7..41a49cd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d160194f2ea08d11cb777e79aacc0754dce65debe3f54fc7798fe74d787957f -size 35009 +oid sha256:022b7f7f5e4635161240e1a45a7d9c29c4931fcdc1b540903baf8a80b80e511e +size 39026 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertAnimBP.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertAnimBP.uasset deleted file mode 100644 index 008b810..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertAnimBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8c2698b6b5b11df1a5c6bc1b0cf3e7b286427c7ea965995533c3f8a246f2e9e -size 61965 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset index 5fd0b5b..ad736c8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2885add349f31c36e4b791a63a31f0b2538f6cd597d6b871dd5f7493e9800aee -size 243779 +oid sha256:0ba728b049a922774dcf83d565445f517e2b44589c182753d8673c6349304e94 +size 241532 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset index 1b32865..f97addc 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a37ca39f2f15b92250972760956b7fe26c1ba4340e619f2f1480e4f25677b86 -size 29450 +oid sha256:fd37379462f4842af8819a2346531869796b50fd94fd54272299dd96f3a59f45 +size 54720 From f7ab3ebd64b243c1dcbe13ba6b0583a9d876c111 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Mon, 7 Jul 2025 16:17:35 +0200 Subject: [PATCH 16/56] Fxied Gilbert and updated with Baked Version, IK Targets --- .../Content/Core/Navigation/NavLink_AI.uasset | 3 +++ .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../World/Characters/Gilbert/BP_GilbertThirdPerson.uasset | 4 ++-- .../NewFolder/Animations/Gilbert_Actions__BowDown.uasset | 3 +++ .../NewFolder/Animations/Gilbert_Actions__DigOut.uasset | 3 +++ .../Gilbert/NewFolder/Animations/Gilbert_Actions__Idle.uasset | 3 +++ .../Gilbert/NewFolder/Animations/Gilbert_Actions__Jump.uasset | 3 +++ .../Animations/Gilbert_Actions__WalkBackwward.uasset | 3 +++ .../NewFolder/Animations/Gilbert_Actions__WalkForward.uasset | 3 +++ .../NewFolder/Animations/Gilbert_Actions__WalkLeft.uasset | 3 +++ .../NewFolder/Animations/Gilbert_Actions__WalkRight.uasset | 3 +++ .../NewFolder/Animations/Test/Gilbert_Actions__BowDown.uasset | 4 ++-- .../NewFolder/Animations/Test/Gilbert_Actions__DigOut.uasset | 4 ++-- .../NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset | 4 ++-- .../Animations/Test/Gilbert_Actions__WalkBackwward.uasset | 4 ++-- .../Animations/Test/Gilbert_Actions__WalkForward.uasset | 4 ++-- .../Animations/Test/Gilbert_Actions__WalkLeft.uasset | 4 ++-- .../Animations/Test/Gilbert_Actions__WalkRight.uasset | 4 ++-- .../Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/BS_Movement.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/Can/BP_Can.uasset | 3 +++ .../Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Diffuse.uasset | 3 +++ .../Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Metalness.uasset | 3 +++ .../Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Normal.uasset | 3 +++ .../Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Roughness.uasset | 3 +++ .../World/Characters/Gilbert/NewFolder/Can/M_Can.uasset | 3 +++ .../World/Characters/Gilbert/NewFolder/Can/SM_CanOnly.uasset | 3 +++ .../World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset | 3 --- .../Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset | 3 --- .../Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset | 3 --- .../Gilbert/NewFolder/Gilbert_Actions__WalkForward.uasset | 3 +++ .../World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset | 3 +++ .../Characters/Gilbert/NewFolder/Gilbert_PhysicsAsset.uasset | 3 +++ .../Characters/Gilbert/NewFolder/Gilbert_Skeleton.uasset | 3 +++ .../Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset | 3 --- .../Content/World/Characters/Gilbert/NewFolder/Grip.uasset | 3 --- .../World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset | 3 +++ .../World/Characters/Gilbert/NewFolder/NavLink_AI.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset | 4 ++-- .../NewFolder/Textures/Cube_007_Bake1_PBR_Diffuse.uasset | 3 +++ .../Textures/Cube_007_Bake1_PBR_Emission_Strength.uasset | 3 +++ .../NewFolder/Textures/Cube_007_Bake1_PBR_Metalness.uasset | 3 +++ .../NewFolder/Textures/Cube_007_Bake1_PBR_Normal.uasset | 3 +++ .../NewFolder/Textures/Cube_007_Bake1_PBR_Roughness.uasset | 3 +++ .../NewFolder/Textures/Cube_007_Bake1_PBR_Transmission.uasset | 3 +++ .../Gilbert/NewFolder/Textures/M_Gilbert_Body.uasset | 3 +++ 47 files changed, 112 insertions(+), 43 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/Navigation/NavLink_AI.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__BowDown.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__DigOut.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Idle.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Jump.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkBackwward.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkForward.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkLeft.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkRight.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/BP_Can.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Metalness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Roughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/M_Can.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/SM_CanOnly.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Actions__WalkForward.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_PhysicsAsset.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Grip.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Emission_Strength.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Metalness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Roughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Transmission.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/M_Gilbert_Body.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Navigation/NavLink_AI.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Navigation/NavLink_AI.uasset new file mode 100644 index 0000000..dbfd60a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/Navigation/NavLink_AI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:074a36e7ae8ff3f70a0cee08061a30de9be7d7c382058487d63e97f17dea93bb +size 54091 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 19bd12f..d4f83b5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f148140721c270d679e24173d53061487e1a66cf578c7486e16a5c255bef724 -size 1696758 +oid sha256:b6be9a5ee584549539e84bffd0d1d3b8be9b708eee428a830c76c05df5c1da2a +size 1709794 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset index 5df0954..73b9fa2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9af4f2b56ba36a95e2b78e5780d0813400ab3949e9281c6718608b9b0d9a95d -size 208816 +oid sha256:9f77ccb595c8715efdf102b79d78f76da6b23bcc036a9b4c63e8f877f19f78d9 +size 207428 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__BowDown.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__BowDown.uasset new file mode 100644 index 0000000..eaae60e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__BowDown.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84eb52c4f8d415b231b5e78b7e76629e05eb15d764e071138dc091038fca76cc +size 171085 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__DigOut.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__DigOut.uasset new file mode 100644 index 0000000..1e1332a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__DigOut.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32421924fd3172071ba1b2b4fe12f104d57dec189d8de6e74c678ca85f640fad +size 183724 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Idle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Idle.uasset new file mode 100644 index 0000000..2e3f2d3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Idle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e8817faf0fbbb43569bb5820fe9609df5df3fadef35b3d94089e9a9f7003c06 +size 220797 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Jump.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Jump.uasset new file mode 100644 index 0000000..57162ea --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Jump.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09aec0626c0e37ab8ff0a66f8e71078c381f8d407aee8819a57dbfe00428256a +size 138622 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkBackwward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkBackwward.uasset new file mode 100644 index 0000000..a43b46f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkBackwward.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:812f7cce4de7171c01d4c3c232ac9c2876fc81b48d1d72d7d461e4f3cf1a7739 +size 203823 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkForward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkForward.uasset new file mode 100644 index 0000000..4d46a68 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkForward.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac71aefb3a839e2ecf522f7f430cb2e764dd185969e9f409b7165b572a9a732b +size 204607 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkLeft.uasset new file mode 100644 index 0000000..5a79faa --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0262533a9ac6ff7dbadeceed1fa6613adec35b8db80580e8b70014d9ab3f1c98 +size 199685 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkRight.uasset new file mode 100644 index 0000000..db1480e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1b06f24a611bab4e4780bdd401a3d72260a2f467ce1651e8ce4822c24c488c5 +size 200591 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__BowDown.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__BowDown.uasset index 2180722..8f0c54a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__BowDown.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__BowDown.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:086c6e7c9e79919be3ba2afdde2200617ec5a4f66e5f13523a0ed40486c56bf8 -size 169264 +oid sha256:4d77abe534975c64ab9f934bb91d1f668ea21cbd9a46f203cffffd9e5a0913e2 +size 168186 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__DigOut.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__DigOut.uasset index 1bcdfef..7d9390d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__DigOut.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__DigOut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a9ddfbc8d4702a1676e8b4887f7827e1513600b6f032f87625446648651689c -size 181746 +oid sha256:9097da5c4d7713b7e89c7b48e8cab84e5aa763574e9e97f50460a92d72ed3b1a +size 179228 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset index bda5a8b..9ef57b7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95f4885585e53aa35ba8c7ad14fb598e5033054dca7f0afe2cdc165186e6bee5 -size 219424 +oid sha256:65c7fd2e1f41b518840089a80567038203952f7e246653b9be3d37751a78e70c +size 1709 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset index 9673ec0..be93f3e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8ac54db2c291067c4e730e987029c45dce847d5085d3015ad50f290c2cea700 -size 202516 +oid sha256:117cf82b5d5d8991c7c32226b5dc098931589dec2f4cd9d47dcc59a02f93b51b +size 1781 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset index 7cfce77..fa50e3e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5f5059055a5a5b9490df9a2fe648a2fe0f31b21f5cd6ec480f808c771832abe -size 201679 +oid sha256:3adfe4830c1ed6d2df89183431e0f9600129eb4caa14063389e5443d04e4710c +size 1763 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset index 66c6871..adc5d7f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43249951e902da1cc74b72bc0130d7e9155d8a980d3564b401e543a1096af3a1 -size 198313 +oid sha256:90e6b1d1778460b8b4acdde592deee9106bcd42ea1ce12e6b2ec200934c84495 +size 1741 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset index 99b4312..9994439 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4e455000db9c9e8552efcd7a0ff4a0f9eea30179cf5b2bf2a63c7eedd7c6f31 -size 198457 +oid sha256:3e4b0e3cc2ae4c0c12c8a00a6cdbf68489bba9471f5647dceedf8be1041cf1cf +size 1749 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset index 41a49cd..eab5548 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:022b7f7f5e4635161240e1a45a7d9c29c4931fcdc1b540903baf8a80b80e511e -size 39026 +oid sha256:e00562b9c33a6e4d28d089f4e0aa93ce222112ff1262bdeef140e78417d199cd +size 2477 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset index b2af729..3efaf7c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31e968578200209ab96559c24288900ce1b111241c9ea4ca160376a720be7352 -size 19502 +oid sha256:e3771653bf1e654454656b11970d8c52713b74505bccd7faddac76af51a078e2 +size 19461 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/BP_Can.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/BP_Can.uasset new file mode 100644 index 0000000..225cbfb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/BP_Can.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f6439709bd820622296772f07aa07dbfa693b470e74496c8a6386de72f48820 +size 39289 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..b6b5795 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:340d1918bbf1acdbb26e25ed8c100f78bb022022e78b5554d8e58eed78e71a57 +size 4138662 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Metalness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Metalness.uasset new file mode 100644 index 0000000..c9e28c1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Metalness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cfd6b240d3e7aa4b1eaac30a6828f2dd5e94f4b8eddd3b159ad32bd213b2953 +size 1200689 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Normal.uasset new file mode 100644 index 0000000..1d31619 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bc12a3bee2b25e05dc42a53f9cc144eedf77921805705f24342db23bbcac470 +size 23131000 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Roughness.uasset new file mode 100644 index 0000000..a590be8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c08012318c7cc133f30723c5bc4bac367b1dbf6c5c99da97b86ae9329ae33e89 +size 1547188 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/M_Can.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/M_Can.uasset new file mode 100644 index 0000000..6a0188f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/M_Can.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e70a2c60bd366594e3a03f7c09883505402ef7bf55d97209b1f4410370d348f +size 18110 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/SM_CanOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/SM_CanOnly.uasset new file mode 100644 index 0000000..bbc2a5f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/SM_CanOnly.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e625ddefedc5617eb435955a0ba84fb2153fe6a2c8bf35cf27ee8c3397947d4 +size 448103 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset deleted file mode 100644 index 6bc8e81..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f6e934906e869097a9c2b1bb83df72e8e1cbd36e58f7f3be92b7e9a238b8097 -size 56954 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset deleted file mode 100644 index 2e1fc8f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:35792cbc97f730cfe434cf084141fec43b5a6baf0d249b26fe9fe02a813e75d2 -size 54711 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset deleted file mode 100644 index 0a2c3c7..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f708d003b171dbd7aeaabc3d67869e7ebe733a7efb5dfefb3f0e785d3aed9e5 -size 17134 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Actions__WalkForward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Actions__WalkForward.uasset new file mode 100644 index 0000000..726a165 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Actions__WalkForward.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5926db24c959172709029c87db6da83e6c250155db47f7617df0d13a52095c4 +size 1733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset new file mode 100644 index 0000000..fd2b796 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:427b18d8da273013134a9b78b7abd79387ba54798981349b77f286d6bab48b3a +size 423884 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_PhysicsAsset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_PhysicsAsset.uasset new file mode 100644 index 0000000..acb1325 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:070ce551153a8d6c0417bb6026b577bf0021cad0e24aba07775d9fd4e0135c59 +size 50249 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton.uasset new file mode 100644 index 0000000..494ceb5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a26e418d534b9fad2b67ba9957d2204c019b669a22730246f546d72dd2417d32 +size 16175 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset deleted file mode 100644 index ad736c8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ba728b049a922774dcf83d565445f517e2b44589c182753d8673c6349304e94 -size 241532 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Grip.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Grip.uasset deleted file mode 100644 index 76e8e1a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Grip.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:003f8143d251e7d471f20820112446b33c19526414ec083ba3f231834097552e -size 23313 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset new file mode 100644 index 0000000..5a044e3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a1802e412da8e38461d708b94fc47e7e95d57e085d451c93080c01462a901ba +size 37647 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset index f97addc..8ba9562 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd37379462f4842af8819a2346531869796b50fd94fd54272299dd96f3a59f45 -size 54720 +oid sha256:c9bb44f399d3b50145f47cc7baa87adcb4ed6b1022cf6f1b1f660117321c853d +size 2442 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset index 36015b5..23d5b2a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94594ab8831af98fa6f627007f0d84bb46e007175598cbd9600a89f952a0e5c4 -size 2409736 +oid sha256:b621315b91726cf9de10d219dbb22e6c86a154aa2c980252d8d2952eac5406bf +size 2147933 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset index 78e1d97..4748a0d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7efae81877d4225525aded93050be7cedf92e909feb50a5715bbf944a01b0155 -size 448095 +oid sha256:df4f66d6746dc22ff7fb5532b7a3a5c8e10679af1b5220a5d1910fc3ab755f07 +size 1571 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..1befae4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3b64b76e149bd225a64a595df1382a77a744bbce17ae68bb216c225d087ddce +size 14079331 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Emission_Strength.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Emission_Strength.uasset new file mode 100644 index 0000000..08060c6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Emission_Strength.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5051c1e88a49218311b34cf1b48b7723e9322a85b512ba71750d3e0e4411053 +size 48657 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Metalness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Metalness.uasset new file mode 100644 index 0000000..45e2ebf --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Metalness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4667bd28eead9e4ade6789251fddde7bed25cfd1fb08381573d4e49d5e6d34c2 +size 268772 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Normal.uasset new file mode 100644 index 0000000..4283542 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0dbd2b152f593879587cd4f2a9ae76bb6ffa035a95e71ede0e5e1cc351a45a62 +size 139775005 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Roughness.uasset new file mode 100644 index 0000000..e8d91a1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cff18b70ead8316f2d4fb003a80c889576808e54f3e2bdb324e7d63d555913f7 +size 7658258 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Transmission.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Transmission.uasset new file mode 100644 index 0000000..0c2f2a6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Transmission.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31d79f2790c52e0fb5bb374dd8a79bc0e80e79cb5ee4fa22d6e9c1221e9950ea +size 16747 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/M_Gilbert_Body.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/M_Gilbert_Body.uasset new file mode 100644 index 0000000..88cc251 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/M_Gilbert_Body.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39f29ca38c98edd9f51040f9fad3b8d34ef57d57f47ef760ae918b22c4ca4846 +size 29468 From b4424f8bb3829e7f1f7b492e5a758b4a73d60c66 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 8 Jul 2025 13:44:38 +0200 Subject: [PATCH 17/56] IK Goals on Gilbert (would prefer a curvelike step with +Z) --- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../World/Characters/Gilbert/BP_GilbertThirdPerson.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index d4f83b5..008f8b8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6be9a5ee584549539e84bffd0d1d3b8be9b708eee428a830c76c05df5c1da2a -size 1709794 +oid sha256:67c17c56f6053ed5fe7c01f9fa91666f1b6b59f1e4241a831917b7ece830b792 +size 1709502 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset index 73b9fa2..5ddf4dd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f77ccb595c8715efdf102b79d78f76da6b23bcc036a9b4c63e8f877f19f78d9 -size 207428 +oid sha256:f38ef41525009e3c6fbba01a7759998ca8918c65239744f7d9d43369f36bbd84 +size 205854 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset index fd2b796..c8d7ef6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:427b18d8da273013134a9b78b7abd79387ba54798981349b77f286d6bab48b3a -size 423884 +oid sha256:8ac14065598aeefe2a8a0940dc98fd1e7ba1472f86a998d27d7eab0ded806114 +size 626180 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset index 5a044e3..d8c610c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a1802e412da8e38461d708b94fc47e7e95d57e085d451c93080c01462a901ba -size 37647 +oid sha256:b347e3ec6826cb54f450e7b18faecafebde04a10ff6208199721b1650633c4f4 +size 39453 From b6f35300762eeaed9a96441179a98a0a638a5242 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 8 Jul 2025 14:51:09 +0200 Subject: [PATCH 18/56] Fixed Gilbert at slow speed, fixed Shoe Trace on top of other objects --- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Content/VRE/Core/Character/BP_Trace_Controller.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/BS_Movement.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index 4387d34..89fed61 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbfe334a9573c51f208c99634ea6424b8bb6b8ec989c9cc2e9f407adf7e02850 -size 765750 +oid sha256:862f50fa3fd260ef40d70bac4ba6d8d408e6fd7ec94be881d6fed2ce9dd97366 +size 764503 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index 42c47c0..6557a6d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8aae6b8cd6f149cb9908e34f5c00b4cb4cdde54f40d6f7db7adf9e48d41280f -size 73439 +oid sha256:79610f4bd01df4108538e93d799a4b28ce9bdad071f5e65837cf9758e39cf339 +size 72252 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 4a602f8..5998d2d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f40d53d98185318ae988fe34990dc2d9f991fb55462a6695f182c303732ed235 -size 62469 +oid sha256:8d1b4af04de2db095561983e0bc6ef5c80bf693ae3875290b1c5b60e12c46432 +size 65342 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 008f8b8..0518e4f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67c17c56f6053ed5fe7c01f9fa91666f1b6b59f1e4241a831917b7ece830b792 -size 1709502 +oid sha256:52492781f83c0b78046a170e16308ef67f04d3e3f8ab70f4e8dd525fdf188176 +size 1711996 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index 38b5cad..61e2f72 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26fc81abea5e8c3a0cdafcc11cb1b498591b695ed3ce3e5dabc9f83f4e78d328 -size 1838619 +oid sha256:375031c94ec3a79788a1b08f57774e8fbf6015781c43313b1fc9c520ec7cbc83 +size 1839265 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset index 3efaf7c..74e221e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3771653bf1e654454656b11970d8c52713b74505bccd7faddac76af51a078e2 -size 19461 +oid sha256:6195916ace3ce6e81ae6516cc1d5f9dc5a6eb14dabff83b1f3a221f5af14e286 +size 19143 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset index c8d7ef6..0f5b86a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ac14065598aeefe2a8a0940dc98fd1e7ba1472f86a998d27d7eab0ded806114 -size 626180 +oid sha256:180e448b5df5c7302af63776f38bb1090698f458d86455a13c1413b976a808eb +size 608352 From 4473390e5eef5ac34cc8de1a2dbcd40117630fd1 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Wed, 9 Jul 2025 12:40:55 +0200 Subject: [PATCH 19/56] Rewrote SliceGameHits to used Objects Bounding Box instead --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Content/World/VFX/Projector/Nitrate.uasset | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index 31fb86a..873b8fa 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a6b9f1a972fbb718df7880917801d331472c35c3ab9acae490b71f5fc1d516f -size 817560 +oid sha256:8f06bd7b0cf184fc8cf42e5fa48ddf91f342e7a40a0a2f7c2fc76c710c74257d +size 931472 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index 89fed61..693cc9c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:862f50fa3fd260ef40d70bac4ba6d8d408e6fd7ec94be881d6fed2ce9dd97366 -size 764503 +oid sha256:86075462554cc73a622f5de32a29b951742be11990f01627ea7bbbc203933de2 +size 770748 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index 6557a6d..83f3e43 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79610f4bd01df4108538e93d799a4b28ce9bdad071f5e65837cf9758e39cf339 -size 72252 +oid sha256:5cf995ddbd113a7775f0ee70e2bac041dd822bbf1297bff851e7662fc81b32b9 +size 72941 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 5998d2d..a5c2488 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d1b4af04de2db095561983e0bc6ef5c80bf693ae3875290b1c5b60e12c46432 -size 65342 +oid sha256:1ca61c13770210627cc265fdf888878366469a1302c133fffc1c46338328b50e +size 63883 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 0518e4f..ed3b5e9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52492781f83c0b78046a170e16308ef67f04d3e3f8ab70f4e8dd525fdf188176 -size 1711996 +oid sha256:206016ac4c3e846bb9b89454b556ba2212c78db8fe9d09a9084ad609d54bb968 +size 1710855 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate.uasset index 1a3389f..55a069d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67e8decc224785ca9df8f9e139ed143f8511d3695b6e737f26680bc60badf58f -size 208797 +oid sha256:1b3b977625a6785b9b51f527e69390997b15544c9afb64daa2fc1bcd89b8e6aa +size 209637 From 706f21eb669389af7ddfe50da7119f7ce00b0980 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Wed, 9 Jul 2025 16:54:07 +0200 Subject: [PATCH 20/56] This and that --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Content/VRE/Core/Character/BP_Trace_Controller.uasset | 4 ++-- .../Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset | 4 ++-- .../VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset | 4 ++-- .../Content/World/Characters/Clarice/BP_Clarice.uasset | 4 ++-- .../Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index 873b8fa..c105cdf 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f06bd7b0cf184fc8cf42e5fa48ddf91f342e7a40a0a2f7c2fc76c710c74257d -size 931472 +oid sha256:d59979d95b6287885400cb9600f518b8c4148b0e858cde9881cab5b143f5c21a +size 866208 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index 83f3e43..11967c8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cf995ddbd113a7775f0ee70e2bac041dd822bbf1297bff851e7662fc81b32b9 -size 72941 +oid sha256:ffcd23e8120a8cdd60bf44602cd4a7e4879315e2ba1867e5bc83387a29924912 +size 71623 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index a5c2488..acf9f04 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ca61c13770210627cc265fdf888878366469a1302c133fffc1c46338328b50e -size 63883 +oid sha256:4fe52450307f8d3edaea8b90e1f34c5c6ef9a805fdb57e352a6e1a7d431f1451 +size 62908 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index ed3b5e9..6a193d1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:206016ac4c3e846bb9b89454b556ba2212c78db8fe9d09a9084ad609d54bb968 -size 1710855 +oid sha256:223725898aa535f55741a94f451facc86865563077d3f2d748a8f714efb4d7c4 +size 1709682 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index 61e2f72..7d83565 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:375031c94ec3a79788a1b08f57774e8fbf6015781c43313b1fc9c520ec7cbc83 -size 1839265 +oid sha256:cbafb5faa68113b675749f5196205db90f8c15214467252a94cb32a5909bf6f8 +size 1828649 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index 411eb1a..858b194 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c41415a7814014d161505b16c156146c5252ca1fd47aeeff7d966ed870df51a -size 5645811 +oid sha256:27a142f1ae7bd6c95bea7e4584b059027a4fae8adc62140f58a9fd10f2013ffb +size 5645466 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset index f730a3f..5c0ef27 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de8d71e5d3491d8e7365c86590d55a730f61046ae5a3c445c72c007fb679cce6 -size 2545075 +oid sha256:3054af254ff6ecaa3b4c8586043d7ee1a3f6eebeb7cba264c046b326a7ee7009 +size 2540953 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index aa3ff72..56a8fac 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ab963346d31347e33916801112f0d8a95e5c7cc9d24aa103d4f0348bbf54760 -size 411223 +oid sha256:613dabca4c5311c41c1557d71372d74799053c555792e2b829f0a323c6e3d9b4 +size 442820 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset index f1d9649..ce0bb46 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7d42de363e0d31f9731a6fc4a84dad384cfc99b0cd83e2ef2fe4e04073d5178 -size 21381 +oid sha256:e8f7ada62d7b12b2708873dc4340beb0b395b73db1b8b860c6e3322ec3a22357 +size 21437 From 1b4fab31ff88f24e4d360c07bf0257871803091e Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 11 Jul 2025 10:52:00 +0200 Subject: [PATCH 21/56] Add Molecules, Fixd a Bug in Slicegame Position Offset --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/M_ArrowMat_Inst.uasset | 4 ++-- .../Molecules/Carbondioxide_003_Bake1_PBR_Diffuse.uasset | 3 +++ .../MIdi_HarmonixPlugin/TestSong/Molecules/MI_Argon.uasset | 3 +++ .../MIdi_HarmonixPlugin/TestSong/Molecules/MI_CO2.uasset | 3 +++ .../MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset | 3 +++ .../MIdi_HarmonixPlugin/TestSong/Molecules/MI_Oxygen.uasset | 3 +++ .../TestSong/Molecules/M_SliceGameMolecules.uasset | 3 +++ .../MIdi_HarmonixPlugin/TestSong/Molecules/SM_Argon.uasset | 3 +++ .../MIdi_HarmonixPlugin/TestSong/Molecules/SM_CO2.uasset | 3 +++ .../MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset | 3 +++ .../MIdi_HarmonixPlugin/TestSong/Molecules/SM_Oxygen.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Interactibles/Weapons/SciFiKatana/SM_ScifiKatana.uasset | 3 +++ .../Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset | 4 ++-- 19 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/Carbondioxide_003_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Argon.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_CO2.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Oxygen.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/M_SliceGameMolecules.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Argon.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_CO2.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Oxygen.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/SM_ScifiKatana.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index c105cdf..6c20bda 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d59979d95b6287885400cb9600f518b8c4148b0e858cde9881cab5b143f5c21a -size 866208 +oid sha256:840ccd35219fc9859322149d252ef0066b05ee3d81d60a379467aee0b24795d9 +size 865819 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index 693cc9c..83c712a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86075462554cc73a622f5de32a29b951742be11990f01627ea7bbbc203933de2 -size 770748 +oid sha256:ad1a4c70753e6c308abc4cca8531090ffd4626c13136dfd743b70fa85e308431 +size 781504 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index 11967c8..154823a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffcd23e8120a8cdd60bf44602cd4a7e4879315e2ba1867e5bc83387a29924912 -size 71623 +oid sha256:42875013d9c2cbaadb7392f560b0fa5f254028e6fe0a4e33fa2f207778f421b5 +size 71028 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_ArrowMat_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_ArrowMat_Inst.uasset index 741740f..c399600 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_ArrowMat_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_ArrowMat_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dcadbb03c6f09d3fa4d4ff5509ab30a3f3b38f7d2903bf433f8935022545bf4 -size 11404 +oid sha256:dc7ce0110544c110cc64b8280d987bce949ba0c814ffdf36fd204fc0deccdae5 +size 11651 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/Carbondioxide_003_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/Carbondioxide_003_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..083cc32 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/Carbondioxide_003_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aadb9afdd804085f7f19d7b593273f75ae8e18f786da60ab5f8009ef4aa06168 +size 67852 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Argon.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Argon.uasset new file mode 100644 index 0000000..df7de0b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Argon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e400d7b2ee1fe6f6b018bc82f7a5f8ef9d28b28d555ce7de75266999aea9be5 +size 9091 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_CO2.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_CO2.uasset new file mode 100644 index 0000000..ebaf230 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_CO2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:794fd2d1565a40b3db28d55fc27d918418240dc07a9d584640fc7ea76f4e954c +size 13648 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset new file mode 100644 index 0000000..43c41e3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d43eb29c59459d8c2fbca1e9532e8f390406cb16ef6123183456f1da46342b1 +size 8684 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Oxygen.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Oxygen.uasset new file mode 100644 index 0000000..b49a4e4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Oxygen.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ba216aceffe3fc45ed85deb2dde2b64c84de6c71c201987985aec5cfd71b7ff +size 8367 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/M_SliceGameMolecules.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/M_SliceGameMolecules.uasset new file mode 100644 index 0000000..9039303 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/M_SliceGameMolecules.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37540281ae02ecd2d57766c7cf9a21b0bbb56ec40e2b74f57b303c36c550df63 +size 19762 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Argon.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Argon.uasset new file mode 100644 index 0000000..eff6261 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Argon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a19e1bf3a30b097cc8c126a285dee5090f2b22eb093a6a17be5f5dbad435e9c9 +size 96774 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_CO2.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_CO2.uasset new file mode 100644 index 0000000..3027bc3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_CO2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24a3f616ebda2e28bd4125c4c76f938f7e489895844248222b67adcb568e2aaf +size 222088 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset new file mode 100644 index 0000000..6e20b11 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25bd689a30f749f19f9074fc60ce07486dce22d9efb5f2e561a792686b4a18be +size 121988 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Oxygen.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Oxygen.uasset new file mode 100644 index 0000000..3a7a785 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Oxygen.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f09b314de72c42ef475bc2b125616a8904a40b3f28205f13d0a3cf85654b0f95 +size 104638 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 9469af8..52f0b95 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:141f6d09c2f387d10a0405f9a3e3d2bcd90052ace6aa0ffcf5b239b598e6c23d +oid sha256:f9d836516bea5df6574383981e3c9f79095ffebbd69b706364820355662d2f58 size 478508 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index acf9f04..0da53c9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fe52450307f8d3edaea8b90e1f34c5c6ef9a805fdb57e352a6e1a7d431f1451 -size 62908 +oid sha256:90324f1881dcc68dc570251661889c0d4cb879bd5b88edcf17c5ae5e83558671 +size 61887 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 6a193d1..aa9449b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:223725898aa535f55741a94f451facc86865563077d3f2d748a8f714efb4d7c4 -size 1709682 +oid sha256:485a4b31b60a9a9af7c391455bd8fc3fb6fb4e7188364538ebcef49740a18109 +size 1711627 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/SM_ScifiKatana.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/SM_ScifiKatana.uasset new file mode 100644 index 0000000..4d849a9 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/SM_ScifiKatana.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01e48ae8130d21a02fd548588ad85f60cf336c2ecdfc9e3c42bb9f0dd987e523 +size 254242 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset index 852f95f..ade66fb 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:138fba8d0dcbfaa389abc4a6270cf81d764ffdfb7804ec3f745d700d86ea8a81 -size 254227 +oid sha256:c488563ad4adff15496b44e03d94b3d8622672cefe5897d88b2fc19fdb6095d6 +size 1623 From 00393897e2d5ebf7abf087efa8e0e388824a3ff9 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 11 Jul 2025 15:30:29 +0200 Subject: [PATCH 22/56] Gues who rewrote the Slice Angle Detection Logic Again --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- .../MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index 6c20bda..9ce02a8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:840ccd35219fc9859322149d252ef0066b05ee3d81d60a379467aee0b24795d9 -size 865819 +oid sha256:dee0c222f7b1ba336991c541cbab2ff25f002c178b102b9a31bffc7d701f4003 +size 1051410 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index 83c712a..53c019a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad1a4c70753e6c308abc4cca8531090ffd4626c13136dfd743b70fa85e308431 -size 781504 +oid sha256:5d8f3817ec77001ed1b92951b49e6d4b21f3577d3439ce5bed256ab807c6a187 +size 780016 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index 154823a..5a46678 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42875013d9c2cbaadb7392f560b0fa5f254028e6fe0a4e33fa2f207778f421b5 -size 71028 +oid sha256:061ee32c5351f5e8d3ed773e4563d40482bd78c9a12eca6f3ae8c37c25b030b3 +size 73960 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset index 6e20b11..7d8b5e4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25bd689a30f749f19f9074fc60ce07486dce22d9efb5f2e561a792686b4a18be -size 121988 +oid sha256:ebc4f25c312659618a2d59dfe4a71bb8bd822a0a32b17cb90ef18620155d6dcf +size 122318 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 0da53c9..5059b38 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90324f1881dcc68dc570251661889c0d4cb879bd5b88edcf17c5ae5e83558671 -size 61887 +oid sha256:488a472f632855a9153ac434fdae229f17e59f06df573f90b7e67827fe65e112 +size 64082 From 48f824de95a6ae8a7db06dbc4543bd6ef2538739 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 15 Jul 2025 14:20:11 +0200 Subject: [PATCH 23/56] Sample on Point during hit to improve Slice accuracy, Some Cleanups, Sounds --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- .../Content/Audio/SliceGame/A_SliceConfirm.uasset | 3 +++ .../Content/Audio/SliceGame/A_SliceFail.uasset | 3 +++ .../Content/Audio/SliceGame/MS_Slice.uasset | 3 +++ .../Content/Audio/SliceGame/Slice-001.uasset | 3 +++ .../Content/Audio/SliceGame/Slice-002.uasset | 3 +++ .../Content/Audio/SliceGame/Slice-003.uasset | 3 +++ .../Content/Audio/SoundClasses/MusicSoundClass.uasset | 3 --- .../Content/Audio/SoundClasses/SCM_MasterSoundMix.uasset | 3 --- .../Content/Audio/SoundClasses/SCM_MusicSoundMix.uasset | 3 --- .../Content/Audio/SoundClasses/SCM_SFXSoundMix.uasset | 3 --- .../Content/Audio/SoundClasses/SC_MasterSoundClass.uasset | 3 --- .../Content/Audio/SoundClasses/SFXSoundClass.uasset | 3 --- .../Content/Core/SoundClasses/MusicSoundClass.uasset | 3 +++ .../Content/Core/SoundClasses/SCM_MasterSoundMix.uasset | 3 +++ .../Content/Core/SoundClasses/SCM_MusicSoundMix.uasset | 3 +++ .../Content/Core/SoundClasses/SCM_SFXSoundMix.uasset | 3 +++ .../Content/Core/SoundClasses/SC_MasterSoundClass.uasset | 3 +++ .../Content/Core/SoundClasses/SFXSoundClass.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Content/UI/Inventory/BP_VRInventory.uasset | 4 ++-- .../Content/UI/Inventory/InventoryDataTable.uasset | 4 ++-- .../Content/UI/MainMenu/UI_Sound/MS_LogoIntro.uasset | 4 ++-- .../Content/UI/MainMenu/UI_Sound/MS_MainMenuMusic.uasset | 4 ++-- .../Content/UI/MainMenu/UI_Sound/MS_UIClick.uasset | 4 ++-- .../Content/UI/MainMenu/UI_Sound/MS_UIConfirm.uasset | 4 ++-- .../Content/UI/MainMenu/UI_Sound/MS_UIMove.uasset | 4 ++-- .../Content/UI/MainMenu/UI_Sound/SW_MainMenuMusic.uasset | 4 ++-- .../Content/UI/MainMenu/WB_AudioSettings.uasset | 4 ++-- .../Interactibles/Electrical/Recorder/BP_Cassette.uasset | 4 ++-- 35 files changed, 69 insertions(+), 51 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceConfirm.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceFail.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/MS_Slice.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-001.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-002.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-003.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/MusicSoundClass.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MasterSoundMix.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MusicSoundMix.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_SFXSoundMix.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SC_MasterSoundClass.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SFXSoundClass.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/MusicSoundClass.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MasterSoundMix.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MusicSoundMix.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_SFXSoundMix.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SC_MasterSoundClass.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SFXSoundClass.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index 9ce02a8..37732c6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dee0c222f7b1ba336991c541cbab2ff25f002c178b102b9a31bffc7d701f4003 -size 1051410 +oid sha256:5d097101f93909b39c8c11ef7bbb68abc6852f1d4144f4eedbd76829f248f2d4 +size 1416515 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index 53c019a..c5e1e1a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d8f3817ec77001ed1b92951b49e6d4b21f3577d3439ce5bed256ab807c6a187 -size 780016 +oid sha256:8e5728f2609b3c3b1e47287eb1f9fb92cd66187a6dd8d4dba777b449a6e0e025 +size 804870 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index 5a46678..4dab59f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:061ee32c5351f5e8d3ed773e4563d40482bd78c9a12eca6f3ae8c37c25b030b3 -size 73960 +oid sha256:17995e2c669b4bc93d9d2d86f001e6f5fb89f837e4e9d5fb3de6a521bdc93910 +size 72376 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceConfirm.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceConfirm.uasset new file mode 100644 index 0000000..f644784 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceConfirm.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52fb56f7f1282dc01ec811b0c097cd8807aad05f502169f4eaa56096ac60d9b2 +size 19602 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceFail.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceFail.uasset new file mode 100644 index 0000000..36d8124 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceFail.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18c140029cc5d75933311eab0b054eaccd1990746692fd8cbb52594a4ce26dd7 +size 25994 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/MS_Slice.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/MS_Slice.uasset new file mode 100644 index 0000000..efb6fd7 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/MS_Slice.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a70dbd2eb2992db3b09a9c2507f1abf9256879b612a5ee448cbbd2d584cc4cb9 +size 109822 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-001.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-001.uasset new file mode 100644 index 0000000..ceae031 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16da7cfa184bc61b1ca3eaad64d0c61efa809fd163a86c7b7f7bffda48140235 +size 87666 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-002.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-002.uasset new file mode 100644 index 0000000..c6e5113 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9758dc0f0190477ad4fcff0d43c5cfc1892286e81afe2ae2e96e5fd3c559afe7 +size 78123 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-003.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-003.uasset new file mode 100644 index 0000000..cf1c3f1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96d015dfac7fb79e26111e7e20ad758d4846b5ba99a19c76148e14aa4d917f29 +size 74476 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/MusicSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/MusicSoundClass.uasset deleted file mode 100644 index 6933388..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/MusicSoundClass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aea51ad4ddbbbe5f4395cb2ffc8fb3d6778bd5da3b2afd7e26f2aa02b48f12a0 -size 1527 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MasterSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MasterSoundMix.uasset deleted file mode 100644 index ed00718..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MasterSoundMix.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5dfd71d25b55ff3b9129994fe14f235e96609ece02223f81b7da8b41bd37cfc2 -size 2080 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MusicSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MusicSoundMix.uasset deleted file mode 100644 index 2666565..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MusicSoundMix.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fb044782dae449765cb83776722115a6b1b2d658918525623a6c021ac9b5dda -size 2067 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_SFXSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_SFXSoundMix.uasset deleted file mode 100644 index b772f17..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_SFXSoundMix.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b94bb01284445ad9924b54fa106240ebececea72bea70d4d1b2821cdd68763b9 -size 2053 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SC_MasterSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SC_MasterSoundClass.uasset deleted file mode 100644 index 6463ddc..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SC_MasterSoundClass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d506474c1045f92ed33a9c1b5f7c72ba9c4904589f899959c4b38021247f607 -size 1731 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SFXSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SFXSoundClass.uasset deleted file mode 100644 index 9182649..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SFXSoundClass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ed462344cb652036dce27eb4d997c0faf5eaa35d54eaace47019d7d0bf2a2ec -size 1517 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/MusicSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/MusicSoundClass.uasset new file mode 100644 index 0000000..5bce649 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/MusicSoundClass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf059e1823466451aa7b76bd9bb3151522aed6c45de8a9710fab6256ad29a4fd +size 1524 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MasterSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MasterSoundMix.uasset new file mode 100644 index 0000000..32c1a09 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MasterSoundMix.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f9190d3510b25ffc9f8e5b814552db0d81f3d24a8f5b675a8acf6264f70d187 +size 2077 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MusicSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MusicSoundMix.uasset new file mode 100644 index 0000000..0f9fce3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MusicSoundMix.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:745bb62be3d9129f29e576a64cf9571a6793dc4125ab9b8f8ecd9de9168f678d +size 2064 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_SFXSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_SFXSoundMix.uasset new file mode 100644 index 0000000..ea16f3f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_SFXSoundMix.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a00284d82782db5f7d38277284bd958c3ef5654067c88ee933025205a84b4df6 +size 2050 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SC_MasterSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SC_MasterSoundClass.uasset new file mode 100644 index 0000000..12e44ff --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SC_MasterSoundClass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f705c4de401d530073766c55169f8cc9b043d9de1e8a7248200ec74d444333c +size 1727 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SFXSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SFXSoundClass.uasset new file mode 100644 index 0000000..c0e9814 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SFXSoundClass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86e7a7e2e0293bfa22cec64c971db72d0c8891f696ffc90113573ab399f9b04e +size 1514 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 52f0b95..7d8932f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9d836516bea5df6574383981e3c9f79095ffebbd69b706364820355662d2f58 +oid sha256:744fd64f9e6aba45134406e9abbbf6288d0a8de788f43238616c737e051f9423 size 478508 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 5059b38..1e3beb7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:488a472f632855a9153ac434fdae229f17e59f06df573f90b7e67827fe65e112 -size 64082 +oid sha256:8eeb4256f432385a34900e80cd988dda1874f64ec59fe22ed55b24ef1d16ca04 +size 71346 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index aa9449b..a17f85f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:485a4b31b60a9a9af7c391455bd8fc3fb6fb4e7188364538ebcef49740a18109 -size 1711627 +oid sha256:10afdc735299ccddfbe0493e94ca04177e82e546a61c5c980880a24834b4b0a6 +size 1711398 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 8215694..2f6e2a8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:becbab6951dec4c7e2485e23bf67d79c13accf65c87715355b6e842906b70b3d -size 149629 +oid sha256:e225f93637a067c08a4525e0430ea9f176d256f15033aa558429a0afb8ad90d4 +size 143682 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset index 3cf6b0b..a87e375 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7785080fe0d76a956641907ef88bdc86024ae6e03eceea4fbdcf51e9bce148c1 -size 720137 +oid sha256:f914528d3c6aec0f719085431fb40d32e9bead0f11283b7defba64e255ca717c +size 743689 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryDataTable.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryDataTable.uasset index 03da04f..14a8b77 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryDataTable.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryDataTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d70fbd7aa42a7ad373c22e0d0a899128781cfb636b6da4ac5ef65fa2e94b0339 -size 3541 +oid sha256:9add24d45b563018361e99c09043d392fc50b9210071e8eab7539f1622fefcae +size 4334 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_LogoIntro.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_LogoIntro.uasset index cb62768..23d36f0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_LogoIntro.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_LogoIntro.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea9ed728ae60d776643ed10ec5e05a9835504782554fb70161be4e7b568ff16a -size 55066 +oid sha256:e8823e396280d505b8d0234702bc86d9b93d74887761308c1132555bdf5bd231 +size 55064 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_MainMenuMusic.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_MainMenuMusic.uasset index c4ed1ab..99f3cf9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_MainMenuMusic.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_MainMenuMusic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0aef3c1929f68c301816cbdf0f644c12e62420906134285d3dc5d7bcec9d1931 -size 49583 +oid sha256:ebc81705e9a34a76c19d9a8e563fcd404ee735983d9fa15c18e55450fc0afbda +size 49581 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIClick.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIClick.uasset index 31ced3e..954947f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIClick.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIClick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3b071419c0749bc25af91e284e21e65adc94113995094aa120fe6624ec370f1 -size 57845 +oid sha256:896ca319bd9822360853a389087489aa6eee91b158b82b69a877d03ac095e1c5 +size 57843 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIConfirm.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIConfirm.uasset index 081ae67..be591b0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIConfirm.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIConfirm.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1516abde12af29c1c6b4d9a46a84b0621b7948fcce900ac98b9ea96a90e599c -size 58776 +oid sha256:728a8352e5db8b948b3c32c77494ee4573c73c3ee4dc6a10bde0e363b4955755 +size 58774 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIMove.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIMove.uasset index 37f87c9..cd1bf4b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIMove.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIMove.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6ba80fca27fff55f63364a106c6fba95d496e2c6cd27cb07498c777b4e6d473 -size 58755 +oid sha256:fafde9906f6a61e5c5391b9c0780d5cecb109b9add6d9f585a3ac2c7cf6ba0ed +size 58753 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/SW_MainMenuMusic.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/SW_MainMenuMusic.uasset index aeb4a0e..cd71ca1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/SW_MainMenuMusic.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/SW_MainMenuMusic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:beee301ed9c21abcdc1f11237c44c07d9765529037ca94975e2558cef1d4b440 -size 37199822 +oid sha256:ddc072404ba0f0ec087408bd6300532ed7f640b81ffde0726cf39763839ba071 +size 37199820 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset index aae54a6..93eaf77 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acba767a2010daac4364e0df6cee271537e684f81e2b8015c069c705a1c37298 -size 281602 +oid sha256:ee4669637dc3396d0025b0019ac8f4d00bc6d9730b1581ebfb842bc1b148242a +size 281743 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset index 3b0da13..02631ef 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4bf7c04c4cc959ef75b7fed0762e2319453487d837130a8740020880c80fee0 -size 51650 +oid sha256:f836afaa5c92697ac2f74c8ca548bc48129590baa17a7d0bacf5600df699db8d +size 53529 From cb6a153a71a8a36ce1032f06efb864b23568fae6 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 15 Jul 2025 16:59:07 +0200 Subject: [PATCH 24/56] Misc Cleanup --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/M_SliceGround.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceGround.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index 37732c6..35e8bf5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d097101f93909b39c8c11ef7bbb68abc6852f1d4144f4eedbd76829f248f2d4 -size 1416515 +oid sha256:486199fecc90c46e47fda25f9243197e48892e805c0cf0b1e09c66df14c7c187 +size 1051340 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index c5e1e1a..12086bf 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e5728f2609b3c3b1e47287eb1f9fb92cd66187a6dd8d4dba777b449a6e0e025 -size 804870 +oid sha256:ee05e6ed431a2a8963e72d1b2090bee588ddbe7e059da2892d38a9e5a09366f0 +size 815326 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index 4dab59f..fcefec6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17995e2c669b4bc93d9d2d86f001e6f5fb89f837e4e9d5fb3de6a521bdc93910 -size 72376 +oid sha256:80b591c680c42e8b563106cdc6a30e7fd1d674236eb321e25ca8323b3f11468b +size 77870 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceGround.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceGround.uasset new file mode 100644 index 0000000..24a1fe1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceGround.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:739ad231aa3a091940f616b82382a8f66ecb8ebf911cac382cc55e62aee07e6d +size 12391 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 1e3beb7..6d6db80 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8eeb4256f432385a34900e80cd988dda1874f64ec59fe22ed55b24ef1d16ca04 -size 71346 +oid sha256:1995648f6f3ee6dded048379864cb2c491d1a0ed5d748bd2c07acc0b51a31c5b +size 65646 From a3424ffec73219cdf079780d6f26db4a4e052932 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Sat, 19 Jul 2025 16:41:51 +0200 Subject: [PATCH 25/56] Made Captcha door work, made Clarice Projector work (two AnimGROUPS), Misc updates Maybe i can get rid of Cube collision Rotation on SliceGame --- .../MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset | 4 ++-- .../TestSong/BP_DynamicSliceObjectSpawner.uasset | 4 ++-- .../Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Outside_Default.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/Map_Stream_MachineRoom.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Misc/Examples/Button/CaptchaButtonComponent.uasset | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../Characters/Clarice/Animations/AM_MoveProjectorUp.uasset | 3 +++ .../World/Characters/Clarice/Animations/AM_OpenTop.uasset | 3 +++ .../Characters/Clarice/Animations/MoveProjectorUp.uasset | 4 ++-- .../World/Characters/Clarice/Animations/OpenTop.uasset | 4 ++-- .../Content/World/Characters/Clarice/BP_Clarice.uasset | 4 ++-- .../World/Characters/Clarice/ClariceMain_Skeleton.uasset | 4 ++-- .../World/Interactibles/Captchas/BP_BaseCaptcha.uasset | 4 ++-- .../Content/World/Interactibles/Captchas/M_Captcha.uasset | 4 ++-- .../Content/World/Interactibles/Captchas/Untitled-1.uasset | 4 ++-- .../Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset | 4 ++-- 22 files changed, 46 insertions(+), 40 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_MoveProjectorUp.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_OpenTop.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index 35e8bf5..fa51f8a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:486199fecc90c46e47fda25f9243197e48892e805c0cf0b1e09c66df14c7c187 -size 1051340 +oid sha256:af4ff40b1b73f00bd9ce1153a54801cfb9aa326cffdb46d078cc7937f3d6d153 +size 1070541 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index 12086bf..3550f9f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee05e6ed431a2a8963e72d1b2090bee588ddbe7e059da2892d38a9e5a09366f0 -size 815326 +oid sha256:072d7a39c033df2d9c75a9233871985796b2a1895730ba02c592cc60845e8469 +size 887274 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index fcefec6..0825e4b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80b591c680c42e8b563106cdc6a30e7fd1d674236eb321e25ca8323b3f11468b -size 77870 +oid sha256:b66661cc8a7c0c4ad270ca1cddfe299b373873beb2781cf7508424ca7bb0f75c +size 76289 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 7d8932f..8d73f10 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:744fd64f9e6aba45134406e9abbbf6288d0a8de788f43238616c737e051f9423 -size 478508 +oid sha256:aea3daf85efca53d76e68341ca542558b7650e6de043b1e183133c21885c8bd1 +size 479497 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index 6edfdbf..744445d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b66fe408cc6b34d099059b3e7af07793340f93b9d8d8594f3d59ec5a8c58eaa -size 20981 +oid sha256:6744dca0f50209df24a2c085a0af59273245c74d2a8088dac476f6f9abc5b9fc +size 21360 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 6d6db80..0ab2a6f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1995648f6f3ee6dded048379864cb2c491d1a0ed5d748bd2c07acc0b51a31c5b -size 65646 +oid sha256:12f988f7ff31a4e8dc056590bd1abfa259971daeb0419953b0fbce23718cb317 +size 68863 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap index 0db4d8c..d6e50de 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba89907a8cc8252d9aec1ee275601526e452440d91dd2ecb23d20f838c663d8d -size 22144 +oid sha256:a19dd9d1cb3df9d2f8bf3a83cbb8f965eb8da543282da41d68f1b28de46876df +size 24834 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index fcf7d97..14e0917 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98449a5e585ea635e85461c01fab7dcac92719700fe1d53649e25ad87cf8f222 -size 55509 +oid sha256:ba55b9ebf06aa790e938896b4ca527b943cd8c0ce472d5a90b98ba60a228c00a +size 61550 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index a17f85f..e26db63 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10afdc735299ccddfbe0493e94ca04177e82e546a61c5c980880a24834b4b0a6 -size 1711398 +oid sha256:cdf5fadeb2e3341d6130db67489501327a32a830a6c10b2ae6aab9fa6c6fb4e2 +size 1711865 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 2f6e2a8..3cfa547 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e225f93637a067c08a4525e0430ea9f176d256f15033aa558429a0afb8ad90d4 -size 143682 +oid sha256:9e6e2b4b4e0e91643fe7465a5c1d41c880c0e8c1779f36ac85a490d64bf8b7cc +size 150668 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset index 3ebd06d..978897b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af361fae4b8642150f282d8f1869e8bcbad6dc0ba2d3cb18182da2190620f374 -size 36186 +oid sha256:e95d8aa6644892c964e96f3ea093c6fc6e6161f449e46e84416f2d3cf20cdd23 +size 51570 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index b9a2422..3cb5743 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d687c16686441d96aa44f6f49f5cd76cc268151becba6f5b32c5e25a5ac8bd7 -size 354341 +oid sha256:2cc0d399a2186305212653074e32c1615dcbe75b18eafab415e68fd67e539893 +size 408554 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_MoveProjectorUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_MoveProjectorUp.uasset new file mode 100644 index 0000000..b978b8e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_MoveProjectorUp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7721db5b339e7ee60d59c937de419e59364da5d18959eaaafe9686c588e25d0e +size 9197 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_OpenTop.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_OpenTop.uasset new file mode 100644 index 0000000..01cbabb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_OpenTop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d94ffe8f360796fcfa1057c2bc95d9833ba009521e96b2c3d0d78af707c4d0ad +size 9153 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset index a44ff05..17ad3f4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba029fb1ca0d33739444691a79e9b6d46212ba3c611f13f4bc5a7efeab847a5c -size 116479 +oid sha256:52a80921766f3d38d2baa37486bd146d02db771cb14a8486e1cb822db05da34e +size 112635 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset index e2e9f09..984b8a1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7862f482c530b093265a140028def84bf1c7a507fbb0794266fdcc8b36dc8af -size 117010 +oid sha256:6e8e996a064f4232acd420ca4221182f85581259a604d65cfb68e44d3e2a53e4 +size 113170 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index 56a8fac..cc55ff8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:613dabca4c5311c41c1557d71372d74799053c555792e2b829f0a323c6e3d9b4 -size 442820 +oid sha256:9e0748f4cbba6a2b418f8cbae12e77f6e9618defaf3d3c871650263d95ef2fc8 +size 595786 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset index 69ebc44..79e88a0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7fa2648f0c996f26aac02eed4f122972d2555671b2ed3becffd294beeda4083 -size 13976 +oid sha256:a8f18899b3c474fdf12181c3624b4ef0da15382a3a45b3957dad47f4e731fe39 +size 14402 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset index 81d1e6f..33cb886 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82179f888d9f208fcc7b7a2e8f9215682435964b9c8cdbb0c0f442e22a8751b0 -size 193707 +oid sha256:c2f52d0246317b7129a9afd96591f1a07fdffbe0c553b6c75893d91d658e2613 +size 237808 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset index 26d3111..e4aaeba 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:886df15472895255aceb343481994ed7081f4048c8b248ce146f274c3266c97a -size 24861 +oid sha256:fcb5c15a27f40897e54192d9cea3adf3391e1404b2b2590e101a750961832723 +size 29136 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/Untitled-1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/Untitled-1.uasset index 8e0411c..961edbf 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/Untitled-1.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/Untitled-1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e29b5c7bf0f9a2ba6d158ca2abf3e1c594080ac3a9f37dd7d9ff8c4d998f0c1d -size 169674 +oid sha256:7dcba5ff6c73f919049b9c4e9303e7c1e5627fa5c10b54239c24832b8df46181 +size 956959 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset index 9b2539f..7a11061 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0767af7f646a2f76672d22b022ab49f1553032b7e65af4044ae2de146ff90c17 -size 66937 +oid sha256:98c1a9242d0ade1ccb91268ea0533c4afced66846773a5b004099636edf951bd +size 107344 From 275fc4f86078e19f0c00a4c0e2e4f782d224fa55 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 26 Aug 2025 15:43:07 +0200 Subject: [PATCH 26/56] Unifying FootIK placement --- .../Content/Core/Functions/CommonFunctions.uasset | 3 +++ .../Content/Maps/MotionControllerMap.umap | 2 +- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../Content/World/Characters/Clarice/IK_NewIKRig.uasset | 3 +++ .../World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset new file mode 100644 index 0000000..84bdaa3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5652bcbaec0ab0f487e09378f244c644137b479f1694e36714bd97b70cb57b60 +size 180212 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index e26db63..b3a45fd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdf5fadeb2e3341d6130db67489501327a32a830a6c10b2ae6aab9fa6c6fb4e2 +oid sha256:86939f325f7ff2db4967a26c63853ac52ec8ba6fed3f8ed684d3913d5a8475db size 1711865 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 3cb5743..ec6fc28 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cc0d399a2186305212653074e32c1615dcbe75b18eafab415e68fd67e539893 -size 408554 +oid sha256:698a1533f9e0c9e37eb0beaf1712150b1bbcad22f3c514cd9290228ad8b6eb50 +size 488727 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset new file mode 100644 index 0000000..4152aa2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18d4b230b1b39ef95aa03cf8264b5da22eec160a3af40cd1b8625c53ed13a72e +size 32898 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset index 0f5b86a..45d7e98 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:180e448b5df5c7302af63776f38bb1090698f458d86455a13c1413b976a808eb -size 608352 +oid sha256:e0ccdade2cd768e49b0009fad64159a46a4e829cfe0a563fc1eb4d68df531d50 +size 624966 From f036c2a1fb87d56bb370570c77defb33bc529f3b Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 2 Sep 2025 15:54:20 +0200 Subject: [PATCH 27/56] Some work on the NitroScan (Level Changing Device) --- .../Content/Core/Functions/CommonFunctions.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Content/UI/Inventory/BP_VRInventory.uasset | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../Content/World/Characters/Clarice/BP_Clarice.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset | 4 ++-- .../Interactibles/Electrical/NitroScan/BP_NitroScan.uasset | 3 +++ .../Interactibles/Electrical/NitroScan/M_NitroScan.uasset | 3 +++ .../Electrical/NitroScan/M_NitroScan_Screen.uasset | 3 +++ .../World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset | 3 +++ .../Interactibles/Electrical/NitroScan/M_Scanline.uasset | 3 +++ .../NitroScan/Mesh/DefaultMaterial_baseColor.uasset | 3 +++ .../Electrical/NitroScan/Mesh/DefaultMaterial_emissive.uasset | 3 +++ .../NitroScan/Mesh/DefaultMaterial_metallicRoughness.uasset | 3 +++ .../Electrical/NitroScan/Mesh/DefaultMaterial_normal.uasset | 3 +++ .../Interactibles/Electrical/NitroScan/Mesh/NitroScan.uasset | 3 +++ .../Electrical/NitroScan/Mesh/defaultMaterial1.uasset | 3 +++ .../Electrical/NitroScan/Mesh/defaultMaterial_001.uasset | 3 +++ .../Electrical/NitroScan/Mesh/defaultMaterial_002.uasset | 3 +++ .../Electrical/NitroScan/Mesh/defaultMaterial_003.uasset | 3 +++ .../Electrical/NitroScan/Mesh/defaultMaterial_004.uasset | 3 +++ .../Electrical/NitroScan/Mesh/defaultMaterial_005.uasset | 3 +++ .../Electrical/NitroScan/Mesh/defaultMaterial_006.uasset | 3 +++ .../Electrical/NitroScan/Mesh/defaultMaterial_007.uasset | 3 +++ .../Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset | 3 +++ .../Electrical/NitroScan/NitroScan_RenderTarget2D.uasset | 3 +++ 28 files changed, 76 insertions(+), 16 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan_Screen.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_baseColor.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_emissive.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_metallicRoughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/NitroScan.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial1.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_001.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_002.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_003.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_004.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_005.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_006.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_007.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset index 84bdaa3..8594e7e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5652bcbaec0ab0f487e09378f244c644137b479f1694e36714bd97b70cb57b60 -size 180212 +oid sha256:08c1537a278b179c21ec61fdb0371a4bbf3d2a92684d5b53bee038d378b8b9d2 +size 178316 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 8d73f10..50f172f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aea3daf85efca53d76e68341ca542558b7650e6de043b1e183133c21885c8bd1 -size 479497 +oid sha256:b17658b154c525c8f51b71b53c8126f3eb40b0b5bb17eb6f972ac45cd64e9a66 +size 483377 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index b3a45fd..416f288 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86939f325f7ff2db4967a26c63853ac52ec8ba6fed3f8ed684d3913d5a8475db -size 1711865 +oid sha256:95f9599ed76966a34db23f622ca831a1d5ab78fd8d125ce58d802decdc2d02cc +size 1712790 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 3cfa547..f70fd49 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e6e2b4b4e0e91643fe7465a5c1d41c880c0e8c1779f36ac85a490d64bf8b7cc -size 150668 +oid sha256:79ca79046170426abeec81919e9118f92f8631e72b3a3d904f0f416dd2bf3af0 +size 152834 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset index a87e375..a7ecb26 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f914528d3c6aec0f719085431fb40d32e9bead0f11283b7defba64e255ca717c -size 743689 +oid sha256:2ed0e624b4f3ca0c55e995eac72be2512cdce1be5e0ad99fc0379fde07b099bd +size 733055 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index ec6fc28..1c23b0a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:698a1533f9e0c9e37eb0beaf1712150b1bbcad22f3c514cd9290228ad8b6eb50 -size 488727 +oid sha256:ff673f4bed03db202bb6f88566128d5e2db61d9a9b56fe7ccb50dd06e7b9fc84 +size 485856 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index cc55ff8..9a9f593 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e0748f4cbba6a2b418f8cbae12e77f6e9618defaf3d3c871650263d95ef2fc8 -size 595786 +oid sha256:ab151ce8565de6334515110a6d854c0944807e1396cbdc6b586d09f4b448d696 +size 636925 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset index 45d7e98..813dd29 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0ccdade2cd768e49b0009fad64159a46a4e829cfe0a563fc1eb4d68df531d50 -size 624966 +oid sha256:bf736878cb52d4902aba1bd7d10e0ab9c8bbc79b1fbbd406a79934aeaa08bf0b +size 624698 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset new file mode 100644 index 0000000..67c489c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:681dd7eafe03ae224f2bb84806a65909bae4480d32ca9e3037fca651cceb2923 +size 138593 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan.uasset new file mode 100644 index 0000000..7abc6bf --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0132f0d2334a9c3d5ee764d2dd521e20b7aa4fc82dd13dc2cf6ada74826c6485 +size 21926 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan_Screen.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan_Screen.uasset new file mode 100644 index 0000000..0db7190 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan_Screen.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d876067794529675dc000c7c152365a08411057c9efb6ddcaaf94768074647e +size 16770 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset new file mode 100644 index 0000000..32d4a92 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd25d465fcd7584011c510a24afd70962af450810fa1080dcfba67e08d98482e +size 41643 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline.uasset new file mode 100644 index 0000000..b38f8e7 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00f63231dec0953d5549c43f4b7fe5c9ebf3007daff3d424570210c33e4a3bc0 +size 17392 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_baseColor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_baseColor.uasset new file mode 100644 index 0000000..21a5513 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_baseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86ca441403280ce518cf529ebc947983b660ed89098b3215530f70ab49c45512 +size 3438981 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_emissive.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_emissive.uasset new file mode 100644 index 0000000..97395e5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_emissive.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a491eaf8ca2969d963a5f83bf0365ea28814b6168d27087a9a14d4ae5afa6835 +size 165672 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_metallicRoughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_metallicRoughness.uasset new file mode 100644 index 0000000..f27aab5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_metallicRoughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3116e8ee42c0431b5ba94a6034d756d9ac7e0a310b5568e7f0b4adcd2f03ec3 +size 5424932 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_normal.uasset new file mode 100644 index 0000000..e1826c3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68643ede81ef33be54163e3671063146817c158696902ec6ce82e4030f5ab4ea +size 5799611 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/NitroScan.uasset new file mode 100644 index 0000000..6e33c07 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/NitroScan.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fa3e04850e3c20e3e2b553146960180f766724c01e0d915efb31cb9abd15d47 +size 56783 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial1.uasset new file mode 100644 index 0000000..0472f4c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42c0e0af14e2b57d4a6387e71cde9e0a6112e0ebf2ccd9ce7dade5e9c84eb06e +size 67242 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_001.uasset new file mode 100644 index 0000000..b72d66b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8b1b27fba05f864dc160fdbcf12a3644f1f0d3f10eae8a73064de6831a2b409 +size 74455 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_002.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_002.uasset new file mode 100644 index 0000000..a937516 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b626ad9a0566e8a12cfdf2781bc1daa20abc6d249ebff58187f868af709b91c2 +size 72493 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_003.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_003.uasset new file mode 100644 index 0000000..7bec0d4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ea6c56f6f8365ba3f26e8c84a4dde5f61383c164158126226de803c5768f96 +size 71584 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_004.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_004.uasset new file mode 100644 index 0000000..42669fb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d28e2866460439b10211a8420e31face4f5459e2b8cdcf4dfbc70fa44cbe8c78 +size 69581 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_005.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_005.uasset new file mode 100644 index 0000000..99ab14a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a2caed6311995f1bea2038f725bd806afe6b87ca178ca7708776fb99965813d +size 75863 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_006.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_006.uasset new file mode 100644 index 0000000..261f55d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a60806ea5563feed082c14956ed13ddc2efc77e91045dd12df911e17b691d419 +size 69490 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_007.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_007.uasset new file mode 100644 index 0000000..671ca42 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f8f2d4e14f2f656656acd0917dfb9d7df9474c8bd4c5eb708898a6b34486a1f +size 268855 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset new file mode 100644 index 0000000..8fc2938 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8162abb15096223b986a8fd59f3228df6aea49062cc4b3f08a5106a4b5aaeb20 +size 325457 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset new file mode 100644 index 0000000..115fa2b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:704cc4bdf2f13601d0517eb1f67c3128bde9ff09bb681ea105895d408680dd76 +size 4563 From d29dbbbe458bfaf157cef8c8de4adc757257c55b Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 5 Sep 2025 15:32:59 +0200 Subject: [PATCH 28/56] Update to 5.6, lots of Cleanup --- .gitignore | 14 + VIRTUOS_ExpansionPluginTests/.gitattributes | 2 - VIRTUOS_ExpansionPluginTests/.gitignore | 13 - VIRTUOS_ExpansionPluginTests/.vsconfig | 4 +- .../Config/DefaultEditor.ini | 5 +- .../TestSong/BP_DynamicSliceObject.uasset | 4 +- .../BP_DynamicSliceObjectSpawner.uasset | 4 +- .../Content/Maps/Map_Gameworld.umap | 4 +- .../Content/Maps/Map_Outside_Default.umap | 4 +- .../Content/Maps/Map_Room_Kitchen.umap | 4 +- .../Content/Maps/Map_Stream_MachineRoom.umap | 4 +- .../Content/Maps/Map_Workspace.umap | 4 +- .../Content/Maps/MotionControllerMap.umap | 4 +- .../Content/Maps/SL_FreezeRoom.umap | 4 +- .../Content/VFX/M_Circle.uasset | 3 + .../Content/VFX/M_Rays.uasset | 3 + .../Content/VFX/NPC_VRTemplate.uasset | 3 + .../Content/VFX/NS_MenuPointer.uasset | 3 + .../Content/VFX/NS_PickupTrace.uasset | 3 + .../Content/VFX/NS_Portal.uasset | 3 + .../Content/VFX/NS_ScanLaser.uasset | 3 + .../Content/VFX/NS_TeleportTrace.uasset | 3 + .../VFX/Projector/BP_TestProjector.uasset | 3 + .../Content/VFX/Projector/MI_Projector.uasset | 3 + .../Content/VFX/Projector/MI_SliceTest.uasset | 3 + .../VFX/Projector/MPC_Projector.uasset | 3 + .../Content/VFX/Projector/M_Projector.uasset | 3 + .../Content/VFX/Projector/M_Rays.uasset | 3 + .../Content/VFX/Projector/M_Rays_Inst.uasset | 3 + .../NewMolecule_002_Bake1_PBR_Diffuse.uasset | 3 + .../Content/VFX/Projector/Nitrate.uasset | 3 + .../Content/VFX/Projector/Nitrate_LP.uasset | 3 + .../Core/Character/BP_Trace_Controller.uasset | 4 +- .../VRE/Core/Character/BP_VRCharacter.uasset | 4 +- .../VRE/Core/Character/FPS_VRCharacter.uasset | 4 +- .../Grippables/Weapons/Melee/MeleeBase.uasset | 4 +- .../Input/Actions/AlternateGripLeft.uasset | 3 - .../Input/Actions/AlternateGripRight.uasset | 3 - .../Actions/ControllerMovementLeft.uasset | 3 - .../Actions/ControllerMovementRight.uasset | 3 - .../VRE/Input/Actions/FPSActions/Jump.uasset | 3 - .../Input/Actions/FPSActions/LookUp.uasset | 3 - .../Actions/FPSActions/MoveForward.uasset | 3 - .../Input/Actions/FPSActions/MoveRight.uasset | 3 - .../VRE/Input/Actions/FPSActions/Turn.uasset | 3 - .../VRE/Input/Actions/LaserBeamLeft.uasset | 3 - .../VRE/Input/Actions/LaserBeamRight.uasset | 3 - .../MotionControllerThumbLeft_X.uasset | 3 - .../MotionControllerThumbLeft_Y.uasset | 3 - .../MotionControllerThumbRight_X.uasset | 3 - .../MotionControllerThumbRight_Y.uasset | 3 - .../VRE/Input/Actions/PauseGame.uasset | 3 - .../VRE/Input/Actions/PrimaryGripLeft.uasset | 3 - .../VRE/Input/Actions/PrimaryGripRight.uasset | 3 - .../VRE/Input/Actions/SpawnInventory.uasset | 3 - .../VRE/Input/Actions/TeleportLeft.uasset | 3 - .../VRE/Input/Actions/TeleportRight.uasset | 3 - .../Input/Actions/UseHeldObjectLeft.uasset | 3 - .../Input/Actions/UseHeldObjectRight.uasset | 3 - .../Content/VRE/Input/FPSInputConfig.uasset | 3 - .../Content/VRE/Input/FPSInputContext.uasset | 3 - .../Content/VRE/Input/VREInputConfig.uasset | 3 - .../VRE/Input/VREInputMappingContext.uasset | 3 - .../Car/VehicleBP/Sedan/BP_Tractor.uasset | 4 +- .../Level/Car/VehicleBP/Sedan/Sedan.uasset | 4 +- .../Core/Character/BP_VRCharacter2.uasset | 4 +- .../VRE/VRE2/Input/Actions/PauseGame.uasset | 3 + .../VRE2/Input/Actions/SpawnInventory.uasset | 3 + .../VRE/VRE2/Input/FPSActions/Jump.uasset | 3 + .../VRE/VRE2/Input/FPSActions/LookUp.uasset | 3 + .../VRE2/Input/FPSActions/MoveForward.uasset | 3 + .../VRE2/Input/FPSActions/MoveRight.uasset | 3 + .../VRE/VRE2/Input/FPSActions/Turn.uasset | 3 + .../VRE/VRE2/Input/FPSInputConfig.uasset | 3 + .../VRE/VRE2/Input/FPSInputContext.uasset | 3 + .../VRE/VRE2/Input/VREInputConfig.uasset | 3 + .../VRE2/Input/VREInputMappingContext.uasset | 3 + .../VRE/VRTemplate/VFX/NPC_VRTemplate.uasset | 3 - .../VRE/VRTemplate/VFX/NS_MenuPointer.uasset | 3 - .../VRE/VRTemplate/VFX/NS_PickupTrace.uasset | 3 - .../VRTemplate/VFX/NS_TeleportTrace.uasset | 3 - .../Characters/Clarice/BP_Clarice.uasset | 4 +- .../Electrical/NitroScan/BP_NitroScan.uasset | 4 +- .../Electrical/NitroScan/M_Scanline.uasset | 4 +- .../NitroScan/M_Scanline_Inst.uasset | 3 + .../Electrical/NitroScan/NS_ScanLaser.uasset | 4 +- .../Letters/Letter_1/Letter_01_1_of_1.uasset | 4 +- .../Materials/PostProcess/M_PP_Hide.uasset | 3 + .../StoneTiles/Test_WS_Parallax_Fllor.uasset | 4 +- .../World/Static/Lights/BP_Light.uasset | 4 +- .../Static/Splines/Pipes/Half-X-Pipe.uasset | 4 +- .../World/Static/Splines/Pipes/M_Pipe.uasset | 4 +- .../World/Static/Splines/Pipes/M_Pipe1.uasset | 3 - .../Static/Splines/Pipes/M_Pipe1_Inst.uasset | 3 - .../Static/Splines/Pipes/M_Pipe_Inst.uasset | 4 +- .../Static/Splines/Pipes/M_Pipe_Inst1.uasset | 3 - .../Static/Splines/Pipes/M_Pipe_Inst2.uasset | 3 + .../Splines/Pipes/M_Pipe_Inst_UVBox.uasset | 3 + .../Pipes/Pipe004_4K-JPG_NormalDX.uasset | 3 + .../SM_Freezing_Chamber_Grating.uasset | 4 +- .../Stairs/Gratings/SM_Grating2_Square.uasset | 4 +- .../Stairs/Gratings/SM_Grating_Large.uasset | 3 + .../World/Static/Walls/BP_Floor.uasset | 4 +- .../VFX/Projector/BP_TestProjector.uasset | 3 - .../World/VFX/Projector/MI_Projector.uasset | 3 - .../World/VFX/Projector/MI_SliceTest.uasset | 3 - .../World/VFX/Projector/MPC_Projector.uasset | 3 - .../World/VFX/Projector/M_Projector.uasset | 3 - .../VFX/Projector/M_Projector_Inst.uasset | 3 - .../Content/World/VFX/Projector/M_Rays.uasset | 3 - .../World/VFX/Projector/M_Rays_Inst.uasset | 3 - .../NewMolecule_002_Bake1_PBR_Diffuse.uasset | 3 - .../World/VFX/Projector/Nitrate.uasset | 3 - .../World/VFX/Projector/Nitrate_LP.uasset | 3 - VIRTUOS_ExpansionPluginTests/LICENSE.txt | 19 - .../OpenXRExpansionPlugin.Build.cs | 4 + .../Private/CharacterMovementCompTypes.cpp | 5 + .../Private/GripMotionControllerComponent.cpp | 97 +-- .../GrippablePhysicsReplication.cpp | 642 +++++++++++++----- .../Grippables/GrippableStaticMeshActor.cpp | 4 +- .../Grippables/HandSocketComponent.cpp | 21 +- .../Misc/OptionalRepSkeletalMeshActor.cpp | 1 + .../Private/Misc/VRAIPerceptionOverrides.cpp | 6 +- .../Private/Misc/VRGameViewportClient.cpp | 14 +- .../Private/Misc/VRRenderTargetManager.cpp | 2 +- .../Private/ReplicatedVRCameraComponent.cpp | 10 +- .../Private/VRBaseCharacter.cpp | 2 +- .../VRBaseCharacterMovementComponent.cpp | 22 +- .../Private/VRCharacterMovementComponent.cpp | 28 +- .../Private/VRGestureComponent.cpp | 2 +- .../Private/VRPathFollowingComponent.cpp | 2 +- .../Private/VRRootComponent.cpp | 11 +- .../Private/VRStereoWidgetComponent.cpp | 27 +- .../Grippables/GrippablePhysicsReplication.h | 19 +- .../Public/Misc/VRGameViewportClient.h | 2 +- .../Public/Misc/VRVehiclePawn.h | 6 +- .../Public/Misc/VRWheeledVehicle.h | 6 +- .../Public/VRStereoWidgetComponent.h | 3 + .../VRExpansionPlugin.Build.cs | 3 + VIRTUOS_ExpansionPluginTests/README.md | 10 - .../VRExpPluginExample.uproject | 2 +- 141 files changed, 859 insertions(+), 505 deletions(-) delete mode 100644 VIRTUOS_ExpansionPluginTests/.gitattributes delete mode 100644 VIRTUOS_ExpansionPluginTests/.gitignore create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/NPC_VRTemplate.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/NS_MenuPointer.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/NS_PickupTrace.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/NS_TeleportTrace.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/BP_TestProjector.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_Projector.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_SliceTest.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MPC_Projector.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Projector.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays_Inst.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate_LP.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripLeft.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripRight.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementLeft.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementRight.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Jump.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/LookUp.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveForward.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveRight.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Turn.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamLeft.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamRight.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_X.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_Y.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_X.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_Y.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PauseGame.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripLeft.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripRight.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/SpawnInventory.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportLeft.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportRight.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectLeft.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectRight.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputConfig.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputContext.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputConfig.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputMappingContext.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/PauseGame.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/SpawnInventory.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Jump.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/LookUp.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveForward.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveRight.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Turn.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputConfig.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputContext.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputConfig.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputMappingContext.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NPC_VRTemplate.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_MenuPointer.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_PickupTrace.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_TeleportTrace.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline_Inst.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Hide.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1_Inst.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst1.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Pipe004_4K-JPG_NormalDX.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating_Large.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/BP_TestProjector.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_Projector.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_SliceTest.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MPC_Projector.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector_Inst.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays_Inst.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate_LP.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/LICENSE.txt delete mode 100644 VIRTUOS_ExpansionPluginTests/README.md diff --git a/.gitignore b/.gitignore index 2da3c79..8dfa010 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,17 @@ DerivedDataCache/* # Custom *.rpp-bak *.blend1 + +# Paths +.hg/ +binaries/ +deriveddatacache/ +.vs/ +build/ +intermediate/ +PACKPLUGIN/ +COMPPLUGIN/ +saved/ +*.orig +*.sln +*.xlsx \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/.gitattributes b/VIRTUOS_ExpansionPluginTests/.gitattributes deleted file mode 100644 index 3373152..0000000 --- a/VIRTUOS_ExpansionPluginTests/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -* text=auto -*.bat eol=crlf \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/.gitignore b/VIRTUOS_ExpansionPluginTests/.gitignore deleted file mode 100644 index c66e5a0..0000000 --- a/VIRTUOS_ExpansionPluginTests/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ - -.hg/ -binaries/ -deriveddatacache/ -.vs/ -build/ -intermediate/ -PACKPLUGIN/ -COMPPLUGIN/ -saved/ -*.orig -*.sln -*.xlsx diff --git a/VIRTUOS_ExpansionPluginTests/.vsconfig b/VIRTUOS_ExpansionPluginTests/.vsconfig index b3c233d..3b919ea 100644 --- a/VIRTUOS_ExpansionPluginTests/.vsconfig +++ b/VIRTUOS_ExpansionPluginTests/.vsconfig @@ -1,10 +1,12 @@ { "version": "1.0", "components": [ + "Component.Unreal.Debugger", + "Component.Unreal.Ide", "Microsoft.Net.Component.4.6.2.TargetingPack", - "Microsoft.VisualStudio.Component.Unreal.Workspace", "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL", "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64", + "Microsoft.VisualStudio.Component.VC.Llvm.Clang", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.CoreEditor", diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini index 4f9fc16..05b130e 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini @@ -7,8 +7,9 @@ +Profiles=(ProfileName="Default",DirectionalLightIntensity=2.620000,DirectionalLightColor=(R=0.990000,G=0.839850,B=0.732600,A=1.000000),SkyLightIntensity=0.880000,bRotateLightingRig=False,bShowEnvironment=True,bShowFloor=True,EnvironmentCubeMapPath="",PostProcessingSettings=(bOverride_WhiteTemp=True,bOverride_WhiteTint=False,bOverride_ColorSaturation=True,bOverride_ColorContrast=True,bOverride_ColorGamma=True,bOverride_ColorGain=True,bOverride_ColorOffset=True,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_FilmWhitePoint=False,bOverride_FilmSaturation=False,bOverride_FilmChannelMixerRed=False,bOverride_FilmChannelMixerGreen=False,bOverride_FilmChannelMixerBlue=False,bOverride_FilmContrast=False,bOverride_FilmDynamicRange=False,bOverride_FilmHealAmount=False,bOverride_FilmToeAmount=False,bOverride_FilmShadowTint=False,bOverride_FilmShadowTintBlend=False,bOverride_FilmShadowTintAmount=False,bOverride_FilmSlope=True,bOverride_FilmToe=True,bOverride_FilmShoulder=True,bOverride_FilmBlackClip=True,bOverride_FilmWhiteClip=True,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomIntensity=True,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_AutoExposureMethod=True,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=True,bOverride_AutoExposureMaxBrightness=True,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=True,bOverride_HistogramLogMin=True,bOverride_HistogramLogMax=True,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=True,bOverride_GrainIntensity=False,bOverride_GrainJitter=False,bOverride_AmbientOcclusionIntensity=True,bOverride_AmbientOcclusionStaticFraction=True,bOverride_AmbientOcclusionRadius=True,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionDistance=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=True,bOverride_AmbientOcclusionBias=True,bOverride_AmbientOcclusionQuality=True,bOverride_AmbientOcclusionMipBlend=True,bOverride_AmbientOcclusionMipScale=True,bOverride_AmbientOcclusionMipThreshold=True,bOverride_LPVIntensity=False,bOverride_LPVDirectionalOcclusionIntensity=False,bOverride_LPVDirectionalOcclusionRadius=False,bOverride_LPVDiffuseOcclusionExponent=False,bOverride_LPVSpecularOcclusionExponent=False,bOverride_LPVDiffuseOcclusionIntensity=False,bOverride_LPVSpecularOcclusionIntensity=False,bOverride_LPVSize=False,bOverride_LPVSecondaryOcclusionIntensity=False,bOverride_LPVSecondaryBounceIntensity=False,bOverride_LPVGeometryVolumeBias=False,bOverride_LPVVplInjectionBias=False,bOverride_LPVEmissiveInjectionIntensity=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=True,bOverride_ColorGradingLUT=True,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=True,bOverride_DepthOfFieldMaxBokehSize=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_DepthOfFieldMethod=True,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldBokehShape=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldColorThreshold=False,bOverride_DepthOfFieldSizeThreshold=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ScreenPercentage=False,bOverride_ScreenSpaceReflectionIntensity=True,bOverride_ScreenSpaceReflectionQuality=True,bOverride_ScreenSpaceReflectionMaxRoughness=True,bOverride_ScreenSpaceReflectionRoughnessScale=False,WhiteTemp=6700.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.005000,Y=0.005000,Z=0.005000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionShadowsMax=0.090000,ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,FilmWhitePoint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),FilmShadowTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),FilmShadowTintBlend=0.500000,FilmShadowTintAmount=0.000000,FilmSaturation=1.000000,FilmChannelMixerRed=(R=1.000000,G=0.000000,B=0.000000,A=1.000000),FilmChannelMixerGreen=(R=0.000000,G=1.000000,B=0.000000,A=1.000000),FilmChannelMixerBlue=(R=0.000000,G=0.000000,B=1.000000,A=1.000000),FilmContrast=0.030000,FilmToeAmount=1.000000,FilmHealAmount=0.180000,FilmDynamicRange=4.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,BloomIntensity=1.000000,BloomThreshold=1.000000,BloomSizeScale=4.000000,Bloom1Size=1.000000,Bloom2Size=4.000000,Bloom3Size=16.000000,Bloom4Size=32.000000,Bloom5Size=64.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom2Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom3Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom4Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom5Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom6Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),BloomDirtMaskIntensity=1.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),BloomDirtMask=None,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,AutoExposureMethod=AEM_Histogram,AutoExposureLowPercent=80.000000,AutoExposureHighPercent=98.300003,AutoExposureMinBrightness=1.000000,AutoExposureMaxBrightness=1.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,AutoExposureBias=0.330000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.161468,GrainJitter=0.000000,GrainIntensity=0.000000,AmbientOcclusionIntensity=1.000000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=73.477997,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionDistance=80.000000,AmbientOcclusionPower=1.200000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=100.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,ColorGradingIntensity=0.000000,ColorGradingLUT=Texture2D'/Engine/EditorResources/RGBTable16x1_AssetViewer.RGBTable16x1_AssetViewer',DepthOfFieldMethod=DOFM_BokehDOF,bMobileHQGaussian=False,DepthOfFieldFstop=4.000000,DepthOfFieldSensorWidth=24.576000,DepthOfFieldFocalDistance=1000.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldMaxBokehSize=15.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldBokehShape=None,DepthOfFieldOcclusion=0.400000,DepthOfFieldColorThreshold=1.000000,DepthOfFieldSizeThreshold=0.080000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurPerObjectSize=0.500000,LPVIntensity=1.000000,LPVVplInjectionBias=0.640000,LPVSize=5312.000000,LPVSecondaryOcclusionIntensity=0.000000,LPVSecondaryBounceIntensity=0.000000,LPVGeometryVolumeBias=0.384000,LPVEmissiveInjectionIntensity=1.000000,LPVDirectionalOcclusionIntensity=0.000000,LPVDirectionalOcclusionRadius=8.000000,LPVDiffuseOcclusionExponent=1.000000,LPVSpecularOcclusionExponent=7.000000,LPVDiffuseOcclusionIntensity=1.000000,LPVSpecularOcclusionIntensity=1.000000,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=100.000000,ScreenSpaceReflectionMaxRoughness=1.000000,ScreenPercentage=100.000000,WeightedBlendables=(Array=),Blendables=),bPostProcessingEnabled=True,LightingRigRotation=109.389069,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-39.999985,Yaw=-67.500015,Roll=0.000000)) [/Script/AdvancedPreviewScene.SharedProfiles] -+Profiles=(ProfileName="Epic Headquarters",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=1.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=1.000000,bRotateLightingRig=False,bShowEnvironment=True,bShowFloor=False,bShowGrid=False,EnvironmentColor=(R=0.200000,G=0.200000,B=0.200000,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/EpicQuadPanorama_CC+EV1.EpicQuadPanorama_CC+EV1",bPostProcessingEnabled=True,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=True,bShowMeshEdges=False) -+Profiles=(ProfileName="Grey Wireframe",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=1.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=1.000000,bRotateLightingRig=False,bShowEnvironment=False,bShowFloor=False,bShowGrid=True,EnvironmentColor=(R=0.039216,G=0.039216,B=0.039216,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/EpicQuadPanorama_CC+EV1.EpicQuadPanorama_CC+EV1",bPostProcessingEnabled=False,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=False,bShowMeshEdges=True) ++Profiles=(ProfileName="Epic Headquarters",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=1.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=1.000000,bRotateLightingRig=False,bShowEnvironment=True,bShowFloor=False,bShowGrid=False,EnvironmentColor=(R=0.200000,G=0.200000,B=0.200000,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/EpicQuadPanorama_CC+EV1.EpicQuadPanorama_CC+EV1",bPostProcessingEnabled=True,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureHighlightThresholdStrength=False,bOverride_LocalExposureShadowThresholdStrength=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldPetzvalBokeh=False,bOverride_DepthOfFieldPetzvalBokehFalloff=False,bOverride_DepthOfFieldPetzvalExclusionBoxExtents=False,bOverride_DepthOfFieldPetzvalExclusionBoxRadius=False,bOverride_DepthOfFieldAspectRatioScalar=False,bOverride_DepthOfFieldMatteBoxFlags=False,bOverride_DepthOfFieldBarrelRadius=False,bOverride_DepthOfFieldBarrelLength=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_RayTracingTranslucencyMaxPrimaryHitEvents=False,bOverride_RayTracingTranslucencyMaxSecondaryHitEvents=False,bOverride_RayTracingTranslucencyUseRayTracedRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenSkylightLeakingTint=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenSkylightLeakingTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureHighlightThresholdStrength=1.000000,LocalExposureShadowThresholdStrength=1.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldPetzvalBokeh=0.000000,DepthOfFieldPetzvalBokehFalloff=1.000000,DepthOfFieldPetzvalExclusionBoxExtents=(X=0.000000,Y=0.000000),DepthOfFieldPetzvalExclusionBoxRadius=0.000000,DepthOfFieldAspectRatioScalar=1.000000,DepthOfFieldBarrelRadius=5.000000,DepthOfFieldBarrelLength=0.000000,DepthOfFieldMatteBoxFlags[0]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[1]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[2]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyMaxPrimaryHitEvents=4,RayTracingTranslucencyMaxSecondaryHitEvents=2,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,RayTracingTranslucencyUseRayTracedRefraction=False,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=True,bShowMeshEdges=False) ++Profiles=(ProfileName="Grey Wireframe",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=1.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=1.000000,bRotateLightingRig=False,bShowEnvironment=False,bShowFloor=False,bShowGrid=True,EnvironmentColor=(R=0.039216,G=0.039216,B=0.039216,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/EpicQuadPanorama_CC+EV1.EpicQuadPanorama_CC+EV1",bPostProcessingEnabled=False,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureHighlightThresholdStrength=False,bOverride_LocalExposureShadowThresholdStrength=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldPetzvalBokeh=False,bOverride_DepthOfFieldPetzvalBokehFalloff=False,bOverride_DepthOfFieldPetzvalExclusionBoxExtents=False,bOverride_DepthOfFieldPetzvalExclusionBoxRadius=False,bOverride_DepthOfFieldAspectRatioScalar=False,bOverride_DepthOfFieldMatteBoxFlags=False,bOverride_DepthOfFieldBarrelRadius=False,bOverride_DepthOfFieldBarrelLength=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_RayTracingTranslucencyMaxPrimaryHitEvents=False,bOverride_RayTracingTranslucencyMaxSecondaryHitEvents=False,bOverride_RayTracingTranslucencyUseRayTracedRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenSkylightLeakingTint=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenSkylightLeakingTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureHighlightThresholdStrength=1.000000,LocalExposureShadowThresholdStrength=1.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldPetzvalBokeh=0.000000,DepthOfFieldPetzvalBokehFalloff=1.000000,DepthOfFieldPetzvalExclusionBoxExtents=(X=0.000000,Y=0.000000),DepthOfFieldPetzvalExclusionBoxRadius=0.000000,DepthOfFieldAspectRatioScalar=1.000000,DepthOfFieldBarrelRadius=5.000000,DepthOfFieldBarrelLength=0.000000,DepthOfFieldMatteBoxFlags[0]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[1]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[2]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyMaxPrimaryHitEvents=4,RayTracingTranslucencyMaxSecondaryHitEvents=2,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,RayTracingTranslucencyUseRayTracedRefraction=False,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=False,bShowMeshEdges=True) ++Profiles=(ProfileName="Grey Ambient",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=4.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=2.000000,bRotateLightingRig=False,bShowEnvironment=True,bShowFloor=True,bShowGrid=True,EnvironmentColor=(R=0.200000,G=0.200000,B=0.200000,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/T_GreyAmbient",bPostProcessingEnabled=False,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureHighlightThresholdStrength=False,bOverride_LocalExposureShadowThresholdStrength=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldPetzvalBokeh=False,bOverride_DepthOfFieldPetzvalBokehFalloff=False,bOverride_DepthOfFieldPetzvalExclusionBoxExtents=False,bOverride_DepthOfFieldPetzvalExclusionBoxRadius=False,bOverride_DepthOfFieldAspectRatioScalar=False,bOverride_DepthOfFieldMatteBoxFlags=False,bOverride_DepthOfFieldBarrelRadius=False,bOverride_DepthOfFieldBarrelLength=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_RayTracingTranslucencyMaxPrimaryHitEvents=False,bOverride_RayTracingTranslucencyMaxSecondaryHitEvents=False,bOverride_RayTracingTranslucencyUseRayTracedRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenSkylightLeakingTint=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenSkylightLeakingTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureHighlightThresholdStrength=1.000000,LocalExposureShadowThresholdStrength=1.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldPetzvalBokeh=0.000000,DepthOfFieldPetzvalBokehFalloff=1.000000,DepthOfFieldPetzvalExclusionBoxExtents=(X=0.000000,Y=0.000000),DepthOfFieldPetzvalExclusionBoxRadius=0.000000,DepthOfFieldAspectRatioScalar=1.000000,DepthOfFieldBarrelRadius=5.000000,DepthOfFieldBarrelLength=0.000000,DepthOfFieldMatteBoxFlags[0]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[1]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[2]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyMaxPrimaryHitEvents=4,RayTracingTranslucencyMaxSecondaryHitEvents=2,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,RayTracingTranslucencyUseRayTracedRefraction=False,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=False,bShowMeshEdges=False) [/Script/UnrealEd.EditorPerformanceProjectSettings] MobileScreenPercentageMode=BasedOnDisplayResolution diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index fa51f8a..84ad2f9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af4ff40b1b73f00bd9ce1153a54801cfb9aa326cffdb46d078cc7937f3d6d153 -size 1070541 +oid sha256:6f638016a9279817b9e5098648ca6a0278a3854a6fc39d796c35035db9e7a654 +size 1063543 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index 3550f9f..a9b1a2c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:072d7a39c033df2d9c75a9233871985796b2a1895730ba02c592cc60845e8469 -size 887274 +oid sha256:bc7f325c68df2b61c908840d5e5d68205ba5b0b991352969273d81aebf4d3834 +size 872593 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 50f172f..0afa04f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b17658b154c525c8f51b71b53c8126f3eb40b0b5bb17eb6f972ac45cd64e9a66 -size 483377 +oid sha256:384478091075a5b329330487013e8359df47d1c9e7878040ef3693285b87466a +size 503313 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index 744445d..f7100f4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6744dca0f50209df24a2c085a0af59273245c74d2a8088dac476f6f9abc5b9fc -size 21360 +oid sha256:4598073efbde5f5e4273e1d0d33cbbd33ce80a28c488504243bb394cc47d0afd +size 31928 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index 3aaaf99..ca88dd2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f40364a19f7c2df8e7cba1a2b93ad74f563f93a2375d13c9a6556df5458caf3 -size 148750 +oid sha256:0f34273db9016b454f4d0253f56624cff6f6569a6c542df1773c757e6a04c135 +size 146001 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap index d6e50de..730a910 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a19dd9d1cb3df9d2f8bf3a83cbb8f965eb8da543282da41d68f1b28de46876df -size 24834 +oid sha256:945fabad519394f1b1b99449dec3be422cecb67fc8ccbc6d359b8cbfbd10c2fc +size 27574 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index 14e0917..700d642 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba55b9ebf06aa790e938896b4ca527b943cd8c0ce472d5a90b98ba60a228c00a -size 61550 +oid sha256:07dc6e4952fe736076cd329bec22a2eec02fb350c73a725a270ca82f8060325e +size 59640 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 416f288..6e8a05c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95f9599ed76966a34db23f622ca831a1d5ab78fd8d125ce58d802decdc2d02cc -size 1712790 +oid sha256:6f8bcd7b69a776fe9c55fe59cba0c440ba30a9b332e5a393f9d6d8e1beedb290 +size 1727775 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index f70fd49..96ef3ca 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79ca79046170426abeec81919e9118f92f8631e72b3a3d904f0f416dd2bf3af0 -size 152834 +oid sha256:ba4676536b31d9bbfafc1d1f458c1b90ad0e9c7ecbbf672bdd94d156ca4c9516 +size 157883 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset new file mode 100644 index 0000000..5cbc585 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a076a6f4f7bce4bb8310a29cd0cf921f277fbb20865fb6d6d360c33d7ab3329 +size 23762 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset new file mode 100644 index 0000000..bb5ab16 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2e06c9ff74bb112414b09eee960997bed19e1e28b6686b28fc9380f8658e129 +size 28984 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NPC_VRTemplate.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NPC_VRTemplate.uasset new file mode 100644 index 0000000..1f328cc --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/NPC_VRTemplate.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:404fb25177f36a3d99b74588831b64371c7c96d5cb2f424a7ddf65c40e9ed346 +size 2736 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_MenuPointer.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_MenuPointer.uasset new file mode 100644 index 0000000..846e9b1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_MenuPointer.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc052684268e4399ee0ef2c839a32c24230aac5439a69f35d08624775834726f +size 341531 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_PickupTrace.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_PickupTrace.uasset new file mode 100644 index 0000000..60cd929 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_PickupTrace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c735274e73d0ac856b7865e0ecbd4e7fe3d0537542a913e366bffb34678349d4 +size 337936 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset new file mode 100644 index 0000000..b73806a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:904383cda47b9fc0c73b2ec872ffceb4dad8eb8fa252881b877c1e2e0c9fb1d7 +size 1192957 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset new file mode 100644 index 0000000..5130b81 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7b81f183f46579c81c55985bb00b837fb501ad9bb74dac995e514c4821dd509 +size 317038 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_TeleportTrace.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_TeleportTrace.uasset new file mode 100644 index 0000000..2629ee1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_TeleportTrace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fb649507bda0f4ab145259b2cfc6eba3c83cd951cbfb4d8df97555ec12e0172 +size 342384 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/BP_TestProjector.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/BP_TestProjector.uasset new file mode 100644 index 0000000..aea8609 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/BP_TestProjector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be8fd47de9b5d5fc6e941bc1da191bf171c5410496e2f9fb08b4b6f8bbeec8a9 +size 47579 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_Projector.uasset new file mode 100644 index 0000000..d410380 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_Projector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c80305cdbf977dc2fdefd39062cbe84113670b2eef3b15bcb239b2d52d400124 +size 22595 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_SliceTest.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_SliceTest.uasset new file mode 100644 index 0000000..20feab2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_SliceTest.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac92c72ad8ca07aff256b4d2b76617bf8aafadea26af482a0861e841e1b8a676 +size 10581 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MPC_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MPC_Projector.uasset new file mode 100644 index 0000000..1d22a76 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MPC_Projector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff89ffca9a9ff569d7b6c3686e20e5da9f58c20b9ae5262d59172892d8532ba2 +size 1645 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Projector.uasset new file mode 100644 index 0000000..1a80116 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Projector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdbdb863b110e9f4cef12d86cfc8a0d7e88b646513cf9a9497c99683af3e8d40 +size 33893 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays.uasset new file mode 100644 index 0000000..cf30dd7 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:405ff410436b51e89db03924ca5d8d6a3c84d5fc086f0efd7591dcc9f6171cbe +size 35527 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays_Inst.uasset new file mode 100644 index 0000000..1e155a7 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2785de8afd983d35b389c805ee5313133844e814d224eb26fdbfc4ae9d00377b +size 10415 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..272a111 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f06531f6ca332ede086e4b83df959c861039ab39d0cb9544701df0c14fdbff3 +size 73007 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate.uasset new file mode 100644 index 0000000..ee14a3f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe469eef080a5d0d0b3bdffa9877acd21b67261ce41e29011c8489563455e7a8 +size 209486 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate_LP.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate_LP.uasset new file mode 100644 index 0000000..b891675 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate_LP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3598da567d105333e605dfe745a5d315d7ad385400bb60d7b6bf7dc97e95ac6 +size 117344 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index 7d83565..dbadc83 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbafb5faa68113b675749f5196205db90f8c15214467252a94cb32a5909bf6f8 -size 1828649 +oid sha256:3610b11675c479bd6d61f635a4c82177aa8cffaabaa1142f335830b7024d7ee0 +size 1813474 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_VRCharacter.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_VRCharacter.uasset index 08bb30a..29ac028 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_VRCharacter.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_VRCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acf183c2b61ad51503f1963e934e850b845e78906014de4bd8df31a901291f11 -size 5732534 +oid sha256:77bad1e3aba29c3d47726b9318f4feb8fefc35908257032b91231216e460ac60 +size 5744225 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/FPS_VRCharacter.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/FPS_VRCharacter.uasset index 45b78ea..4a26f5c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/FPS_VRCharacter.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/FPS_VRCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21316496b3c5cc7393791ed1c89a1ad63f403ad273158d738995c0efffa1171a -size 313254 +oid sha256:301e151d74612eea67f88102c34a7634bf1e56fb345d58982741d17496bc604b +size 317084 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Melee/MeleeBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Melee/MeleeBase.uasset index 5af74b9..a40177f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Melee/MeleeBase.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Melee/MeleeBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99ceda2df79e042ac060b8017faefaba0db88400e8148036cd03eba143798aca -size 628697 +oid sha256:6ddd81a705d58f32fcfe09bafe8ceab281940ee27faa88afee4241d04d7c263d +size 616408 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripLeft.uasset deleted file mode 100644 index a3ecb0f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripLeft.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e838ac7a16a9abfbff653a00a2b541db9d5039649b8962d867bd271f673354b -size 1733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripRight.uasset deleted file mode 100644 index 4a50b4b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripRight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b709af759ede67d0f1be1236ea9d32414abd47c8aecdf0af30d81518712544e5 -size 1742 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementLeft.uasset deleted file mode 100644 index 7434073..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementLeft.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efb29e43077a95e58dc4701bac014adaeaa5a6aa59bbfbe67558023152a4b08a -size 1925 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementRight.uasset deleted file mode 100644 index 6cc857a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementRight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47cbe9c2325bfce551802aece2a33050ab71b31ad010a0a4c03fed01ebf4403e -size 1934 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Jump.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Jump.uasset deleted file mode 100644 index de27f0f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Jump.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a1a5b728c4a1fb21be95307d7ce48439155eae8ff6b791f877d3309b8a62b29 -size 1645 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/LookUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/LookUp.uasset deleted file mode 100644 index dc3e867..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/LookUp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3be15eb111e1907782872e423d45b0b6f441e710d0c144b4fdfbb0b380d1e8ec -size 1810 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveForward.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveForward.uasset deleted file mode 100644 index 3e3270d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveForward.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c52c5253dfbb4a1ff7ba50eb675b199b0999f5b704c34a6a4440114763e2426 -size 1857 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveRight.uasset deleted file mode 100644 index d44788b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveRight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd6d29db7763b629a4e8588db43f677b0cae53855cee720530d918b0339556df -size 1837 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Turn.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Turn.uasset deleted file mode 100644 index 0a7106f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Turn.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cef6554d211f2da6161b97663aeb2369c648f9ede8db34c919575257c025baf -size 1792 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamLeft.uasset deleted file mode 100644 index 65cb30a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamLeft.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9197c15df99db7cf86c31af6b948278ddc6d228ed314aa15b97acb41d9009273 -size 1697 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamRight.uasset deleted file mode 100644 index 3435283..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamRight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4eb9f86043920401304778a1247f7ccf600cfe2b62c8e78d4b5921d7575b5bf2 -size 1706 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_X.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_X.uasset deleted file mode 100644 index 76bfaff..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_X.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9514284ca54c4019335be42544a9c29de3e2ea179616f932b575a8ae927b0fd -size 1972 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_Y.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_Y.uasset deleted file mode 100644 index 65f005c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_Y.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dc37821f7f0f5f745b527f6eb5ef09846a144a745ec9e970e4a54fe35a352c8 -size 1972 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_X.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_X.uasset deleted file mode 100644 index 7eb201d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_X.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c809975f9f3d5b164dd94b1c5a13359035a3aa55a1201d28ef694eb8dcca694b -size 1981 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_Y.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_Y.uasset deleted file mode 100644 index 4fb4d3f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_Y.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08334d0a62c0064bcbe385e62e42f18fd5394b8de87935dbf191c09b37d0703e -size 1981 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PauseGame.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PauseGame.uasset deleted file mode 100644 index db5c331..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PauseGame.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8636197a7281ca1371cd485ba11273f9fd6b3affcd9931aab6debcd67c3af60 -size 1877 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripLeft.uasset deleted file mode 100644 index 0a2ad1a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripLeft.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2118297fb54c03b90d3f600dc2359ae504078a606720a5b02a4504cff322153a -size 1725 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripRight.uasset deleted file mode 100644 index f78e572..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripRight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45c451a28c509a1f29e80ee9d05df72e40267f376734866cd4c60f6a80ee0e8f -size 1734 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/SpawnInventory.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/SpawnInventory.uasset deleted file mode 100644 index 440cefc..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/SpawnInventory.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2097926eb2b821610c7727aba6deb91ecc9b72b4a0fcb9a6e1d809e0ccf87d09 -size 1786 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportLeft.uasset deleted file mode 100644 index 9177e19..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportLeft.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a5639edfcc13491b91cc89d033361dbb8b92776c278a871d13ae51837ae9c82 -size 1686 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportRight.uasset deleted file mode 100644 index 054131e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportRight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bca00b14c3c592ae8c8f97963794904c5718f02c62e59161e845b35305c62547 -size 1695 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectLeft.uasset deleted file mode 100644 index c55059d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectLeft.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de78a3a8cf9cb1ccd1f1a67814856637922e53c76dab8e5675f3f044d985d21d -size 1729 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectRight.uasset deleted file mode 100644 index f93d245..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectRight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8fb7e74eb8d0e577d5dd293a3e23bc7d850f43938a0f97ac16c8ba4cdd751863 -size 1738 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputConfig.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputConfig.uasset deleted file mode 100644 index 7320fc5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputConfig.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a3dbd80f436cfb88b32ad754672a97aeb7831d9b27f0afd118dbb2e76a902f4 -size 2238 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputContext.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputContext.uasset deleted file mode 100644 index 97f2e4a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputContext.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d736f494febc8d56fbc8752af45f9f260547664bbe483db52c40e6960dc817b -size 11478 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputConfig.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputConfig.uasset deleted file mode 100644 index e57a916..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputConfig.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a93b6b73d5169be5db2c22c81bda929bb9a40900382197dac7f10f15ab59b694 -size 2252 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputMappingContext.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputMappingContext.uasset deleted file mode 100644 index 9cedcbc..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputMappingContext.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87fb0c12b62e3a87846800e80361fd77beb08f18b0f8f96b53a85accf2e19305 -size 60735 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/BP_Tractor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/BP_Tractor.uasset index ef841fc..91b29c7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/BP_Tractor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/BP_Tractor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f3ebaf0ea71d5bee576b39db712c1f44ec1b67753a3dde57404ff2288a4a7f0 -size 873996 +oid sha256:a1174311515a6635c06662e979445aa91707cbb6137db6bb0a8b6a7bd3152446 +size 883099 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/Sedan.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/Sedan.uasset index ba6e423..2c9b607 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/Sedan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/Sedan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31cd147bfee3f6d24d955f47c929c4c30460f34533ef2858d138dd495a08055b -size 900694 +oid sha256:ba21dda7eca96dc231774e9c4be0fc2d905d0d9f63df9bd5bd6d234c735efb5a +size 894164 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index 858b194..c52f5fc 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27a142f1ae7bd6c95bea7e4584b059027a4fae8adc62140f58a9fd10f2013ffb -size 5645466 +oid sha256:fee489752e85dd854d3b28b041173e3309d34c4aeefe74c0f24f666b8718ced6 +size 5656675 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/PauseGame.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/PauseGame.uasset new file mode 100644 index 0000000..11846e4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/PauseGame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08f973fe80234915441ffe2fc7347e963500822f691c0a650c2f0fb1757f7acf +size 1665 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/SpawnInventory.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/SpawnInventory.uasset new file mode 100644 index 0000000..4bc35e9 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/SpawnInventory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5099e61259dd696ce5c0f7d433fd4b3975cbfcf77570088e0f21f270fb53f4be +size 1574 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Jump.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Jump.uasset new file mode 100644 index 0000000..12a7efd --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Jump.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8664fa6b1f50d523a3d1832c1bac749ae08b60915d0e8a0fc15bc3d4b0e83cd0 +size 1452 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/LookUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/LookUp.uasset new file mode 100644 index 0000000..434a740 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/LookUp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:584bd0e0c66a57365cfb881aa3cef0f2309a618501d43a70f7f3e21078289e09 +size 1666 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveForward.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveForward.uasset new file mode 100644 index 0000000..ece8d08 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveForward.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cef3b773f852276d4f335c37dedf15c9fdeee758017b7ae17864562a62a3d83 +size 1713 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveRight.uasset new file mode 100644 index 0000000..ad6f6de --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06421d1572be6bea6b50d44ee592adee4b203108f3e8991af7567cde6a434c92 +size 1693 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Turn.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Turn.uasset new file mode 100644 index 0000000..bf250a7 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Turn.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bbd1e102e7d778eca59a3d474d39e34d95783ad3deb6d838947f685b3d2c1a7 +size 1648 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputConfig.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputConfig.uasset new file mode 100644 index 0000000..4e377cc --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputConfig.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78ebb2c98a1802f646a092757c934926c284f9ce70f0b1614e529fd47f9b8530 +size 2078 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputContext.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputContext.uasset new file mode 100644 index 0000000..2813664 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputContext.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d109e716664965d2511fadbf52653990b3a30ed0f0a22c058a9fd69915fefc0 +size 9269 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputConfig.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputConfig.uasset new file mode 100644 index 0000000..96aec9a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputConfig.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e593df7f54e7080cf08715d9c9303f26bd45d34a591b0e4b0653292a87f18dad +size 2092 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputMappingContext.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputMappingContext.uasset new file mode 100644 index 0000000..2d753a4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputMappingContext.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d34a5e7ee3a2530417b75636531ab541e6ee686c1531ea561a12176219ac7cde +size 29861 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NPC_VRTemplate.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NPC_VRTemplate.uasset deleted file mode 100644 index 5b342b0..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NPC_VRTemplate.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:add4f9d9477ab268973f4e4d665f7cb67fe6115e3cd3e81c37b0782914d7dd65 -size 2952 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_MenuPointer.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_MenuPointer.uasset deleted file mode 100644 index 80c2ef1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_MenuPointer.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca5f9682f145f0d01b5c2f7ffe026e70ed8b490ef4e6e1b3a4e80d58fb16ceb6 -size 354985 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_PickupTrace.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_PickupTrace.uasset deleted file mode 100644 index af5b63c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_PickupTrace.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52bc6ec638f68cdeee8e33ba68c62c713a887b5aa8c1fe85e63cc076b0ce1096 -size 351393 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_TeleportTrace.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_TeleportTrace.uasset deleted file mode 100644 index 94bef93..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_TeleportTrace.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99687995c0ce0a5e62792468e7f69fb5a2110575dc554c4058e1b83e8ed6d793 -size 355837 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index 9a9f593..b972e2d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab151ce8565de6334515110a6d854c0944807e1396cbdc6b586d09f4b448d696 -size 636925 +oid sha256:6128a17e9f3692bd66a879da38e764ed6fc18522f3cc0e56ae8240984152248b +size 630413 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset index 67c489c..ef28609 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:681dd7eafe03ae224f2bb84806a65909bae4480d32ca9e3037fca651cceb2923 -size 138593 +oid sha256:f04a6a8954608e134988239b59b61817fee66ee21d075038ed1df1cfcc0c72b9 +size 197127 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline.uasset index b38f8e7..e9b718e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00f63231dec0953d5549c43f4b7fe5c9ebf3007daff3d424570210c33e4a3bc0 -size 17392 +oid sha256:6ba5344a841afad2eedb7d23d8e8686603d7865b40e6e615db857b9e157e5273 +size 27612 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline_Inst.uasset new file mode 100644 index 0000000..dd93261 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c32037bc4c8d5c615c7b44caa4280e3f46458f559bbc0fc23ace7dd742ecf5f +size 17287 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset index 8fc2938..9bcd45d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8162abb15096223b986a8fd59f3228df6aea49062cc4b3f08a5106a4b5aaeb20 -size 325457 +oid sha256:982cd084209ecd9553adc4ef632d5eb1390924b8c0e3991be946a824c9d78dbb +size 1351 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Letters/Letter_1/Letter_01_1_of_1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Letters/Letter_1/Letter_01_1_of_1.uasset index bc83a26..224d884 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Letters/Letter_1/Letter_01_1_of_1.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Letters/Letter_1/Letter_01_1_of_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e0788c5bf4617fc80cb13236feb78b8b49dae7616931228fabb1454dc8d3ce3 -size 54872 +oid sha256:c178d2654ecd50e4ddd74ee2f8734e560ba430965e9e6fcf3839d0e9702ff569 +size 54370 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Hide.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Hide.uasset new file mode 100644 index 0000000..827dbd4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Hide.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b031bd70ab71a02f2f90ad1b5db42af9581446817f4e86a280fee2f2ea705151 +size 6135 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset index 469cfde..9bb6fe0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8acdfa955b7783811637c14911f8d1116ec32da78fd00a29b3075cfcb275b5c -size 19262 +oid sha256:ef334e60c2a73528ed17f858ca16a441bd12b82e8a5c704cc8a0224af40568d0 +size 19072 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset index 34aee5a..fc171d1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a99acc6bda36a31b8d2aeca93ab2bdf16269648047c19105b97375023d6d20c -size 57855 +oid sha256:c0f6b020bcbd40e162498cbd6e2d3fa816aa97d4c894a26b1cc090d50ffcdb77 +size 62962 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset index 60ca9e8..2a7aa44 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:079ba1a42d6426410cb61206452b9b797c9407e5ca45826ff06c08038079d3ba -size 80676 +oid sha256:49f7bf9f0c314f709fdf6828a3dbab2aded4ffd2aab58634ac7da8d9fca20ff0 +size 85563 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset index ad9c731..8ed4ec6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fbc4920756fb5e4c56956fc06e206fbf1008fa43d09ec6a07910cf50ef0b0b9 -size 62501 +oid sha256:4dad754d8f21e4b906117d38c7e061a5308bc17b257fbd9c7425d75b324552c4 +size 83770 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1.uasset deleted file mode 100644 index faed478..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfc3872304c90875f0e69cc149e8da134035afd4ac79515db1cc4d9be735adb4 -size 72307 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1_Inst.uasset deleted file mode 100644 index e9038a2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1_Inst.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9510877cbfc30998fff5bbd750391987e59e2ede83adde5f362076288b5553a9 -size 11885 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset index 55efa3f..2816180 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e239bf899fdabb214b4d072136e49807600d9e94b8ab9652e26a33d75ebd0d6e -size 13472 +oid sha256:45739ff08b2a581cc571b427ae310607797727e95420e0fd331bd569c868033c +size 10406 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst1.uasset deleted file mode 100644 index f92af40..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c07fbf8f30aa737aab7f76c42f03e69b53a1b3aa10c5927c20ab03d3753f574 -size 12744 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset new file mode 100644 index 0000000..6cbc73d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8417e207e37edc7b65b23b6a980575fcc51bbf73d2dfb2599642269d4e8b2cdf +size 15351 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset new file mode 100644 index 0000000..d5b3907 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21b25d1b713adb16b47bf7e90572d2f80f7fcff522ad2202b6281ab5a0d9f3c0 +size 14335 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Pipe004_4K-JPG_NormalDX.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Pipe004_4K-JPG_NormalDX.uasset new file mode 100644 index 0000000..d56deb3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Pipe004_4K-JPG_NormalDX.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b309d334df24596cc5763d48f830fbffaad67dd320b4e033909405cd7416749a +size 6215911 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Freezing_Chamber_Grating.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Freezing_Chamber_Grating.uasset index e025b98..9687a93 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Freezing_Chamber_Grating.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Freezing_Chamber_Grating.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57da0aeb4f3022459f0a5010e3496f93e9654a909b7d7aa51cd6bae2c2b7ae91 -size 313636 +oid sha256:8616c468331bb5baa0f7c104098b29236385a3a915affb19bbd9cea3184a6cf0 +size 1481 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset index 8cabc46..4ef82d2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffe8689fa2c12345eb785910e41f663e0b7dcd76a5ae524bae9235daed02aa6f -size 82522 +oid sha256:9414e064da151ad24a2aab4c08abf1635c1e13dc633b1e87f4698445ef4594b1 +size 89316 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating_Large.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating_Large.uasset new file mode 100644 index 0000000..9a5213e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating_Large.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc0f5ede92d3aabb8ed7966a33794a2e5fcffdc4f1eb2661c399874ddde2cf86 +size 323008 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset index 9580957..30b9603 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efd52af44f0c100ece7fddc1924adc71d3eaf81857943c9f5c1a96e091b015a2 -size 115396 +oid sha256:6a4dc95a1dadeb5eaca809ee326f14bd615aa6521a921a531d0a6ee606bd3ef0 +size 113945 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/BP_TestProjector.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/BP_TestProjector.uasset deleted file mode 100644 index 1a70503..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/BP_TestProjector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdf0feca428f96e0a6e571a1d2f676e86dc477b9124a30220fac574db8ec201b -size 46545 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_Projector.uasset deleted file mode 100644 index 82c2c83..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_Projector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5655dd1097508875fe3a5a4df5bb81404370e541607ed468f2b5637868671e18 -size 22811 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_SliceTest.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_SliceTest.uasset deleted file mode 100644 index 0eef19d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MI_SliceTest.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff56836b7eb36e8d8ea038cde4280acad96e5b46dc38d739c7530fe741cd3809 -size 10837 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MPC_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MPC_Projector.uasset deleted file mode 100644 index 8695ea0..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MPC_Projector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf859256fe097febcfce587126a47691a6ba7e0146d7ff92edd07621e4a58c03 -size 1883 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector.uasset deleted file mode 100644 index 1de70f1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f12167d851cd437f102830b31fd5edb94a0e41c0210e42f5e3fb4db20e29d25a -size 33947 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector_Inst.uasset deleted file mode 100644 index b0e1fd8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector_Inst.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f148f5628344cd928aaa44d9a63f96742e89a51a1b87c9abfaa5a8b1de8fd18 -size 1588 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays.uasset deleted file mode 100644 index cbba272..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a12f7e0bc6c1463894c3e6bb58bffd62028b8f11fa813c883fc8f98bff23596f -size 35587 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays_Inst.uasset deleted file mode 100644 index 33dbc85..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays_Inst.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:545ae02a9fdd2e402995908827d74b60ee02b29be7869e28540647379fd36027 -size 10671 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index ec9f4d5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12e317f3e322fd05ea43753357db3f087dac25f4d9286cc361fd6460770d0f6a -size 73245 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate.uasset deleted file mode 100644 index 55a069d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b3b977625a6785b9b51f527e69390997b15544c9afb64daa2fc1bcd89b8e6aa -size 209637 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate_LP.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate_LP.uasset deleted file mode 100644 index f192cb1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate_LP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40986331c45661e60714851262d93355138437fd7fe9370fdb3b57d1de5cec39 -size 117473 diff --git a/VIRTUOS_ExpansionPluginTests/LICENSE.txt b/VIRTUOS_ExpansionPluginTests/LICENSE.txt deleted file mode 100644 index 986c999..0000000 --- a/VIRTUOS_ExpansionPluginTests/LICENSE.txt +++ /dev/null @@ -1,19 +0,0 @@ -Copyright Joshua Statzer - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs index e7a0b33..41989fe 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs @@ -10,6 +10,10 @@ namespace UnrealBuildTool.Rules public OpenXRExpansionPlugin(ReadOnlyTargetRules Target) : base(Target) { + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; + DefaultBuildSettings = BuildSettingsVersion.Latest; + IncludeOrderVersion = EngineIncludeOrderVersion.Latest; + SetupIrisSupport(Target); PublicDependencyModuleNames.AddRange( diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp index 300790d..dce0cc3 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp @@ -373,6 +373,11 @@ bool FVRCharacterNetworkMoveData::Serialize(UCharacterMovementComponent& Charact { bRepRollAndPitch = (Roll != 0 || Pitch != 0); } + else + { + bool bCanRepRollAndPitch = (CharacterOwner && (CharacterOwner->bUseControllerRotationRoll || CharacterOwner->bUseControllerRotationPitch)); + bRepRollAndPitch = bCanRepRollAndPitch && (Roll != 0 || Pitch != 0); + } } else { diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp index 6f56a1a..bfb4cfe 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp @@ -19,6 +19,7 @@ #include "UObject/UObjectGlobals.h" // for FindObject<> #include "IXRTrackingSystem.h" #include "IXRSystemAssets.h" +#include "SceneView.h" #include "DrawDebugHelpers.h" #include "TimerManager.h" #include "VRBaseCharacter.h" @@ -249,7 +250,7 @@ void UGripMotionControllerComponent::RegisterEndPhysicsTick(bool bRegister) void UGripMotionControllerComponent::EndPhysicsTickComponent(FGripComponentEndPhysicsTickFunction& ThisTickFunction) { - if (!IsValid(this)) + if (!IsValidChecked(this)) return; // Now check if we should turn off any post physics ticking @@ -4310,7 +4311,7 @@ bool UGripMotionControllerComponent::TeleportMoveGrippedActor(AActor * GrippedAc FBPActorGripInformation * GripInfo = LocallyGrippedObjects.FindByKey(GrippedActorToMove); if (!GripInfo) - GrippedObjects.FindByKey(GrippedActorToMove); + GripInfo = GrippedObjects.FindByKey(GrippedActorToMove); if (GripInfo) { @@ -4327,7 +4328,7 @@ bool UGripMotionControllerComponent::TeleportMoveGrippedComponent(UPrimitiveComp FBPActorGripInformation * GripInfo = LocallyGrippedObjects.FindByKey(ComponentToMove); if (!GripInfo) - GrippedObjects.FindByKey(ComponentToMove); + GripInfo = GrippedObjects.FindByKey(ComponentToMove); if (GripInfo) { @@ -6017,7 +6018,7 @@ void UGripMotionControllerComponent::CleanUpBadPhysicsHandles() { FBPActorGripInformation * GripInfo = LocallyGrippedObjects.FindByKey(PhysicsGrips[g].GripID); if(!GripInfo) - GrippedObjects.FindByKey(PhysicsGrips[g].GripID); + GripInfo = GrippedObjects.FindByKey(PhysicsGrips[g].GripID); if (!GripInfo) { @@ -6156,44 +6157,48 @@ bool UGripMotionControllerComponent::DestroyPhysicsHandle(const FBPActorGripInfo return true; } - UPrimitiveComponent *root = Grip.GetGrippedComponent(); - AActor * pActor = Grip.GetGrippedActor(); - - if (!root && pActor) - root = Cast(pActor->GetRootComponent()); - - if (root) + if (IsValid(Grip.GrippedObject)) { - if (FBodyInstance * rBodyInstance = root->GetBodyInstance(Grip.GrippedBoneName)) + + UPrimitiveComponent* root = Grip.GetGrippedComponent(); + AActor* pActor = Grip.GetGrippedActor(); + + if (!root && pActor) + root = Cast(pActor->GetRootComponent()); + + if (root) { - // #TODO: Should this be done on drop instead? - // Remove event registration - if (!bSkipUnregistering) + if (FBodyInstance* rBodyInstance = root->GetBodyInstance(Grip.GrippedBoneName)) { - if (rBodyInstance->OnRecalculatedMassProperties().IsBoundToObject(this)) + // #TODO: Should this be done on drop instead? + // Remove event registration + if (!bSkipUnregistering) { - rBodyInstance->OnRecalculatedMassProperties().RemoveAll(this); - } - } - - if (HandleInfo->bSetCOM) - { - // Reset center of mass to zero - // Get our original values - FVector vel = rBodyInstance->GetUnrealWorldVelocity(); - FVector aVel = rBodyInstance->GetUnrealWorldAngularVelocityInRadians(); - FVector originalCOM = rBodyInstance->GetCOMPosition(); - - if (rBodyInstance->IsValidBodyInstance() && rBodyInstance->BodySetup.IsValid()) - { - rBodyInstance->UpdateMassProperties(); + if (rBodyInstance->OnRecalculatedMassProperties().IsBoundToObject(this)) + { + rBodyInstance->OnRecalculatedMassProperties().RemoveAll(this); + } } - if (rBodyInstance->IsInstanceSimulatingPhysics()) + if (HandleInfo->bSetCOM) { - // Offset the linear velocity by the new COM position and set it - vel += FVector::CrossProduct(aVel, rBodyInstance->GetCOMPosition() - originalCOM); - rBodyInstance->SetLinearVelocity(vel, false); + // Reset center of mass to zero + // Get our original values + FVector vel = rBodyInstance->GetUnrealWorldVelocity(); + FVector aVel = rBodyInstance->GetUnrealWorldAngularVelocityInRadians(); + FVector originalCOM = rBodyInstance->GetCOMPosition(); + + if (rBodyInstance->IsValidBodyInstance() && rBodyInstance->BodySetup.IsValid()) + { + rBodyInstance->UpdateMassProperties(); + } + + if (rBodyInstance->IsInstanceSimulatingPhysics()) + { + // Offset the linear velocity by the new COM position and set it + vel += FVector::CrossProduct(aVel, rBodyInstance->GetCOMPosition() - originalCOM); + rBodyInstance->SetLinearVelocity(vel, false); + } } } } @@ -7224,8 +7229,15 @@ void UGripMotionControllerComponent::ApplyTrackingParameters(FVector& OriginalPo if (IsValid(AttachChar) && !AttachChar->bRetainRoomscale) { - FRotator StoredCameraRotOffset = UVRExpansionFunctionLibrary::GetHMDPureYaw_I(curRot.Rotator()); - LastLocationForLateUpdate += StoredCameraRotOffset.RotateVector(FVector(AttachChar->VRRootReference->VRCapsuleOffset.X, AttachChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); + if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) + { + + } + else + { + FRotator StoredCameraRotOffset = UVRExpansionFunctionLibrary::GetHMDPureYaw_I(curRot.Rotator()); + LastLocationForLateUpdate += StoredCameraRotOffset.RotateVector(FVector(AttachChar->VRRootReference->VRCapsuleOffset.X, AttachChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); + } } } } @@ -7238,8 +7250,15 @@ void UGripMotionControllerComponent::ApplyTrackingParameters(FVector& OriginalPo if (!AttachChar->bRetainRoomscale && IsLocallyControlled()) { - FRotator StoredCameraRotOffset = UVRExpansionFunctionLibrary::GetHMDPureYaw_I(AttachChar->VRReplicatedCamera->GetRelativeRotation()); - LastLocationForLateUpdate += StoredCameraRotOffset.RotateVector(FVector(AttachChar->VRRootReference->VRCapsuleOffset.X, AttachChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); + if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) + { + + } + else + { + FRotator StoredCameraRotOffset = UVRExpansionFunctionLibrary::GetHMDPureYaw_I(AttachChar->VRReplicatedCamera->GetRelativeRotation()); + LastLocationForLateUpdate += StoredCameraRotOffset.RotateVector(FVector(AttachChar->VRRootReference->VRCapsuleOffset.X, AttachChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); + } } } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp index 1f34a92..bf2a9d5 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp @@ -10,6 +10,7 @@ #include "CoreMinimal.h" #include "PhysicsEngine/BodyInstance.h" +#include "PhysicsReplicationLOD.h" #include "Components/PrimitiveComponent.h" #include "Components/SkeletalMeshComponent.h" #include "UObject/ObjectMacros.h" @@ -43,6 +44,12 @@ namespace VRPhysicsReplicationStatics // Hacky work around for them not exporting these.... #if WITH_EDITOR + +namespace RenderInterpolationCVars +{ + bool bRenderInterpDebugDrawResimTrigger = false; +} + namespace PhysicsReplicationCVars { int32 SkipSkeletalRepOptimization = 1; @@ -51,6 +58,9 @@ namespace PhysicsReplicationCVars #endif int32 EnableDefaultReplication = 0; + int32 DebugDrawShowRepMode = 0; + float DebugDrawLifeTime = 3.0f; + namespace DefaultReplicationCVars { @@ -61,6 +71,8 @@ namespace PhysicsReplicationCVars namespace ResimulationCVars { + //extern bool bApplyPredictiveInterpolationWhenBehindServer; + bool bRuntimeCorrectionEnabled = false; bool bRuntimeVelocityCorrection = false; bool bRuntimeCorrectConnectedBodies = true; @@ -72,15 +84,20 @@ namespace PhysicsReplicationCVars // Inside of NetworkPhysicsComponent - UPDATE AS CHANGE int32 RedundantInputs = 2; + int32 RedundantRemoteInputs = 1; int32 RedundantStates = 0; bool bAllowRewindToClosestState = true; bool bCompareStateToTriggerRewind = false; + bool bCompareStateToTriggerRewindIncludeSimProxies = false; bool bCompareInputToTriggerRewind = false; bool bEnableUnreliableFlow = true; bool bEnableReliableFlow = false; bool bApplyDataInsteadOfMergeData = false; bool bAllowInputExtrapolation = true; bool bValidateDataOnGameThread = false; + bool bApplySimProxyStateAtRuntime = false; + bool bApplySimProxyInputAtRuntime = true; + bool bApplyPredictiveInterpolationWhenBehindServer = true; } namespace PredictiveInterpolationCVars @@ -129,6 +146,9 @@ namespace PhysicsReplicationCVars float DrawDebugZOffset = 50.0f; float SleepSecondsClearTarget = 15.0f; int32 TargetTickAlignmentClampMultiplier = 2; + int32 TeleportDetectionEnabled = 1; + float TeleportDetectionMinDistance = 200.0f; + float TeleportDetectionVelocityMultiplier = 1.3f; } } @@ -373,13 +393,13 @@ void FPhysicsReplicationVR::RemoveReplicatedTarget(UPrimitiveComponent* Componen { // Skip all of the custom logic if we aren't the server - if (const UWorld* World = GetOwningWorld()) + /*if (const UWorld* World = GetOwningWorld()) { if (World->GetNetMode() == ENetMode::NM_Client) { return FPhysicsReplication::RemoveReplicatedTarget(Component); } - } + }*/ if (Component == nullptr) { @@ -659,7 +679,7 @@ bool FPhysicsReplicationVR::ApplyRigidBodyState(float DeltaSeconds, FBodyInstanc { if (bHardsnapLegacyInPT) { - if (Chaos::FSingleParticlePhysicsProxy* Proxy = static_cast(BI->GetPhysicsActorHandle())) + if (Chaos::FSingleParticlePhysicsProxy* Proxy = static_cast(BI->GetPhysicsActor())) { if (Chaos::FPBDRigidsSolver* Solver = Proxy->GetSolver()) { @@ -715,7 +735,7 @@ bool FPhysicsReplicationVR::ApplyRigidBodyState(float DeltaSeconds, FBodyInstanc AsyncInputData.TargetState = NewState; AsyncInputData.TargetState.Position = IdealWorldTM.GetLocation(); AsyncInputData.TargetState.Quaternion = IdealWorldTM.GetRotation(); - AsyncInputData.Proxy = static_cast(BI->GetPhysicsActorHandle()); + AsyncInputData.Proxy = static_cast(BI->GetPhysicsActor()); AsyncInputData.ErrorCorrection = { ErrorCorrection.LinearVelocityCoefficient, ErrorCorrection.AngularVelocityCoefficient, ErrorCorrection.PositionLerp, ErrorCorrection.AngleLerp }; AsyncInputData.LatencyOneWay = PingSeconds; @@ -746,7 +766,7 @@ bool FPhysicsReplicationVR::ApplyRigidBodyState(float DeltaSeconds, FBodyInstanc { FColor Color = FColor::White; static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); - DrawDebugDirectionalArrow(OwningWorld, CurrentState.Position, TargetPos, 5.0f, Color, true, CVarNetCorrectionLifetime->GetFloat(), 0, 1.5f); + DrawDebugDirectionalArrow(OwningWorld, CurrentState.Position, TargetPos, 5.0f, Color, false, CVarNetCorrectionLifetime->GetFloat(), 0, 1.5f); #if 0 //todo: do we show this in async mode? DrawDebugFloatHistory(*OwningWorld, PhysicsTarget.ErrorHistory, NewPos + FVector(0.0f, 0.0f, 100.0f), FVector2D(100.0f, 50.0f), FColor::White); @@ -791,6 +811,12 @@ void FPhysicsReplicationVR::OnTick(float DeltaSeconds, TMap(GetSolver()); + Chaos::FPBDRigidsSolver& RigidsSolver = GetSolver()->CastChecked(); + RigidsSolver.SetPhysicsReplication_Internal(this); + //Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); - if (ensure(RigidsSolver)) + /*if (ensure(RigidsSolver)) { // This doesn't even do anything currently, nothing gets it #TODO: CHECK BACK ON THIS //RigidsSolver->SetPhysicsReplication(this); - } + }*/ } void FPhysicsReplicationAsyncVR::OnPreSimulate_Internal() @@ -1049,35 +1077,34 @@ void FPhysicsReplicationAsyncVR::OnPreSimulate_Internal() return; } - if (const FPhysicsReplicationAsyncInput* AsyncInput = GetConsumerInput_Internal()) + Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); + check(RigidsSolver); + + // Early out if this is a resim frame + Chaos::FRewindData* RewindData = RigidsSolver->GetRewindData(); + const bool bRewindDataExist = RewindData != nullptr; + if (bRewindDataExist && RewindData->IsResim()) { - Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); - check(RigidsSolver); - - // Early out if this is a resim frame - Chaos::FRewindData* RewindData = RigidsSolver->GetRewindData(); - const bool bRewindDataExist = RewindData != nullptr; - if (bRewindDataExist && RewindData->IsResim()) + //static const auto CVarPostResimWaitForUpdate = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.PostResimWaitForUpdate")); + // TODO, Handle the transition from post-resim to interpolation better (disabled by default, resim vs replication interaction is handled via FPhysicsReplicationAsync::CacheResimInteractions) + if (SettingsCurrent.PredictiveInterpolationSettings.GetPostResimWaitForUpdate() && RewindData->IsFinalResim()) { - // TODO, Handle the transition from post-resim to interpolation better (disabled by default, resim vs replication interaction is handled via FPhysicsReplicationAsync::CacheResimInteractions) - static const auto CVarPostResimWaitForUpdate = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.PostResimWaitForUpdate")); - if (CVarPostResimWaitForUpdate->GetBool() && RewindData->IsFinalResim()) + for (auto Itr = ObjectToTarget.CreateIterator(); Itr; ++Itr) { - for (auto Itr = ObjectToTarget.CreateIterator(); Itr; ++Itr) - { - FReplicatedPhysicsTargetAsync& Target = Itr.Value(); + FReplicatedPhysicsTargetAsync& Target = Itr.Value(); - // If final resim frame, mark interpolated targets as waiting for up to date data from the server. - if (Target.RepMode == EPhysicsReplicationMode::PredictiveInterpolation) - { - Target.SetWaiting(RigidsSolver->GetCurrentFrame() + Target.FrameOffset, Target.RepModeOverride); - } + // If final resim frame, mark interpolated targets as waiting for up to date data from the server. + if (Target.RepMode == EPhysicsReplicationMode::PredictiveInterpolation) + { + Target.SetWaiting(RigidsSolver->GetCurrentFrame() + Target.FrameOffset, Target.RepModeOverride); } } - - return; } + return; + } + if (const FPhysicsReplicationAsyncInput* AsyncInput = GetConsumerInput_Internal()) + { // Update async targets with target input for (const FPhysicsRepAsyncInputData& Input : AsyncInput->InputData) { @@ -1100,15 +1127,27 @@ void FPhysicsReplicationAsyncVR::OnPreSimulate_Internal() UpdateRewindDataTarget(Input); UpdateAsyncTarget(Input, RigidsSolver); - } - if (Chaos::FPBDRigidsSolver::IsNetworkPhysicsPredictionEnabled()) - { - CacheResimInteractions(); - } + DebugDrawReplicationMode(Input); - ApplyTargetStatesAsync(GetDeltaTime_Internal(), AsyncInput->ErrorCorrection, AsyncInput->InputData); + // Deprecated, legacy BodyInstance flow for Default Replication + if (Input.Proxy != nullptr) + { + Chaos::FSingleParticlePhysicsProxy* Proxy = Input.Proxy; + Chaos::FRigidBodyHandle_Internal* Handle = Proxy->GetPhysicsThreadAPI(); + + const FPhysicsRepErrorCorrectionData& UsedErrorCorrection = Input.ErrorCorrection.IsSet() ? Input.ErrorCorrection.GetValue() : AsyncInput->ErrorCorrection; + DefaultReplication_DEPRECATED(Handle, Input, GetDeltaTime_Internal(), UsedErrorCorrection); + } + } } + + if (Chaos::FPBDRigidsSolver::IsNetworkPhysicsPredictionEnabled()) + { + CacheResimInteractions(); + } + + ApplyTargetStatesAsync(GetDeltaTime_Internal()); } FReplicatedPhysicsTargetAsync* FPhysicsReplicationAsyncVR::AddObjectToReplication(Chaos::FConstPhysicsObjectHandle PhysicsObject) @@ -1201,6 +1240,7 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa Target->PrevLinVel = Input.TargetState.LinVel; Target->RepModeOverride = Input.RepMode; } + check(Target); /** Target Update Description * @param Input = incoming state target for replication. @@ -1247,6 +1287,9 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa // Set if the target is allowed to be altered after this update Target->bAllowTargetAltering = !(Target->TargetState.Flags & ERigidBodyFlags::Sleeping) && !(Input.TargetState.Flags & ERigidBodyFlags::Sleeping); + // Cache previous linear velocity + const FVector PrevLinVel = Target->TargetState.LinVel; + // Set Target->ReceiveInterval from either SendInterval or the number of physics ticks between receiving input states if (SendInterval > 0) { @@ -1259,11 +1302,7 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa } // Update target from input and reset properties - PRAGMA_DISABLE_DEPRECATION_WARNINGS - Target->PrevServerFrame = Target->bWaiting ? Input.ServerFrame : Target->ServerFrame; // DEPRECATED UE5.4 - Target->PrevReceiveFrame = (Target->ReceiveFrame == INDEX_NONE) ? (RigidsSolver->GetCurrentFrame() - 1) : Target->ReceiveFrame; // DEPRECATED UE5.4 - PRAGMA_ENABLE_DEPRECATION_WARNINGS - Target->ServerFrame = Input.ServerFrame; + Target->ServerFrame = Input.ServerFrame; Target->ReceiveFrame = CurrentFrame; Target->TargetState = Input.TargetState; Target->RepMode = Input.RepMode; @@ -1274,7 +1313,13 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa // Update waiting state Target->UpdateWaiting(Input.ServerFrame); - if (Input.RepMode == EPhysicsReplicationMode::PredictiveInterpolation) + // Apply full Replication LOD on received target + ApplyPhysicsReplicationLOD(Input.PhysicsObject, *Target, EPhysicsReplicationLODFlags::LODFlag_All); + + // Check if target is valid to use for resimulation and perform actions if not + CheckTargetResimValidity(*Target); + + if (Target->RepMode == EPhysicsReplicationMode::PredictiveInterpolation) { #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) @@ -1284,16 +1329,13 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa const FVector Offset = FVector(0.0f, 0.0f, 50.0f); // Port this? //const FVector Offset = FVector(0.0f, 0.0f, PhysicsReplicationCVars::PredictiveInterpolationCVars::DrawDebugZOffset); - - static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); + static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Input.TargetState.Position + Offset, FVector(15.0f, 15.0f, 15.0f), Input.TargetState.Quaternion, FColor::MakeRandomSeededColor(Input.ServerFrame), false, CVarNetCorrectionLifetime->GetFloat(), 0, 1.0f); } #endif - // Cache the position we received this target at, Predictive Interpolation will alter the target state but use this as the source position for reconciliation. - Target->PrevPosTarget = Input.TargetState.Position; - Target->PrevRotTarget = Input.TargetState.Quaternion; - + // TickCount is 0 by default at this point and when LOD is used, TickCount will be 0 if no LOD alignment was performed, in this case perform the normal target alignment + if (Target->TickCount == 0) { /** Target Alignment Feature * With variable network conditions state inputs from the server can arrive both later or earlier than expected. @@ -1331,6 +1373,34 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa } } } + + static const auto CVarTeleportDetectionEnabled = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.TeleportDetection.Enabled")); + // Teleport detection, we don't have specific data that tells us a teleport has happened on the server, so try to detect it by examining the previous and next state + if (CVarTeleportDetectionEnabled->GetBool() == 1 && !bFirstTarget && SendInterval > 0 && RigidsSolver->IsUsingFixedDt()) + { + const FVector PosOffset = (Input.TargetState.Position - Target->PrevPosTarget); + static const auto CVarTeleportDetectionMinDistance = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.TeleportDetection.MinDistance")); + if (PosOffset.SizeSquared() > (CVarTeleportDetectionMinDistance->GetFloat() * CVarTeleportDetectionMinDistance->GetFloat())) + { + const FVector Velocity = Input.TargetState.LinVel.SizeSquared() > PrevLinVel.SizeSquared() ? Input.TargetState.LinVel : PrevLinVel; + const float DeltaSeconds = (SendInterval * RigidsSolver->GetAsyncDeltaTime()); + static const auto CVarTeleportDetectionVelocityMultiplier = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.TeleportDetection.VelocityMultiplier")); + const float PossibleDistanceSquared = (Velocity * (DeltaSeconds * CVarTeleportDetectionVelocityMultiplier->GetFloat())).SizeSquared(); + + if (PossibleDistanceSquared < PosOffset.SizeSquared()) + { + // A teleport has most likely happened, set accumulated error seconds to above limit for hard snapping + // TODO: Don't piggyback on AccumulatedErrorSeconds (potentially implement ERigidBodyFlags::Teleported) + + static const auto CVarErrorAcumulationSeconds = IConsoleManager::Get().FindConsoleVariable(TEXT("p.ErrorAccumulationSeconds")); + Target->AccumulatedErrorSeconds = CVarErrorAcumulationSeconds->GetFloat() + 1.0f; + } + } + } + + // Cache the position we received this target at, Predictive Interpolation will alter the target state but use this as the source position for reconciliation. + Target->PrevPosTarget = Input.TargetState.Position; + Target->PrevRotTarget = Input.TargetState.Quaternion; } } @@ -1344,6 +1414,14 @@ void FPhysicsReplicationAsyncVR::CacheResimInteractions() static const auto CVarResimDisableReplicationOnInteraction = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.Resim.DisableReplicationOnInteraction")); if (!CVarResimDisableReplicationOnInteraction->GetBool()) { + ParticlesInResimIslands.Empty(); + return; + } + + if (UsePhysicsReplicationLOD()) + { + // This will be handled by the LOD system + ParticlesInResimIslands.Empty(); return; } @@ -1353,9 +1431,12 @@ void FPhysicsReplicationAsyncVR::CacheResimInteractions() return; } - ParticlesInResimIslands.Empty(FMath::CeilToInt(static_cast(ParticlesInResimIslands.Num()) * 0.9f)); + ResimIslands.Reset(); + ResimIslandsParticles.Reset(); + ParticlesInResimIslands.Reset(); + Chaos::Private::FPBDIslandManager& IslandManager = RigidsSolver->GetEvolution()->GetIslandManager(); - Chaos::FWritePhysicsObjectInterface_Internal Interface = Chaos::FPhysicsObjectInternalInterface::GetWrite(); + Chaos::FReadPhysicsObjectInterface_Internal Interface = Chaos::FPhysicsObjectInternalInterface::GetRead(); for (auto Itr = ObjectToTarget.CreateIterator(); Itr; ++Itr) { FReplicatedPhysicsTargetAsync& Target = Itr.Value(); @@ -1365,7 +1446,9 @@ void FPhysicsReplicationAsyncVR::CacheResimInteractions() if (Chaos::FGeometryParticleHandle* Handle = Interface.GetParticle(POHandle)) { // Get a list of particles from the same island as a resim particle is in, i.e. particles interacting with a resim particle - for (const Chaos::FGeometryParticleHandle* InteractParticle : IslandManager.FindParticlesInIslands(IslandManager.FindParticleIslands(Handle))) + IslandManager.FindParticleIslands(Handle, OUT ResimIslands); + IslandManager.FindParticlesInIslands(ResimIslands, OUT ResimIslandsParticles); + for (const Chaos::FGeometryParticleHandle* InteractParticle : ResimIslandsParticles) { ParticlesInResimIslands.Add(InteractParticle->GetHandleIdx()); } @@ -1374,66 +1457,152 @@ void FPhysicsReplicationAsyncVR::CacheResimInteractions() } } -void FPhysicsReplicationAsyncVR::ApplyTargetStatesAsync(const float DeltaSeconds, const FPhysicsRepErrorCorrectionData& ErrorCorrection, const TArray& InputData) +void FPhysicsReplicationAsyncVR::ApplyTargetStatesAsync(const float DeltaSeconds) { using namespace Chaos; - // Deprecated, legacy BodyInstance flow - for (const FPhysicsRepAsyncInputData& Input : InputData) - { - if (Input.Proxy != nullptr) + /** Helper function to remove replicated target*/ + auto RemoveTargetHelper = [this](TMap::TIterator Itr, FGeometryParticleHandle* Handle) { - Chaos::FSingleParticlePhysicsProxy* Proxy = Input.Proxy; - Chaos::FRigidBodyHandle_Internal* Handle = Proxy->GetPhysicsThreadAPI(); - - const FPhysicsRepErrorCorrectionData& UsedErrorCorrection = Input.ErrorCorrection.IsSet() ? Input.ErrorCorrection.GetValue() : ErrorCorrection; - DefaultReplication_DEPRECATED(Handle, Input, DeltaSeconds, UsedErrorCorrection); - } - } + if (Handle) + { + ReplicatedParticleIDs.Remove(Handle->ParticleID()); + } + Itr.RemoveCurrent(); + }; // PhysicsObject flow Chaos::FWritePhysicsObjectInterface_Internal Interface = Chaos::FPhysicsObjectInternalInterface::GetWrite(); - for (auto Itr = ObjectToTarget.CreateIterator(); Itr; ++Itr) + for (TMap::TIterator Itr = ObjectToTarget.CreateIterator(); Itr; ++Itr) { bool bRemoveItr = true; // Remove current cached replication target unless replication logic tells us to store it for next tick - FParticleID ParticleID; Chaos::FConstPhysicsObjectHandle& POHandle = Itr.Key(); - if (FGeometryParticleHandle* Handle = Interface.GetParticle(POHandle)) + FGeometryParticleHandle* Handle = Interface.GetParticle(POHandle); + if (!Handle) { - FReplicatedPhysicsTargetAsync& Target = Itr.Value(); - - - if (FPBDRigidParticleHandle* RigidHandle = Handle->CastToRigidParticle()) - { - ParticleID = RigidHandle->ParticleID(); - - // Cache custom settings for this object if there are any - FetchObjectSettings(POHandle); - - const EPhysicsReplicationMode RepMode = Target.IsWaiting() ? Target.RepModeOverride : Target.RepMode; - switch (RepMode) - { - case EPhysicsReplicationMode::Default: - bRemoveItr = DefaultReplication(RigidHandle, Target, DeltaSeconds); - break; - - case EPhysicsReplicationMode::PredictiveInterpolation: - bRemoveItr = PredictiveInterpolation(RigidHandle, Target, DeltaSeconds); - break; - - case EPhysicsReplicationMode::Resimulation: - bRemoveItr = ResimulationReplication(RigidHandle, Target, DeltaSeconds); - break; - } - Target.TickCount++; - } + RemoveTargetHelper(Itr, nullptr); + continue; } + FPBDRigidParticleHandle* RigidHandle = Handle->CastToRigidParticle(); + if (!RigidHandle) + { + RemoveTargetHelper(Itr, Handle); + continue; + } + + FReplicatedPhysicsTargetAsync& Target = Itr.Value(); + + // Cache custom settings for this object if there are any + FetchObjectSettings(POHandle); + + // Apply limited Replication LOD + ApplyPhysicsReplicationLOD(POHandle, Target, EPhysicsReplicationLODFlags::LODFlag_IslandCheck); + + const EPhysicsReplicationMode RepMode = Target.IsWaiting() ? Target.RepModeOverride : Target.RepMode; + switch (RepMode) + { + case EPhysicsReplicationMode::Default: + bRemoveItr = DefaultReplication(RigidHandle, Target, DeltaSeconds); + break; + + case EPhysicsReplicationMode::PredictiveInterpolation: + bRemoveItr = PredictiveInterpolation(RigidHandle, Target, DeltaSeconds); + break; + + case EPhysicsReplicationMode::Resimulation: + bRemoveItr = ResimulationReplication(RigidHandle, Target, DeltaSeconds); + break; + } + Target.TickCount++; + if (bRemoveItr) { - ReplicatedParticleIDs.Remove(ParticleID); - Itr.RemoveCurrent(); + RemoveTargetHelper(Itr, RigidHandle); + + } + } +} + +void FPhysicsReplicationAsyncVR::CheckTargetResimValidity(FReplicatedPhysicsTargetAsync& Target) +{ + if (Target.RepMode != EPhysicsReplicationMode::Resimulation) + { + return; + } + + Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); + if (RigidsSolver == nullptr) + { + return; + } + + Chaos::FRewindData* RewindData = RigidsSolver->GetRewindData(); + if (RewindData == nullptr) + { + return; + } + + const int32 LocalFrame = Target.ServerFrame - Target.FrameOffset; + if (!RewindData->IsFrameWithinRewindHistory(LocalFrame)) + { + + static const auto CVarResimApplyPredictiveInterpolationWhenBehindServer = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.Resim.ApplyPredictiveInterpolationWhenBehindServer")); + + if (LocalFrame < RewindData->GetEarliestFrame_Internal()) + { + // Client is far ahead of the server, switch over to Predictive Interpolation since it can't use incoming target states from the server to perform resimulations with + + Target.RepMode = EPhysicsReplicationMode::PredictiveInterpolation; + } + else if (CVarResimApplyPredictiveInterpolationWhenBehindServer->GetBool()) + { + /** NOTE: If the server is ahead of the client we receive target states for frames we have not yet simulated on the client, target states are stored in FRewindData still though. + * If PhysicsReplicationCVars::ResimulationCVars::bApplyPredictiveInterpolationWhenBehindServer is true switch over to using PredictiveInterpolation temporarily. + * else FRewindData::CompareTargetsToLastFrame will check for already cached targets to resim with when the server has simulated the corresponding frame */ + + Target.RepMode = EPhysicsReplicationMode::PredictiveInterpolation; + } + + UE_LOG(LogPhysics, Warning, TEXT("FPhysicsReplication received target frame (%d) out of rewind data bounds (%d, %d) - %s - Target will use EPhysicsReplicationMode: %s"), + LocalFrame, RewindData->GetEarliestFrame_Internal(), RewindData->CurrentFrame(), (LocalFrame < RewindData->GetEarliestFrame_Internal()) ? TEXT("Client is far ahead of the server, server might be dropping frames.") : TEXT("Client is behind the server, client might be dropping frames."), *UEnum::GetValueAsString(Target.RepMode)); + } +} + +void FPhysicsReplicationAsyncVR::ApplyPhysicsReplicationLOD(Chaos::FConstPhysicsObjectHandle PhysicsObjectHandle, FReplicatedPhysicsTargetAsync& Target, const uint32 LODFLags) +{ + Chaos::FPBDRigidsSolver& RigidsSolver = GetSolver()->CastChecked(); + + IPhysicsReplicationLODAsync* PhysRepLod = RigidsSolver.GetPhysicsReplicationLOD_Internal(); + if (!PhysRepLod || !PhysRepLod->IsEnabled()) + { + return; + } + + FPhysicsRepLodData* LodData = PhysRepLod->GetLODData_Internal(PhysicsObjectHandle, LODFLags); + if (LodData && LodData->DataAssigned) + { + // Apply recommended replication mode + Target.RepMode = LodData->ReplicationMode; + + if (Target.RepMode == EPhysicsReplicationMode::PredictiveInterpolation) + { + const bool bShouldSleep = (Target.TargetState.Flags & ERigidBodyFlags::Sleeping) != 0; + int32 TargetClientFrame = (Target.ServerFrame - Target.FrameOffset); + + // If we use Predicitve Interpolation and we should not sleep and the aligned frame from LOD is ahead of the target, perform LOD aligment extrapolation + if (!bShouldSleep && LodData->AlignedFrame > TargetClientFrame) + { + // Calculate how far to forward predict and extrapolate target by that amount + const int32 FullPredictionFrames = RigidsSolver.GetCurrentFrame() - TargetClientFrame; + const float FullPredictionTime = (FullPredictionFrames * GetDeltaTime_Internal()); + const float AlignedPredictionTime = FullPredictionTime - LodData->AlignedTime; + FPhysicsReplicationAsyncVR::ExtrapolateTarget(Target, AlignedPredictionTime); + + // Update tick count based on LOD alignment + Target.TickCount = LodData->AlignedFrame - TargetClientFrame; + } } } } @@ -1775,11 +1944,6 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl return true; } - if (Target.IsWaiting()) - { - return false; - } - Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); if (RigidsSolver == nullptr) { @@ -1803,8 +1967,8 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl const FVector Offset = FVector(0.0f, 0.0f, 50.0f); const FVector StartPos = Target.TargetState.Position + Offset; const int32 SizeMultiplier = FMath::Clamp(Target.TickCount, -4, 30); - static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(StartPos, FVector(5.0f + SizeMultiplier * 0.75f, 5.0f + SizeMultiplier * 0.75f, 5.0f + SizeMultiplier * 0.75f), Target.TargetState.Quaternion, FColor::MakeRandomSeededColor(Target.ServerFrame), false, CVarNetCorrectionLifetime->GetFloat(), 0, 1.0f); + static const auto CVarDebugdrawLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(StartPos, FVector(5.0f + SizeMultiplier * 0.75f, 5.0f + SizeMultiplier * 0.75f, 5.0f + SizeMultiplier * 0.75f), Target.TargetState.Quaternion, FColor::MakeRandomSeededColor(Target.ServerFrame), false, CVarDebugdrawLifetime->GetFloat(), 0, 1.0f); } #endif @@ -1864,6 +2028,11 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl return bClearTarget; }; + // If waiting on an up to date state, early out but allow target clearing since we might not receive a new state if target is already set to sleep for example + if (Target.IsWaiting()) + { + return EndReplicationHelper(Target, true); + } static const auto CVarEarlyOutWithVelocity = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.EarlyOutWithVelocity")); static const auto CVarEarlyOutDistanceSqr = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.EarlyOutDistanceSqr")); @@ -1909,8 +2078,41 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl const FVector TargetLinVel = FVector(Target.TargetState.LinVel); const FVector TargetAngVel = FVector(FMath::DegreesToRadians(Target.TargetState.AngVel)); // Radians - /** --- Reconciliation --- - * If target velocities are low enough, check the traveled direction and distance from previous frame and compare with replicated linear velocity. + /** --- Reconciliation --- */ + static const auto CVarKinematicHardSnap = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.KinematicHardSnap")); + static const auto CVarErrorAccumulationSeconds = IConsoleManager::Get().FindConsoleVariable(TEXT("p.ErrorAccumulationSeconds")); + static const auto CVarAlwaysHardSnap = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.AlwaysHardSnap")); + const bool bHardSnap = (!bCanSimulate && CVarKinematicHardSnap->GetBool()) + || Target.AccumulatedErrorSeconds > CVarErrorAccumulationSeconds->GetFloat() + || CVarAlwaysHardSnap->GetBool(); + + if (bHardSnap) + { + Target.AccumulatedErrorSeconds = 0.0f; + + if (Handle->IsKinematic()) + { + // Set a FKinematicTarget to hard snap kinematic object + const Chaos::FKinematicTarget KinTarget = Chaos::FKinematicTarget::MakePositionTarget(Target.PrevPosTarget, Target.PrevRotTarget); // Uses EKinematicTargetMode::Position + RigidsSolver->GetEvolution()->SetParticleKinematicTarget(Handle, KinTarget); + } + else + { + // Set XRVW to hard snap dynamic object and force recalculation of friction + const bool bCorrectConnectedBodies = SettingsCurrent.PredictiveInterpolationSettings.GetCorrectConnectedBodies(); + RigidsSolver->GetEvolution()->ApplyParticleTransformCorrection(Handle, Target.PrevPosTarget, Target.PrevRotTarget, bCorrectConnectedBodies, /*bInRecalculateFrictionOnConnectedBodies*/ true, ReplicatedParticleIDs); + Handle->SetV(TargetLinVel); + Handle->SetW(TargetAngVel); + } + + // Cache data for next replication + Target.PrevLinVel = FVector(Target.TargetState.LinVel); + + // End replication and go to sleep if that's requested + return EndReplicationHelper(Target, true); + } + + /** If target velocities are low enough, check the traveled direction and distance from previous frame and compare with replicated linear velocity. * If the object isn't moving enough along the replicated velocity it's considered stuck and needs reconciliation. * SoftSnap is performed each tick while there is a registered error, if enough time pass HardSnap forces the object into the correct state. */ static const auto CVarVelocityBased = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.VelocityBased")); @@ -1919,7 +2121,7 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl static const auto CVarDisableErrorVelocityLimits = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.DisableErrorVelocityLimits")); static const auto CVarErrorAccLinVelMaxLimit = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.ErrorAccLinVelMaxLimit")); static const auto CVarErrorAccAngVelMaxLimit = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.ErrorAccAngVelMaxLimit")); - if (CVarDisableErrorVelocityLimits->GetBool() || + if ( CVarDisableErrorVelocityLimits->GetBool() || (TargetLinVel.Size() < CVarErrorAccLinVelMaxLimit->GetFloat() && TargetAngVel.Size() < CVarErrorAccAngVelMaxLimit->GetFloat())) { const FVector PrevDiff = CurrentState.Position - Target.PrevPos; @@ -1952,43 +2154,8 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl { bSoftSnap = false; } - - static const auto CVarErrorAccumulationSeconds = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.ErrorAccumulationSeconds")); - static const auto CVarAlwaysHardSnap = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.AlwaysHardSnap")); - static const auto CVarKinematicHardSnap = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.KinematicHardSnap")); - - const bool bHardSnap = (!bCanSimulate && CVarKinematicHardSnap->GetBool()) - || Target.AccumulatedErrorSeconds > CVarErrorAccumulationSeconds->GetFloat() - || CVarAlwaysHardSnap->GetBool(); - - if (bHardSnap) - { - Target.AccumulatedErrorSeconds = 0.0f; - - if (Handle->IsKinematic()) - { - // Set a FKinematicTarget to hard snap kinematic object - const Chaos::FKinematicTarget KinTarget = Chaos::FKinematicTarget::MakePositionTarget(Target.PrevPosTarget, Target.PrevRotTarget); // Uses EKinematicTargetMode::Position - RigidsSolver->GetEvolution()->SetParticleKinematicTarget(Handle, KinTarget); - } - else - { - // Set XRVW to hard snap dynamic object and force recalculation of friction - const bool bCorrectConnectedBodies = SettingsCurrent.PredictiveInterpolationSettings.GetCorrectConnectedBodies(); - RigidsSolver->GetEvolution()->ApplyParticleTransformCorrection(Handle, Target.PrevPosTarget, Target.PrevRotTarget, bCorrectConnectedBodies, /*bInRecalculateFrictionOnConnectedBodies*/ true, ReplicatedParticleIDs); - - - Handle->SetV(TargetLinVel); - Handle->SetW(TargetAngVel); - } - - // Cache data for next replication - Target.PrevLinVel = FVector(Target.TargetState.LinVel); - - // End replication and go to sleep if that's requested - return EndReplicationHelper(Target, true); - } - else if (Handle->IsKinematic()) // Smooth Kinematic Replication + + if (Handle->IsKinematic()) // Smooth Kinematic Replication { static const auto CVarKinematicPrediction = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.KinematicPrediction")); const bool bKinematicPrediction = CVarKinematicPrediction->GetBool(); @@ -2035,8 +2202,8 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl const FVector Offset = FVector(0.0f, 0.0f, CVarDrawDebugZOffset->GetFloat()); const FVector Pos = KinTargetPos + Offset; const int32 SizeMultiplier = FMath::Clamp(Target.TickCount, -4, 30); - static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugSphere(Pos, 3.0f + SizeMultiplier * 0.75f, 8, FColor::MakeRandomSeededColor(Target.ServerFrame), false, CVarNetCorrectionLifetime->GetFloat(), 0, 1.0f); + static const auto CVarDebugdrawLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugSphere(Pos, 3.0f + SizeMultiplier * 0.75f, 8, FColor::MakeRandomSeededColor(Target.ServerFrame), false, CVarDebugdrawLifetime->GetFloat(), 0, 1.0f); } #endif } @@ -2214,7 +2381,12 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl void FPhysicsReplicationAsyncVR::ExtrapolateTarget(FReplicatedPhysicsTargetAsync& Target, const int32 ExtrapolateFrames, const float DeltaSeconds) { const float ExtrapolationTime = DeltaSeconds * static_cast(ExtrapolateFrames); + FPhysicsReplicationAsyncVR::ExtrapolateTarget(Target, ExtrapolationTime); +} +/** Static function to extrapolate a target for N Seconds */ +void FPhysicsReplicationAsyncVR::ExtrapolateTarget(FReplicatedPhysicsTargetAsync& Target, const float ExtrapolationTime) +{ // Extrapolate target position Target.TargetState.Position = Target.TargetState.Position + Target.TargetState.LinVel * ExtrapolationTime; @@ -2242,15 +2414,15 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl return true; } + if (Target.ServerFrame <= 0) + { + return true; + } + const int32 LocalFrame = Target.ServerFrame - Target.FrameOffset; - if (LocalFrame >= RewindData->CurrentFrame() || LocalFrame < RewindData->GetEarliestFrame_Internal()) + if (!RewindData->IsFrameWithinRewindHistory(LocalFrame)) { - if (LocalFrame > 0 && (RewindData->CurrentFrame() - RewindData->GetEarliestFrame_Internal()) == RewindData->Capacity()) - { - UE_LOG(LogPhysics, Warning, TEXT("FPhysicsReplication::ResimulationReplication target frame (%d) out of rewind data bounds (%d,%d)"), - LocalFrame, RewindData->GetEarliestFrame_Internal(), RewindData->CurrentFrame()); - } return true; } @@ -2269,11 +2441,24 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl const bool bCompareW = Chaos::FPhysicsSolverBase::GetResimulationErrorAngularVelocityThresholdEnabled() || SettingsCurrent.ResimulationSettings.bOverrideResimulationErrorAngularVelocityThreshold; bool bShouldTriggerResim = false; +#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) + // Debugging + FColor DebugColor = FColor::Black; + bool bResimV = false; + bool bResimW = false; +#endif + // Check for positional discrepancy in Distance between client and server if (bCompareX) { const float ResimPositionErrorThreshold = SettingsCurrent.ResimulationSettings.GetResimulationErrorPositionThreshold(Chaos::FPhysicsSolverBase::GetResimulationErrorPositionThreshold()); bShouldTriggerResim = Chaos::FRewindData::CheckVectorThreshold(Target.TargetState.Position, PastState.GetX(), ResimPositionErrorThreshold); +#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) + if (bShouldTriggerResim) + { + DebugColor = FColor::Orange; + } +#endif } // Check for linear velocity discrepancy in Distance / s between client and server @@ -2281,13 +2466,25 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl { const float ResimLinVelocityErrorThreshold = SettingsCurrent.ResimulationSettings.GetResimulationErrorLinearVelocityThreshold(Chaos::FPhysicsSolverBase::GetResimulationErrorLinearVelocityThreshold()); bShouldTriggerResim = Chaos::FRewindData::CheckVectorThreshold(Target.TargetState.LinVel, PastState.GetV(), ResimLinVelocityErrorThreshold); +#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) + if (bShouldTriggerResim) + { + bResimV = true; + } +#endif } // Check for angular velocity discrepancy in Degrees / s between client and server if (!bShouldTriggerResim && bCompareW) { const float ResimAngVelocityErrorThreshold = SettingsCurrent.ResimulationSettings.GetResimulationErrorAngularVelocityThreshold(Chaos::FPhysicsSolverBase::GetResimulationErrorAngularVelocityThreshold()); - bShouldTriggerResim = Chaos::FRewindData::CheckVectorThreshold(FMath::DegreesToRadians(Target.TargetState.AngVel), PastState.GetW(), ResimAngVelocityErrorThreshold); + bShouldTriggerResim = Chaos::FRewindData::CheckVectorThreshold(Target.TargetState.AngVel, FMath::RadiansToDegrees(PastState.GetW()), ResimAngVelocityErrorThreshold); +#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) + if (bShouldTriggerResim) + { + bResimW = true; + } +#endif } // Check for rotational discrepancy in Degrees between client and server @@ -2295,6 +2492,12 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl { const float ResimRotationErrorThreshold = SettingsCurrent.ResimulationSettings.GetResimulationErrorRotationThreshold(Chaos::FPhysicsSolverBase::GetResimulationErrorRotationThreshold()); bShouldTriggerResim = Chaos::FRewindData::CheckQuaternionThreshold(Target.TargetState.Quaternion, PastState.GetR(), ResimRotationErrorThreshold); +#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) + if (bShouldTriggerResim) + { + DebugColor = FColor::Magenta; + } +#endif } @@ -2311,16 +2514,51 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl } static const auto CVarResimDrawDebug = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.Resim.DrawDebug")); - if (CVarResimDrawDebug->GetBool()) + static const auto CVarRenderInterpDebugDrawResimTrigger = IConsoleManager::Get().FindConsoleVariable(TEXT("p.RenderInterp.DebugDraw.ResimTrigger")); + if (CVarResimDrawDebug->GetBool() || CVarRenderInterpDebugDrawResimTrigger->GetBool()) { - static constexpr float BoxSize = 5.0f; - const float ColorLerp = bShouldTriggerResim ? 1.0f : 0.0f; - const FColor DebugColor = FLinearColor::LerpUsingHSV(FLinearColor::Green, FLinearColor::Red, ColorLerp).ToFColor(false); + if (bShouldTriggerResim) + { + FVector Box = CVarRenderInterpDebugDrawResimTrigger->GetBool() ? FVector(6, 3, 2) : FVector(40, 20, 10); + const float DrawThickness = CVarRenderInterpDebugDrawResimTrigger->GetBool() ? 0.5f : 1.5f; - static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Target.TargetState.Position, FVector(BoxSize, BoxSize, BoxSize), Target.TargetState.Quaternion, FColor::Orange, true, CVarNetCorrectionLifetime->GetFloat(), 0, 1.0f); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(PastState.GetX(), FVector(6, 6, 6), PastState.GetR(), DebugColor, true, CVarNetCorrectionLifetime->GetFloat(), 0, 1.0f); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(PastState.GetX(), Target.TargetState.Position, 5.0f, FColor::MakeRandomSeededColor(LocalFrame), true, CVarNetCorrectionLifetime->GetFloat(), 0, 0.5f); + static const auto CVarDebugdrawLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); + if (CVarRenderInterpDebugDrawResimTrigger->GetBool()) // Resim debug draw extension for render interpolation + { + Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(PastState.GetX(), Box, PastState.GetR(), FColor::White, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Target.TargetState.Position, Box, Target.TargetState.Quaternion, DebugColor, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); + + Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Handle->GetX(), PastState.GetX(), 5.0f, FColor::White, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(PastState.GetX(), Target.TargetState.Position, 5.0f, FColor::Black, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); + + if (bResimV) + { + const FVector DiffV = Target.TargetState.LinVel - PastState.GetV(); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Target.TargetState.Position, Target.TargetState.Position + DiffV, 5.0f, FColor::Orange, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); + } + if (bResimW) + { + const FVector DiffW = Target.TargetState.AngVel - FMath::RadiansToDegrees(PastState.GetW()); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Target.TargetState.Position + DiffW, Target.TargetState.Position, 5.0f, FColor::Magenta, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); + } + } + else // Resim trigger debug draw + { + Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Handle->GetX(), Box, PastState.GetR(), FColor::White, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Handle->GetX() + (Target.TargetState.Position - PastState.GetX()), Box, Target.TargetState.Quaternion, DebugColor, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); + + if (bResimV) + { + const FVector DiffV = Target.TargetState.LinVel - PastState.GetV(); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Handle->GetX(), Handle->GetX() + DiffV, 5.0f, FColor::Orange, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); + } + if (bResimW) + { + const FVector DiffW = Target.TargetState.AngVel - FMath::RadiansToDegrees(PastState.GetW()); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Handle->GetX() + DiffW, Handle->GetX(), 5.0f, FColor::Magenta, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); + } + } + } } #endif @@ -2332,12 +2570,8 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl if (bShouldTriggerResim && Target.TickCount == 0 && LocalFrame > RewindData->GetBlockedResimFrame()) { - // Trigger resimulation - RigidsSolver->GetEvolution()->GetIslandManager().SetParticleResimFrame(Handle, LocalFrame); - - int32 ResimFrame = RewindData->GetResimFrame(); - ResimFrame = (ResimFrame == INDEX_NONE) ? LocalFrame : FMath::Min(ResimFrame, LocalFrame); - RewindData->SetResimFrame(ResimFrame); + // Request resimulation + RewindData->RequestResimulation(LocalFrame, Handle); } else if (SettingsCurrent.ResimulationSettings.GetRuntimeCorrectionEnabled()) { @@ -2381,8 +2615,8 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) if (CVarResimDrawDebug->GetBool()) { - static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Handle->GetX(), CorrectedX, 5.0f, FColor::MakeRandomSeededColor(LocalFrame), true, CVarNetCorrectionLifetime->GetFloat(), 0, 0.5f); + static const auto CVarDebugdrawLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Handle->GetX(), CorrectedX, 5.0f, FColor::MakeRandomSeededColor(LocalFrame), true, CVarDebugdrawLifetime->GetFloat(), 0, 0.5f); } #endif // Apply correction to position and rotation @@ -2406,14 +2640,90 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl RigidsSolver->GetEvolution()->ApplySleepOnConnectedParticles(Handle); } } + else if (Target.IsWaiting()) + { + // Don't clear the target if we are waiting for a specific target frame and not sleeping + bClearTarget = false; + } + return bClearTarget; } +void FPhysicsReplicationAsyncVR::DebugDrawReplicationMode(const FPhysicsRepAsyncInputData& Input) +{ +#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) + + static const auto CVarDebugDrawShowRepMode = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.ShowRepMode")); + if (!CVarDebugDrawShowRepMode->GetBool()) + { + return; + } + + if (Input.PhysicsObject == nullptr && Input.Proxy == nullptr) + { + return; + } + + FColor DebugColor = FColor::White; + FVector BoxExtent = FVector(10.0f, 10.0f, 10.0f); + FQuat Rotation = FQuat::Identity; + + if (Input.PhysicsObject) + { + if (FReplicatedPhysicsTargetAsync* Target = ObjectToTarget.Find(Input.PhysicsObject)) + { + Chaos::FReadPhysicsObjectInterface_Internal Interface = Chaos::FPhysicsObjectInternalInterface::GetRead(); + if (Chaos::FGeometryParticleHandle* Handle = Interface.GetParticle(Input.PhysicsObject)) + { + BoxExtent = Handle->LocalBounds().Extents() * 0.5f; + Rotation = Handle->GetR(); + } + + const EPhysicsReplicationMode RepMode = Target->IsWaiting() ? Target->RepModeOverride : Target->RepMode; + switch (RepMode) + { + case EPhysicsReplicationMode::PredictiveInterpolation: + DebugColor = FColor::Yellow; + break; + case EPhysicsReplicationMode::Resimulation: + DebugColor = FColor::Red; + break; + case EPhysicsReplicationMode::Default: + default: + DebugColor = FColor::Cyan; + break; + } + } + } + else if (Input.Proxy != nullptr) + { + // Legacy Default physics replication + + Chaos::FSingleParticlePhysicsProxy* Proxy = Input.Proxy; + Chaos::FRigidBodyHandle_Internal* Handle = Proxy->GetPhysicsThreadAPI(); + + Rotation = Handle->GetR(); + DebugColor = FColor::Green; + } + + static const auto CVarDebugdrawLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Input.TargetState.Position, BoxExtent, Rotation, DebugColor, false, CVarDebugdrawLifetime->GetFloat(), 0, 1.0f); +#endif +} + FName FPhysicsReplicationAsyncVR::GetFNameForStatId() const { const static FLazyName StaticName("FPhysicsReplicationAsyncCallback"); return StaticName; } +bool FPhysicsReplicationAsyncVR::UsePhysicsReplicationLOD() +{ + Chaos::FPBDRigidsSolver& RigidsSolver = GetSolver()->CastChecked(); + + IPhysicsReplicationLODAsync* PhysRepLod = RigidsSolver.GetPhysicsReplicationLOD_Internal(); + return PhysRepLod && PhysRepLod->IsEnabled(); +} + #pragma endregion // FPhysicsReplicationAsync \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp index 2379ac3..485ba79 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp @@ -725,11 +725,11 @@ void AGrippableStaticMeshActor::OnRep_ReplicatedMovement() return; } - if (VRGripInterfaceSettings.HoldingControllers.Num() > 0) + /*if (VRGripInterfaceSettings.HoldingControllers.Num() > 0) { ShouldWeSkipAttachmentReplication(); int gg = 0; - } + }*/ Super::OnRep_ReplicatedMovement(); } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp index 91a775c..dc3cbc4 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp @@ -206,7 +206,8 @@ bool UHandSocketComponent::GetAnimationSequenceAsPoseSnapShot(UAnimSequence* InA const FReferenceSkeleton& RefSkeleton = (TargetMesh) ? TargetMesh->GetSkinnedAsset()->GetRefSkeleton() : InAnimationSequence->GetSkeleton()->GetReferenceSkeleton(); FTransform LocalTransform; - const TArray& TrackMap = InAnimationSequence->GetCompressedTrackToSkeletonMapTable(); + //const TArray& TrackMap = InAnimationSequence->GetCompressedTrackToSkeletonMapTable(); + const TArray& TrackMap = InAnimationSequence->GetCompressedData().Get().CompressedTrackToSkeletonMapTable; int32 TrackIndex = INDEX_NONE; OutPoseSnapShot.LocalTransforms.Reserve(OutPoseSnapShot.BoneNames.Num()); @@ -237,8 +238,9 @@ bool UHandSocketComponent::GetAnimationSequenceAsPoseSnapShot(UAnimSequence* InA if (TrackIndex != INDEX_NONE && (!bSkipRootBone || TrackIndex != 0)) { - double TrackLocation = 0.0f; - InAnimationSequence->GetBoneTransform(LocalTransform, FSkeletonPoseBoneIndex(TrackMap[TrackIndex].BoneTreeIndex), TrackLocation, false); + //double TrackLocation = 0.0f; + // FAnimExtraContext default is fine, its a zero track location + InAnimationSequence->GetBoneTransform(LocalTransform, FSkeletonPoseBoneIndex(TrackMap[TrackIndex].BoneTreeIndex), FAnimExtractContext(), false); } else { @@ -317,7 +319,7 @@ bool UHandSocketComponent::GetBlendedPoseSnapShot(FPoseSnapshot& PoseSnapShot, U const FReferenceSkeleton& RefSkeleton = (TargetMesh) ? TargetMesh->GetSkinnedAsset()->GetRefSkeleton() : HandTargetAnimation->GetSkeleton()->GetReferenceSkeleton(); FTransform LocalTransform; - const TArray& TrackMap = HandTargetAnimation->GetCompressedTrackToSkeletonMapTable(); + const TArray& TrackMap = HandTargetAnimation->GetCompressedData().Get().CompressedTrackToSkeletonMapTable; int32 TrackIndex = INDEX_NONE; for (int32 BoneNameIndex = 0; BoneNameIndex < PoseSnapShot.BoneNames.Num(); ++BoneNameIndex) @@ -345,8 +347,9 @@ bool UHandSocketComponent::GetBlendedPoseSnapShot(FPoseSnapshot& PoseSnapShot, U if (TrackIndex != INDEX_NONE && (!bSkipRootBone || TrackIndex != 0)) { - double TrackLocation = 0.0f; - HandTargetAnimation->GetBoneTransform(LocalTransform, FSkeletonPoseBoneIndex(TrackMap[TrackIndex].BoneTreeIndex), TrackLocation, false); + //double TrackLocation = 0.0f; + // FAnimExtraContext default is fine, its a zero track location + HandTargetAnimation->GetBoneTransform(LocalTransform, FSkeletonPoseBoneIndex(TrackMap[TrackIndex].BoneTreeIndex), FAnimExtractContext(), false); } else { @@ -609,7 +612,7 @@ FTransform UHandSocketComponent::GetBoneTransformAtTime(UAnimSequence* MyAnimSeq if (const IAnimationDataModel* AnimModel = AnimController.GetModel()) { - const TArray& TrackMap = MyAnimSequence->GetCompressedTrackToSkeletonMapTable(); + const TArray& TrackMap = MyAnimSequence->GetCompressedData().Get().CompressedTrackToSkeletonMapTable; int32 TrackIndex = INDEX_NONE; if (BoneIdx != INDEX_NONE && BoneIdx < TrackMap.Num() && TrackMap[BoneIdx].BoneTreeIndex == BoneIdx) @@ -635,7 +638,9 @@ FTransform UHandSocketComponent::GetBoneTransformAtTime(UAnimSequence* MyAnimSeq FSkeletonPoseBoneIndex BoneIndex(TrackMap[TrackIndex].BoneTreeIndex); if (BoneIndex.IsValid()) { - MyAnimSequence->GetBoneTransform(BoneTransform, BoneIndex, /*AnimTime*/ tracklen, bUseRawDataOnly); + FAnimExtractContext NewContext; + NewContext.CurrentTime = tracklen; + MyAnimSequence->GetBoneTransform(BoneTransform, BoneIndex, /*AnimTime*/ NewContext, bUseRawDataOnly); return BoneTransform; } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp index be833e5..199c9f0 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp @@ -561,6 +561,7 @@ void UInversePhysicsSkeletalMeshComponent::RegisterEndPhysicsTick(bool bRegister // For testing if the engine fix is live yet or not //return Super::RegisterEndPhysicsTick(bRegister); + if (bRegister != EndPhysicsTickFunctionVR.IsTickFunctionRegistered()) { if (bRegister) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp index 0e932b3..28a69c0 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp @@ -1117,7 +1117,7 @@ void UAISense_Sight_VR::RemoveAllQueriesByListener(const FPerceptionListener& Li SCOPE_CYCLE_COUNTER(STAT_AI_Sense_Sight_RemoveByListener); UE_MT_SCOPED_WRITE_ACCESS(QueriesListAccessDetector); - const uint32 ListenerId = Listener.GetListenerID(); + const FPerceptionListenerID ListenerId = Listener.GetListenerID(); auto RemoveQuery = [&ListenerId, &OnRemoveFunc](TArray& SightQueries, const int32 QueryIndex)->EReverseForEachResult { @@ -1185,7 +1185,7 @@ void UAISense_Sight_VR::RemoveAllQueriesToTarget_Internal(const FAISightTargetVR void UAISense_Sight_VR::OnListenerForgetsActor(const FPerceptionListener& Listener, AActor& ActorToForget) { - const uint32 ListenerId = Listener.GetListenerID(); + const FPerceptionListenerID ListenerId = Listener.GetListenerID(); const uint32 TargetId = ActorToForget.GetUniqueID(); auto ForgetPreviousResult = [&ListenerId, &TargetId](FAISightQueryVR& SightQuery)->EForEachResult @@ -1212,7 +1212,7 @@ void UAISense_Sight_VR::OnListenerForgetsAll(const FPerceptionListener& Listener { UE_MT_SCOPED_WRITE_ACCESS(QueriesListAccessDetector); - const uint32 ListenerId = Listener.GetListenerID(); + const FPerceptionListenerID ListenerId = Listener.GetListenerID(); auto ForgetPreviousResult = [&ListenerId](FAISightQueryVR& SightQuery)->EForEachResult { diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp index 44d9e5a..5fffb61 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp @@ -103,7 +103,7 @@ bool UVRGameViewportClient::InputKey(const FInputKeyEventArgs& EventArgs) } } -bool UVRGameViewportClient::InputAxis(FViewport* tViewport, FInputDeviceId InputDevice, FKey Key, float Delta, float DeltaTime, int32 NumSamples, bool bGamepad) +bool UVRGameViewportClient::InputAxis(const FInputKeyEventArgs& Args) { // Remap the old int32 ControllerId value to the new InputDeviceId IPlatformInputDeviceMapper& DeviceMapper = IPlatformInputDeviceMapper::Get(); @@ -111,8 +111,8 @@ bool UVRGameViewportClient::InputAxis(FViewport* tViewport, FInputDeviceId Input const int32 NumLocalPlayers = World->GetGameInstance()->GetNumLocalPlayers(); // Early out if a gamepad or not a mouse event (vr controller) or ignoring input or is default setup / no GEngine - if (((!Key.IsMouseButton() && !bGamepad) || (bGamepad && !IsValidGamePadKey(Key))) || NumLocalPlayers < 2 || GameInputMethod == EVRGameInputMethod::GameInput_Default || IgnoreInput()) - return Super::InputAxis(tViewport, InputDevice, Key, Delta, DeltaTime, NumSamples, bGamepad); + if (((!Args.Key.IsMouseButton() && !Args.IsGamepad()) || (Args.IsGamepad() && !IsValidGamePadKey(Args.Key))) || NumLocalPlayers < 2 || GameInputMethod == EVRGameInputMethod::GameInput_Default || IgnoreInput()) + return Super::InputAxis(Args); if (GameInputMethod == EVRGameInputMethod::GameInput_KeyboardAndMouseToPlayer2) { @@ -123,7 +123,9 @@ bool UVRGameViewportClient::InputAxis(FViewport* tViewport, FInputDeviceId Input FInputDeviceId DeviceId = INPUTDEVICEID_NONE; DeviceMapper.RemapControllerIdToPlatformUserAndDevice(ControllerId, UserId, DeviceId); - return Super::InputAxis(tViewport, DeviceId, Key, Delta, DeltaTime, NumSamples, bGamepad); + FInputKeyEventArgs NewArgs = Args; + NewArgs.InputDevice = DeviceId; + return Super::InputAxis(NewArgs); } else // Shared keyboard and mouse { @@ -134,7 +136,9 @@ bool UVRGameViewportClient::InputAxis(FViewport* tViewport, FInputDeviceId Input FInputDeviceId DeviceId = INPUTDEVICEID_NONE; DeviceMapper.RemapControllerIdToPlatformUserAndDevice(i, UserId, DeviceId); - bRetVal = Super::InputAxis(tViewport, DeviceId, Key, Delta, DeltaTime, NumSamples, bGamepad) || bRetVal; + FInputKeyEventArgs NewArgs = Args; + NewArgs.InputDevice = DeviceId; + bRetVal = Super::InputAxis(NewArgs) || bRetVal; } return bRetVal; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp index fbe5a35..2bc26e8 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp @@ -449,7 +449,7 @@ void ARenderTargetReplicationProxy::SendInitMessage() void ARenderTargetReplicationProxy::SendNextDataBlob() { - if (!IsValid(this) || !this->GetOwner() || !IsValid(this->GetOwner())) + if (!IsValidChecked(this) || !this->GetOwner() || !IsValid(this->GetOwner())) { TextureStore.Reset(); TextureStore.PackedData.Empty(); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp index 346d4ec..bbdecb1 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp @@ -210,7 +210,7 @@ void UReplicatedVRCameraComponent::UpdateTracking(float DeltaTime) FRotator StoredCameraRotOffset = FRotator::ZeroRotator; if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) { - AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); + //StoredCameraRotOffset = AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); } else { @@ -250,7 +250,7 @@ void UReplicatedVRCameraComponent::RunNetworkedSmoothing(float DeltaTime) FRotator StoredCameraRotOffset = FRotator::ZeroRotator; if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) { - AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); + //StoredCameraRotOffset = AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); } else { @@ -480,12 +480,12 @@ void UReplicatedVRCameraComponent::HandleXRCamera(float DeltaTime) //FRotator OffsetRotator = if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() != EVRConjoinedMovementModes::C_VRMOVE_Seated) { - AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); + //AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); FRotator StoredCameraRotOffset = FRotator::ZeroRotator; if (AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) { - AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); + //StoredCameraRotOffset = AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); } else { @@ -536,7 +536,7 @@ void UReplicatedVRCameraComponent::OnRep_ReplicatedCameraTransform() FRotator StoredCameraRotOffset = FRotator::ZeroRotator; if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) { - AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); + //StoredCameraRotOffset = AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); } else { diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp index 13d7a03..e0b200b 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp @@ -185,7 +185,7 @@ void AVRBaseCharacter::PostInitializeComponents() Super::PostInitializeComponents(); - if (IsValid(this)) + if (IsValidChecked(this)) { if (NetSmoother) { diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp index 581bc8b..50266e8 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp @@ -1721,6 +1721,17 @@ void UVRBaseCharacterMovementComponent::SimulatedTick(float DeltaSeconds) const FQuat NewCapsuleRotation = UpdatedComponent->GetComponentQuat(); if (Mesh == CharacterOwner->GetMesh() && !NewCapsuleRotation.Equals(OldRotationQuat, 1e-6f) && ClientPredictionData) { + // #TODO: The below is new in 5.6, i don't have saved capsule rotation, don't think i need this change for base char + /* + // Add delta rotation to the target rotation and original offset. Otherwise this object will move back toward the old rotation. + const FQuat RotationDelta = NewCapsuleRotation - SavedCapsuleRotation; + ClientPredictionData->MeshRotationTarget += RotationDelta; + ClientPredictionData->OriginalMeshRotationOffset += RotationDelta; + + // Update the MeshRotationOffset to match the capsule rotation. + ClientPredictionData->MeshRotationOffset = NewCapsuleRotation; + */ + // Smoothing should lerp toward this new rotation target, otherwise it will just try to go back toward the old rotation. ClientPredictionData->MeshRotationTarget = NewCapsuleRotation; Mesh->SetRelativeLocationAndRotation(SavedMeshRelativeLocation, CharacterOwner->GetBaseRotationOffset()); @@ -1941,13 +1952,18 @@ void UVRBaseCharacterMovementComponent::MoveAutonomous( static const auto CVarEnableQueuedAnimEventsOnServer = IConsoleManager::Get().FindConsoleVariable(TEXT("a.EnableQueuedAnimEventsOnServer")); if (CVarEnableQueuedAnimEventsOnServer->GetInt()) { - if (const UAnimInstance* AnimInstance = OwnerMesh->GetAnimInstance()) + if (UAnimInstance* AnimInstance = OwnerMesh->GetAnimInstance()) { if (OwnerMesh->VisibilityBasedAnimTickOption <= EVisibilityBasedAnimTickOption::AlwaysTickPose && AnimInstance->NeedsUpdate()) { // If we are doing a full graph update on the server but its doing a parallel update, - // trigger events right away since these are notifies queued from the montage update and we could be receiving multiple ServerMoves per frame. + // trigger events right away since these are notifies queued from the montage update, and we could be receiving multiple ServerMoves per frame. OwnerMesh->ConditionallyDispatchQueuedAnimEvents(); + + // We need to manually clear the anim notify queue (since normally its only is cleared in PreUpdateAnimation()) otherwise if animation ticks, the notifies queued from the ServerMove would fire twice. + AnimInstance->ClearQueuedAnimEvents(false); + + // When animation ticks, we want its queued events to be triggered. OwnerMesh->AllowQueuedAnimEventsNextDispatch(); } } @@ -1955,7 +1971,7 @@ void UVRBaseCharacterMovementComponent::MoveAutonomous( else { // Revert back to old behavior if wanted/needed. - if (OwnerMesh->ShouldOnlyTickMontages(DeltaTime)) + if (OwnerMesh->ShouldOnlyTickMontages(DeltaTime) || OwnerMesh->ShouldOnlyTickMontagesAndRefreshBones(DeltaTime)) { OwnerMesh->ConditionallyDispatchQueuedAnimEvents(); } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp index 65cc5a3..4ca1ff7 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp @@ -123,7 +123,7 @@ void UVRCharacterMovementComponent::Crouch(bool bClientSimulation) { if (!bClientSimulation) { - CharacterOwner->bIsCrouched = true; + CharacterOwner->SetIsCrouched(true); } CharacterOwner->OnStartCrouch(0.f, 0.f); return; @@ -195,7 +195,7 @@ void UVRCharacterMovementComponent::Crouch(bool bClientSimulation) //UpdatedComponent->MoveComponent(ScaledHalfHeightAdjust * GetGravityDirection(), UpdatedComponent->GetComponentQuat(), true, nullptr, EMoveComponentFlags::MOVECOMP_NoFlags, ETeleportType::TeleportPhysics); } - CharacterOwner->bIsCrouched = true; + CharacterOwner->SetIsCrouched(true); } bForceNextFloorCheck = true; @@ -240,7 +240,7 @@ void UVRCharacterMovementComponent::UnCrouch(bool bClientSimulation) { if (!bClientSimulation) { - CharacterOwner->bIsCrouched = false; + CharacterOwner->SetIsCrouched(false); } CharacterOwner->OnEndCrouch(0.f, 0.f); return; @@ -341,7 +341,11 @@ void UVRCharacterMovementComponent::UnCrouch(bool bClientSimulation) if (!bEncroached) { // Commit the change in location. - //UpdatedComponent->MoveComponent(StandingLocation - PawnLocation, UpdatedComponent->GetComponentQuat(), false, nullptr, EMoveComponentFlags::MOVECOMP_NoFlags, ETeleportType::TeleportPhysics); + if (!BaseVRCharacterOwner || !BaseVRCharacterOwner->bRetainRoomscale) + { + // we actually move this when not using retained roomscale + //UpdatedComponent->MoveComponent(StandingLocation - PawnLocation, UpdatedComponent->GetComponentQuat(), false, nullptr, EMoveComponentFlags::MOVECOMP_NoFlags, ETeleportType::TeleportPhysics); + } bForceNextFloorCheck = true; } } @@ -352,7 +356,7 @@ void UVRCharacterMovementComponent::UnCrouch(bool bClientSimulation) return; } - CharacterOwner->bIsCrouched = false; + CharacterOwner->SetIsCrouched(false); } else { @@ -881,7 +885,7 @@ void UVRCharacterMovementComponent::PhysWalking(float deltaTime, int32 Iteration return; } - if (!CharacterOwner || (!CharacterOwner->Controller && !bRunPhysicsWithNoController && !HasAnimRootMotion() && !CurrentRootMotion.HasOverrideVelocity() && (CharacterOwner->GetLocalRole() != ROLE_SimulatedProxy))) + if (!CharacterOwner || (!CharacterOwner->GetController() && !bRunPhysicsWithNoController && !HasAnimRootMotion() && !CurrentRootMotion.HasOverrideVelocity() && (CharacterOwner->GetLocalRole() != ROLE_SimulatedProxy))) { Acceleration = FVector::ZeroVector; Velocity = FVector::ZeroVector; @@ -908,7 +912,7 @@ void UVRCharacterMovementComponent::PhysWalking(float deltaTime, int32 Iteration RewindVRRelativeMovement(); // Perform the move - while ((remainingTime >= MIN_TICK_TIME) && (Iterations < MaxSimulationIterations) && CharacterOwner && (CharacterOwner->Controller || bRunPhysicsWithNoController || HasAnimRootMotion() || CurrentRootMotion.HasOverrideVelocity() || (CharacterOwner->GetLocalRole() == ROLE_SimulatedProxy))) + while ((remainingTime >= MIN_TICK_TIME) && (Iterations < MaxSimulationIterations) && CharacterOwner && (CharacterOwner->GetController() || bRunPhysicsWithNoController || HasAnimRootMotion() || CurrentRootMotion.HasOverrideVelocity() || (CharacterOwner->GetLocalRole() == ROLE_SimulatedProxy))) { Iterations++; bJustTeleported = false; @@ -1085,7 +1089,7 @@ void UVRCharacterMovementComponent::PhysWalking(float deltaTime, int32 Iteration } AdjustFloorHeight(); - SetBase(CurrentFloor.HitResult.Component.Get(), CurrentFloor.HitResult.BoneName); + SetBaseFromFloor(CurrentFloor); } else if (CurrentFloor.HitResult.bStartPenetrating && remainingTime <= 0.f) { @@ -2275,7 +2279,7 @@ void UVRCharacterMovementComponent::UpdateBasedMovement(float DeltaSeconds) { // Nothing changed. This means we probably are using another rotation mechanism (bOrientToMovement etc). We should still follow the base object. // @todo: This assumes only Yaw is used, currently a valid assumption. This is the only reason FaceRotation() is used above really, aside from being a virtual hook. - if (bOrientRotationToMovement || (bUseControllerDesiredRotation && CharacterOwner->Controller)) + if (bOrientRotationToMovement || (bUseControllerDesiredRotation && CharacterOwner->GetController())) { // Custom gravity automatically aligns the character to the gravity direction, so we shouldn't zero out pitch and roll. if (!HasCustomGravity()) @@ -2289,7 +2293,7 @@ void UVRCharacterMovementComponent::UpdateBasedMovement(float DeltaSeconds) } // Pipe through ControlRotation, to affect camera. - if (CharacterOwner->Controller) + if (CharacterOwner->GetController()) { const FQuat PawnDeltaRotation = FinalQuat * PawnOldQuat.Inverse(); FRotator FinalRotation = FinalQuat.Rotator(); @@ -3195,7 +3199,7 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat } // Root motion not for VR - if ((!CharacterOwner || !CharacterOwner->Controller) && !bRunPhysicsWithNoController && !HasAnimRootMotion() && !CurrentRootMotion.HasOverrideVelocity()) + if ((!CharacterOwner || !CharacterOwner->GetController()) && !bRunPhysicsWithNoController && !HasAnimRootMotion() && !CurrentRootMotion.HasOverrideVelocity()) { Acceleration = FVector::ZeroVector; Velocity = FVector::ZeroVector; @@ -3814,7 +3818,7 @@ void UVRCharacterMovementComponent::SimulateMovement(float DeltaSeconds) if (IsMovingOnGround()) { AdjustFloorHeight(); - SetBase(CurrentFloor.HitResult.Component.Get(), CurrentFloor.HitResult.BoneName); + SetBaseFromFloor(CurrentFloor); } else if (MovementMode == MOVE_Falling) { diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp index b660744..166f9e3 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp @@ -544,7 +544,7 @@ void UVRGestureComponent::DrawDebugGesture(UObject* WorldContextObject, FTransfo FVector MirrorVector = FVector(1.f, -1.f, 1.f); // Only mirroring on Y axis to flip Left/Right // this means foreground lines can't be persistent - ULineBatchComponent* const LineBatcher = (InWorld ? ((DepthPriority == SDPG_Foreground) ? InWorld->ForegroundLineBatcher : ((bPersistentLines || (LifeTime > 0.f)) ? InWorld->PersistentLineBatcher : InWorld->LineBatcher)) : NULL); + ULineBatchComponent* const LineBatcher = (InWorld ? ((DepthPriority == SDPG_Foreground) ? InWorld->GetLineBatcher(UWorld::ELineBatcherType::Foreground) : ((bPersistentLines || (LifeTime > 0.f)) ? InWorld->GetLineBatcher(UWorld::ELineBatcherType::WorldPersistent) : InWorld->GetLineBatcher(UWorld::ELineBatcherType::World))) : NULL); if (LineBatcher != NULL) { diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp index 6768f25..3043383 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp @@ -52,7 +52,7 @@ void UVRPathFollowingComponent::GetDebugStringTokens(TArray& Tokens, TA Tokens.Add(GetStatusDesc()); Flags.Add(EPathFollowingDebugTokens::Description); - if (Status != EPathFollowingStatus::Moving) + if (GetStatus() != EPathFollowingStatus::Moving) { return; } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp index c14c376..adda839 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp @@ -11,6 +11,7 @@ #include "Engine/ScopedMovementUpdate.h" #include "SceneManagement.h" #include "PrimitiveSceneProxy.h" +#include "SceneView.h" //#include "DrawDebugHelpers.h" #include "IHeadMountedDisplay.h" #include "IXRTrackingSystem.h" @@ -962,7 +963,7 @@ bool UVRRootComponent::MoveComponentImpl(const FVector& Delta, const FQuat& NewR //CSV_SCOPED_TIMING_STAT(PrimitiveComponent, MoveComponentTime); // static things can move before they are registered (e.g. immediately after streaming), but not after. - if (!IsValid(this) || (this->Mobility == EComponentMobility::Static && IsRegistered()))//|| CheckStaticMobilityAndWarn(PrimitiveComponentStatics::MobilityWarnText)) + if (!IsValidChecked(this) || (this->Mobility == EComponentMobility::Static && IsRegistered()))//|| CheckStaticMobilityAndWarn(PrimitiveComponentStatics::MobilityWarnText)) { if (OutHit) { @@ -1233,7 +1234,7 @@ bool UVRRootComponent::MoveComponentImpl(const FVector& Delta, const FQuat& NewR // Handle blocking hit notifications. Avoid if pending kill (which could happen after overlaps). const bool bAllowHitDispatch = !BlockingHit.bStartPenetrating || !(MoveFlags & MOVECOMP_DisableBlockingOverlapDispatch); - if (BlockingHit.bBlockingHit && bAllowHitDispatch && IsValid(this)) + if (BlockingHit.bBlockingHit && bAllowHitDispatch && IsValidChecked(this)) { check(bFilledHitResult); if (IsDeferringMovementUpdates()) @@ -1329,7 +1330,7 @@ bool UVRRootComponent::UpdateOverlapsImpl(const TOverlapArrayView* NewPendingOve TInlineOverlapPointerArray NewOverlappingComponentPtrs; // If pending kill, we should not generate any new overlaps. Also not if overlaps were just disabled during BeginComponentOverlap. - if (IsValid(this) && GetGenerateOverlapEvents()) + if (IsValidChecked(this) && GetGenerateOverlapEvents()) { // 4.17 converted to auto cvar static const auto CVarAllowCachedOverlaps = IConsoleManager::Get().FindConsoleVariable(TEXT("p.AllowCachedOverlaps")); @@ -1553,7 +1554,7 @@ bool UVRRootComponent::IsLocallyControlled() const // Simulated proxies should already have the new height from the server if (!owningVRChar->bRetainRoomscale && (owningVRChar->GetNetMode() < ENetMode::NM_Client || IsLocallyControlled())) { - MoveComponent(this->GetComponentQuat().GetUpVector() * (Offset * this->GetComponentScale().Z), GetComponentQuat(), true, nullptr, EMoveComponentFlags::MOVECOMP_NoFlags, ETeleportType::TeleportPhysics); + MoveComponent(this->GetComponentQuat().GetUpVector() * (Offset * this->GetComponentScale().Z), GetComponentQuat(), false, nullptr, EMoveComponentFlags::MOVECOMP_NoFlags, ETeleportType::TeleportPhysics); } /*else { @@ -1581,7 +1582,7 @@ bool UVRRootComponent::IsLocallyControlled() const void UVRRootComponent::UpdatePhysicsVolume(bool bTriggerNotifiers) { - if (GetShouldUpdatePhysicsVolume() && IsValid(this)) + if (GetShouldUpdatePhysicsVolume() && IsValidChecked(this)) { // SCOPE_CYCLE_COUNTER(STAT_UpdatePhysicsVolume); if (UWorld * MyWorld = GetWorld()) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp index 2afa1d3..cd82855 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp @@ -11,6 +11,8 @@ #include "VRRootComponent.h" #include "TextureResource.h" #include "Engine/Texture.h" +#include "Engine/Texture2D.h" +#include "SceneView.h" #include "Engine/GameInstance.h" #include "SceneManagement.h" #include "Materials/Material.h" @@ -27,6 +29,8 @@ #include "Engine/Engine.h" #include "Engine/GameViewportClient.h" #include "Engine/TextureRenderTarget2D.h" +#include "ImageUtils.h" +#include "ImageCoreUtils.h" //#include "Widgets/SWindow.h" #include "Framework/Application/SlateApplication.h" #include "Kismet/KismetSystemLibrary.h" @@ -415,6 +419,8 @@ UVRStereoWidgetComponent::~UVRStereoWidgetComponent() void UVRStereoWidgetComponent::EndPlay(const EEndPlayReason::Type EndPlayReason) { + Super::EndPlay(EndPlayReason); + if (EndPlayReason == EEndPlayReason::EndPlayInEditor || EndPlayReason == EEndPlayReason::Quit) { //FStereoLayerAdditionalFlagsManager::Destroy(); @@ -431,6 +437,12 @@ void UVRStereoWidgetComponent::BeginDestroy() LayerId = IStereoLayers::FLayerDesc::INVALID_LAYER_ID; } + if (IsValid(TextureRef)) + { + TextureRef->RemoveFromRoot(); + TextureRef = nullptr; + } + Super::BeginDestroy(); } @@ -601,7 +613,14 @@ void UVRStereoWidgetComponent::TickComponent(float DeltaTime, enum ELevelTick Ti if (AVRCharacter* VRChar = Cast(mpawn)) { - HMDLoc += UVRExpansionFunctionLibrary::GetHMDPureYaw_I(HMDRot.Rotator()).RotateVector(FVector(VRChar->VRRootReference->VRCapsuleOffset.X, VRChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); + if (VRChar->VRMovementReference && VRChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) + { + + } + else + { + HMDLoc += UVRExpansionFunctionLibrary::GetHMDPureYaw_I(HMDRot.Rotator()).RotateVector(FVector(VRChar->VRRootReference->VRCapsuleOffset.X, VRChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); + } } DeltaTrans = FTransform(FQuat::Identity, HMDLoc, FVector(1.0f)); @@ -711,8 +730,12 @@ void UVRStereoWidgetComponent::TickComponent(float DeltaTime, enum ELevelTick Ti if (RenderTarget) { - LayerDsec.Texture = RenderTarget->GetResource()->TextureRHI; + // TODO 5.7 need to figure out how to replace this in some way that isn't so fing slow + //PRAGMA_DISABLE_DEPRECATION_WARNINGS + //LayerDsec.Texture = RenderTarget->GetResource()->TextureRHI; + LayerDsec.TextureObj = RenderTarget; LayerDsec.Flags |= (RenderTarget->GetMaterialType() == MCT_TextureExternal) ? IStereoLayers::LAYER_FLAG_TEX_EXTERNAL : 0; + //PRAGMA_ENABLE_DEPRECATION_WARNINGS } // Forget the left texture implementation //if (LeftTexture) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h index 10acf5f..7cd101f 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h @@ -35,7 +35,8 @@ #pragma region FPhysicsReplicationAsync -class FPhysicsReplicationAsyncVR : public Chaos::TSimCallbackObject< +class FPhysicsReplicationAsyncVR : public IPhysicsReplicationAsync, + public Chaos::TSimCallbackObject< FPhysicsReplicationAsyncInput, Chaos::FSimCallbackNoOutput, Chaos::ESimCallbackOptions::Presimulate | Chaos::ESimCallbackOptions::PhysicsObjectUnregister> @@ -45,7 +46,9 @@ class FPhysicsReplicationAsyncVR : public Chaos::TSimCallbackObject< virtual void OnPreSimulate_Internal() override; virtual void OnPhysicsObjectUnregistered_Internal(Chaos::FConstPhysicsObjectHandle PhysicsObject) override; - virtual void ApplyTargetStatesAsync(const float DeltaSeconds, const FPhysicsRepErrorCorrectionData& ErrorCorrection, const TArray& TargetStates); + virtual void ApplyTargetStatesAsync(const float DeltaSeconds); + UE_DEPRECATED(5.6, "Deprecated, call the function with just @param DeltaSeconds instead.") + virtual void ApplyTargetStatesAsync(const float DeltaSeconds, const FPhysicsRepErrorCorrectionData& ErrorCorrection, const TArray& TargetStates) { ApplyTargetStatesAsync(DeltaSeconds); }; // Replication functions virtual void DefaultReplication_DEPRECATED(Chaos::FRigidBodyHandle_Internal* Handle, const FPhysicsRepAsyncInputData& State, const float DeltaSeconds, const FPhysicsRepErrorCorrectionData& ErrorCorrection); @@ -54,7 +57,7 @@ class FPhysicsReplicationAsyncVR : public Chaos::TSimCallbackObject< virtual bool ResimulationReplication(Chaos::FPBDRigidParticleHandle* Handle, FReplicatedPhysicsTargetAsync& Target, const float DeltaSeconds); public: - virtual void RegisterSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject, FNetworkPhysicsSettingsAsync InSettings); + virtual void RegisterSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject, FNetworkPhysicsSettingsAsync InSettings) override; private: float LatencyOneWay; @@ -63,6 +66,8 @@ private: FNetworkPhysicsSettingsAsync SettingsDefault; TMap ObjectToTarget; TMap ObjectToSettings; + TArray ResimIslands; + TArray ResimIslandsParticles; TArray ParticlesInResimIslands; TArray ReplicatedParticleIDs; @@ -74,7 +79,15 @@ private: void CacheResimInteractions(); // Sets SettingsCurrent to either the objects custom settings or to the default settings void FetchObjectSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject); + bool UsePhysicsReplicationLOD(); + void CheckTargetResimValidity(FReplicatedPhysicsTargetAsync& Target); + void ApplyPhysicsReplicationLOD(Chaos::FConstPhysicsObjectHandle PhysicsObjectHandle, FReplicatedPhysicsTargetAsync& Target, const uint32 LODFlags); + void DebugDrawReplicationMode(const FPhysicsRepAsyncInputData& Input); + + /** Static function to extrapolate a target for N ticks using X DeltaSeconds */ static void ExtrapolateTarget(FReplicatedPhysicsTargetAsync& Target, const int32 ExtrapolateFrames, const float DeltaSeconds); + /** Static function to extrapolate a target for N Seconds */ + static void ExtrapolateTarget(FReplicatedPhysicsTargetAsync& Target, const float ExtrapolationTime); public: void Setup(FRigidBodyErrorCorrection ErrorCorrection) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h index 61f52fd..6ddbeba 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h @@ -61,5 +61,5 @@ public: virtual void PostInitProperties() override; virtual bool InputKey(const FInputKeyEventArgs& EventArgs) override; - virtual bool InputAxis(FViewport* tViewport, FInputDeviceId InputDevice, FKey Key, float Delta, float DeltaTime, int32 NumSamples = 1, bool bGamepad = false) override; + virtual bool InputAxis(const FInputKeyEventArgs& Args) override; }; \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h index 83afc09..672e6b4 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h @@ -93,11 +93,11 @@ public: SetupPlayerInputComponent(InputComponent); InputComponent->RegisterComponent(); - if (UInputDelegateBinding::SupportsInputDelegate(GetClass())) - { + //if (UInputDelegateBinding::SupportsInputDelegate(GetClass())) + //{ InputComponent->bBlockInput = bBlockInput; UInputDelegateBinding::BindInputDelegates(GetClass(), InputComponent); - } + //} } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h index a0ed62a..10b61d4 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h @@ -108,11 +108,11 @@ public: SetupPlayerInputComponent(InputComponent); InputComponent->RegisterComponent(); - if (UInputDelegateBinding::SupportsInputDelegate(GetClass())) - { + //if (UInputDelegateBinding::SupportsInputDelegate(GetClass())) + //{ InputComponent->bBlockInput = bBlockInput; UInputDelegateBinding::BindInputDelegates(GetClass(), InputComponent); - } + //} } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h index 9fddf36..39e3e2f 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h @@ -181,6 +181,9 @@ public: UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "StereoLayer", Meta = (GetOptions = "EditorFlagCollector.GetFlagNames")) TArray AdditionalFlags; + UPROPERTY() + TObjectPtr TextureRef = nullptr; + protected: /** Texture displayed on the stereo layer (is stereocopic textures are supported on the platfrom and more than one texture is provided, this will be the right eye) **/ //UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "StereoLayer") diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs index f065a80..56a0175 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs @@ -11,6 +11,8 @@ public class VRExpansionPlugin : ModuleRules public VRExpansionPlugin(ReadOnlyTargetRules Target) : base(Target) { + DefaultBuildSettings = BuildSettingsVersion.Latest; + IncludeOrderVersion = EngineIncludeOrderVersion.Latest; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; //bEnforceIWYU = true; @@ -83,6 +85,7 @@ public class VRExpansionPlugin : ModuleRules // "CoreUObject", //"Engine", "InputCore", + "ImageCore", // For new stereo layer stuff //"FLEX", remove comment if building in the NVIDIA flex branch - NOTE when put in place FLEX only listed win32 and win64 at compatible platforms //"HeadMountedDisplay", "RHI", diff --git a/VIRTUOS_ExpansionPluginTests/README.md b/VIRTUOS_ExpansionPluginTests/README.md deleted file mode 100644 index 02dcdcf..0000000 --- a/VIRTUOS_ExpansionPluginTests/README.md +++ /dev/null @@ -1,10 +0,0 @@ -### How do I get set up? ### - -Current compatible versions for template: Latest Engine Version (Template is not kept to as many compatible versions as the plugin itself). - -* Right click on VRExpPluginExample.uproject and switch to your preferred (compatible) engine version. -* If project files did not automatically generate after switching, right click again and select "Generate Visual Studio Files" -* Open Solution and build - Or download the pre-built binary package from the forum thread for the engine version and place into the plugins directory. -* Run - -You need to have visual studio installed and follow the UE4 setup guide for it: https://docs.unrealengine.com/latest/INT/Programming/Development/VisualStudioSetup/ \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject index 5790317..68c8a41 100644 --- a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject +++ b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.5", + "EngineAssociation": "5.6", "Category": "", "Description": "", "Modules": [ From 47088bf2d4e2023520e5fc44be2b60a3cafc5b10 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 16 Sep 2025 15:38:44 +0200 Subject: [PATCH 29/56] Misced Fixes in some Models, reworked CaptchaDoor, Added Portal --- .gitattributes | 2 +- VIRTUOS_ExpansionPluginTests/.gitignore | 0 VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini | 2 +- .../Core/3D_lamp_3-Ean/StaticMeshes/3D_lamp_3-Ean.uasset | 3 +++ .../Content/Core/BP_DynamicLineSpawn.uasset | 3 +++ .../Content/Core/BP_HangingLamp.uasset | 3 +++ .../Content/Core/Functions/CommonFunctions.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset | 3 +++ .../Content/Development/BP_Portal.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Outside_Default.umap | 4 ++-- .../Content/Maps/Map_Room_Kitchen.umap | 4 ++-- .../Content/Maps/Map_Stream_MachineRoom.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset | 4 ++-- .../Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../Content/World/Characters/Clarice/BP_Clarice.uasset | 4 ++-- .../World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset | 4 ++-- .../Content/World/Characters/Clarice/ClosedOverlap.uasset | 3 +++ .../Content/World/Characters/CustomAIController.uasset | 4 ++-- .../World/Characters/Gilbert/BP_GilbertThirdPerson.uasset | 4 ++-- .../World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset | 4 ++-- .../World/Interactibles/CardboardBoxes/BP_Cardboard.uasset | 3 +++ .../CardboardBoxes/CardboardBox_01/CardboardBox_01.uasset | 3 +++ .../CardboardBoxes/CardboardBox_01/Materials/lambert1.uasset | 3 +++ .../CardboardBox_01/Textures/lambert1_baseColor.uasset | 3 +++ .../Textures/lambert1_metallicRoughness.uasset | 3 +++ .../CardboardBox_01/Textures/lambert1_normal.uasset | 3 +++ .../CardboardBox_01/Var1/CardboardBox_01_Var1.uasset | 3 +++ .../Deco/PictureFrame/BP_PictureFrameClarice.uasset | 4 ++-- .../Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset | 4 ++-- .../Content/World/Interactibles/Electrical/Doors/Cube.uasset | 3 --- .../World/Interactibles/Electrical/Doors/Cube_001.uasset | 3 --- .../World/Interactibles/Electrical/Doors/Cube_002.uasset | 3 --- .../World/Interactibles/Electrical/Doors/M_CaptchaDoor.uasset | 3 +++ .../Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset | 4 ++-- .../Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset | 4 ++-- .../Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset | 4 ++-- .../World/Interactibles/Electrical/Doors/NewMaterial.uasset | 4 ++-- .../World/Interactibles/Electrical/Doors/SM_Displays.uasset | 3 +++ .../World/Interactibles/Electrical/Doors/SM_Door.uasset | 3 +++ .../World/Interactibles/Electrical/Doors/SM_Frame.uasset | 3 +++ .../Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset | 4 ++-- .../Furniture/Doors/SlidingDoorA/BP_SlidingDoor.uasset | 4 ++-- .../Furniture/Doors/SlidingDoorA/MI_SlidingDoor.uasset | 3 --- .../Furniture/Doors/SlidingDoorA/M_SlidingDoor.uasset | 3 +++ .../SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Diffuse.uasset | 4 ++-- .../Obj_SlidingDoor_Bake1_PBR_MetallicRoughness.uasset | 3 --- .../SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Normal.uasset | 4 ++-- .../SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_PackedTex.uasset | 3 +++ .../Furniture/Doors/SlidingDoorA/White_001.uasset | 3 --- .../Furniture/Doors/SlidingDoorA/sliding_door.uasset | 4 ++-- .../World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset | 4 ++-- .../Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset | 4 ++-- .../Interactibles/Furniture/Kitchen/Material2_287.uasset | 4 ++-- .../Furniture/Tables/Table/BP_RoundedTable.uasset | 4 ++-- .../Content/World/Materials/Master/M_MaterialAtlas.uasset | 4 ++-- .../Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset | 3 +++ .../World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset | 3 +++ .../Lights/ShipLamp/Screws_high_003_Bake1_PBR_Diffuse.uasset | 3 +++ .../Screws_high_003_Bake1_PBR_MetallicRoughnessAlpha.uasset | 3 +++ .../Lights/ShipLamp/Screws_high_003_Bake1_PBR_Normal.uasset | 3 +++ .../Content/World/Static/Lights/ShipLamp/ShipLamp.uasset | 3 +++ .../Content/World/Static/Splines/Pipes/90Degree-Big.uasset | 4 ++-- .../Content/World/Static/Splines/Pipes/90Degree-Small.uasset | 4 ++-- .../Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset | 4 ++-- .../Content/World/Static/Splines/Pipes/M_Pipe.uasset | 4 ++-- .../Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset | 4 ++-- .../Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset | 4 ++-- .../World/Static/Stairs/Rugs/RedRug/Curve_BW_carpet.uasset | 3 --- .../Content/World/Static/Stairs/Rugs/RedRug/MI_Carpet.uasset | 3 --- .../Static/Stairs/Rugs/RedRug/NewCurveLinearColorAtlas.uasset | 3 --- .../Content/World/Static/Stairs/Rugs/RedRug/NormalMap.uasset | 3 --- .../Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset | 4 ++-- .../Rugs/RedRug/Tekeh_Bukhara_Carpet_-_223_x_135_cm.uasset | 3 --- .../Content/World/Static/Stairs/Rugs/RedRug/carpet.uasset | 4 ++-- .../Rugs/RedRug/carpet_baseColor_Bake1_PBR_Diffuse.uasset | 3 +++ .../Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Mat.uasset | 3 +++ .../Rugs/RedRug/carpet_baseColor_Bake1_PBR_Normal.uasset | 3 +++ .../Rugs/RedRug/carpet_baseColor_Bake1_PBR_Roughness.uasset | 3 +++ .../World/Static/Stairs/Rugs/Rug_1/Material_001.uasset | 4 ++-- .../Content/World/Static/Stairs/Rugs/Rug_1/Rugs.uasset | 4 ++-- .../Content/World/Static/Walls/SM_Hideout.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject | 2 ++ 87 files changed, 177 insertions(+), 118 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/.gitignore create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/3D_lamp_3-Ean/StaticMeshes/3D_lamp_3-Ean.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/BP_DynamicLineSpawn.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/BP_HangingLamp.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/BP_Portal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClosedOverlap.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/CardboardBox_01.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Materials/lambert1.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_baseColor.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_metallicRoughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Var1/CardboardBox_01_Var1.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_001.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_002.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/M_CaptchaDoor.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Displays.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Door.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Frame.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/MI_SlidingDoor.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/M_SlidingDoor.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_MetallicRoughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_PackedTex.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/White_001.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_MetallicRoughnessAlpha.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/ShipLamp.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Curve_BW_carpet.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/MI_Carpet.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NewCurveLinearColorAtlas.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NormalMap.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet_-_223_x_135_cm.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Mat.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Roughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/SM_Hideout.uasset diff --git a/.gitattributes b/.gitattributes index c83ee5a..aa113ff 100644 --- a/.gitattributes +++ b/.gitattributes @@ -70,7 +70,7 @@ text=auto # Always recommended to use, supports all platforms: # For the best compatibility and performance, it is recommended to use H.264 encoded MP4 (.mp4) container files. *.[mM][pP]4 filter=lfs diff=lfs merge=lfs -text -Can also be used, only some platforms are supported: +# Can also be used, only some platforms are supported: *.3[gG]2 filter=lfs diff=lfs merge=lfs -text *.3[gG][pP] filter=lfs diff=lfs merge=lfs -text *.3[gG][pP]2 filter=lfs diff=lfs merge=lfs -text diff --git a/VIRTUOS_ExpansionPluginTests/.gitignore b/VIRTUOS_ExpansionPluginTests/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini index 90b4f5e..f2a337e 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini @@ -320,7 +320,7 @@ bEnableEnhancedDeterminism=False AnimPhysicsMinDeltaTime=0.000000 bSimulateAnimPhysicsAfterReset=False MaxPhysicsDeltaTime=0.033333 -bSubstepping=True +bSubstepping=False bSubsteppingAsync=False MaxSubstepDeltaTime=0.016667 MaxSubsteps=6 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/3D_lamp_3-Ean/StaticMeshes/3D_lamp_3-Ean.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/3D_lamp_3-Ean/StaticMeshes/3D_lamp_3-Ean.uasset new file mode 100644 index 0000000..c026a83 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/3D_lamp_3-Ean/StaticMeshes/3D_lamp_3-Ean.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdb6dee40976f4dec281bf480fca8bc8a3cbd7b63fe5511ebe18d2e38278a240 +size 337190 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_DynamicLineSpawn.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_DynamicLineSpawn.uasset new file mode 100644 index 0000000..69700cb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_DynamicLineSpawn.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1094170063049e7865eec772194cecb01fa2af73caef434739720096c980419 +size 136054 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_HangingLamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_HangingLamp.uasset new file mode 100644 index 0000000..b6f92df --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_HangingLamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eb5cacd200607ac6218d70bbb28296b5073018c63ea5dd5e56fa51949f57366 +size 32062 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset index 8594e7e..cdd03ab 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08c1537a278b179c21ec61fdb0371a4bbf3d2a92684d5b53bee038d378b8b9d2 -size 178316 +oid sha256:dbe671da395ce2c6ff6bedd55168b47a2f8d2c33a0d78ca60cbd3ddd6fe0827e +size 180270 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset new file mode 100644 index 0000000..170eed5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58887afd4d392d243173298f59ecbc6b95f1b34836490287a460efef80b0f177 +size 10715 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/BP_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/BP_Portal.uasset new file mode 100644 index 0000000..7fbdf40 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/BP_Portal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d332fdaf439982b6a1dce5b9d5e5d2953322c3a528be717e6dd37ea2703df1f +size 25050 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 0afa04f..e588d30 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:384478091075a5b329330487013e8359df47d1c9e7878040ef3693285b87466a -size 503313 +oid sha256:e134a72f7431b305f11236a885b883711d0de7665b71afd52ca3b65b858b7a52 +size 553495 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index f7100f4..1e5bb82 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4598073efbde5f5e4273e1d0d33cbbd33ce80a28c488504243bb394cc47d0afd -size 31928 +oid sha256:7f73771a77db67bdc9dbb75e6a65a9173b19703405c3a3762f6988c4978a912a +size 25547 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index ca88dd2..d5730a4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f34273db9016b454f4d0253f56624cff6f6569a6c542df1773c757e6a04c135 -size 146001 +oid sha256:5193637bdfd2810ae1e736019f77da0f5219207aba2c41eda7f10a3465ffe231 +size 157733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap index 730a910..ad7aa1d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:945fabad519394f1b1b99449dec3be422cecb67fc8ccbc6d359b8cbfbd10c2fc +oid sha256:e35235979c5d1bb4f1c045919c0133cdfed2db8a397617366468521e2b154d64 size 27574 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index 700d642..689c79e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07dc6e4952fe736076cd329bec22a2eec02fb350c73a725a270ca82f8060325e -size 59640 +oid sha256:89f6a0e37aee2b41011fcacc4c4cdd9bca076af5464bab2cf9e58363bf658b6d +size 67378 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 6e8a05c..0cea479 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f8bcd7b69a776fe9c55fe59cba0c440ba30a9b332e5a393f9d6d8e1beedb290 -size 1727775 +oid sha256:ee3fd351b73a724bf996062ba75996fe81926a83c30f3868e6c02d07a0b5a9df +size 1761712 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 96ef3ca..06f1b14 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba4676536b31d9bbfafc1d1f458c1b90ad0e9c7ecbbf672bdd94d156ca4c9516 -size 157883 +oid sha256:b9563585f740a4de705c3ec823e77823bcfc25a04e2b8853faee1bf413458360 +size 157391 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset index 4a7b6d3..e852f64 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:669210a4d77c962cfe3df78cd2c40a1c4dce5aceeee27a9959b1fca2e5c478c4 -size 324065 +oid sha256:6b760a1a46e2e07dd47498a6b5abc7531ee5c0151d7b3f4e33a97cf4a03553f5 +size 330063 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index c52f5fc..82e2ef7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fee489752e85dd854d3b28b041173e3309d34c4aeefe74c0f24f666b8718ced6 -size 5656675 +oid sha256:d495b8d5065475f4a7ecd3e839b7e198633ca1c45062114ab581f4b4110fecd9 +size 5656535 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 1c23b0a..98cf592 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff673f4bed03db202bb6f88566128d5e2db61d9a9b56fe7ccb50dd06e7b9fc84 -size 485856 +oid sha256:8eb01791595c75fb98afeb28fe605606faa99c11d81163681191b0a5abdcdb17 +size 508689 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index b972e2d..9b2c6d7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6128a17e9f3692bd66a879da38e764ed6fc18522f3cc0e56ae8240984152248b -size 630413 +oid sha256:15f998a9f83b8071e0646de7e0acb6c691046fa4ee7e3090444951cd6bc80072 +size 713307 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset index 49a06e8..4f74be3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84059487710bca0564b0bff4d106a15d9dc141f8d6445f39b2a7def693b611ca -size 42365 +oid sha256:ec2a333ec10069424e7b6acf1310c433d8dd1f2a2a73fc446b8e4fa32198e958 +size 44336 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClosedOverlap.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClosedOverlap.uasset new file mode 100644 index 0000000..8e11fd6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClosedOverlap.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a6d87d5678cef5d35cd36a8fff924fdb9964a6ef3a4978682027a3f1da83978 +size 10704 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset index ac86bfd..bc93cab 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2404080c5421a4c7ff7667e17981287cf432e4d4f468e45f0e1976d57ee6af64 -size 230972 +oid sha256:80c8e6539c5bd129308e3ce23174159c84d3739f15d6ab21d9c1c5c2d22c0694 +size 240592 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset index 5ddf4dd..1cff97e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f38ef41525009e3c6fbba01a7759998ca8918c65239744f7d9d43369f36bbd84 -size 205854 +oid sha256:2d27dd371cae2762cc770f3e4bbe2c6fd74dd4d947ab5858b174bd8116a56190 +size 201883 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset index 813dd29..d64174d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf736878cb52d4902aba1bd7d10e0ab9c8bbc79b1fbbd406a79934aeaa08bf0b -size 624698 +oid sha256:96ce6290bad2b7c8d3bb0e290f85f519ed4ff5034f44b6f02bfea5160e3e3127 +size 629003 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset new file mode 100644 index 0000000..2fbab29 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b351bfc43ce67d5568b9b43881593e18fd677493c2ab02f2d2c3f11b4a432ae +size 62645 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/CardboardBox_01.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/CardboardBox_01.uasset new file mode 100644 index 0000000..f1d51e6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/CardboardBox_01.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8e6f49fe32b33551c12bad3f9a3cd69513e5f3addd10eb3932d747d288a666d +size 82165 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Materials/lambert1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Materials/lambert1.uasset new file mode 100644 index 0000000..3c71059 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Materials/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b4d16d170b75937d5eb5dbc1e2c51aabe5ee3c380e1939f80add9f5a47c297f +size 65548 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_baseColor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_baseColor.uasset new file mode 100644 index 0000000..8ddf371 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_baseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d99bedada861e7535b71a2e08dd34cc22a96c19997a4bb3390a6c325b1fc676 +size 3190033 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_metallicRoughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_metallicRoughness.uasset new file mode 100644 index 0000000..eee0625 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_metallicRoughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69b1a5f4a877a1ec5c76a44d5f8d7fa4ece62d5900dd08875de5148e9e9df6c8 +size 2485800 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_normal.uasset new file mode 100644 index 0000000..c105300 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a44e4eb2fcdc78271cda9e755e98c4b76c3d0ea5d9e71477267f777797f8e62 +size 3364415 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Var1/CardboardBox_01_Var1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Var1/CardboardBox_01_Var1.uasset new file mode 100644 index 0000000..775cd8f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Var1/CardboardBox_01_Var1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c54857624e8c6fe86867e9b63946b662f83ac5a116b86fbaad9179239fcbd6d1 +size 82540 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Deco/PictureFrame/BP_PictureFrameClarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Deco/PictureFrame/BP_PictureFrameClarice.uasset index f604563..9973710 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Deco/PictureFrame/BP_PictureFrameClarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Deco/PictureFrame/BP_PictureFrameClarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:144bb53a2b23bdc756971018d2466787d61c81cb3d7f8858eb8ad1d6fb7f211b -size 47060 +oid sha256:cbcf250e5f047d05b158291998a0336f80ffa5fe334a7b7aef2edd540fa30381 +size 103271 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset index 7a11061..971f5b5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98c1a9242d0ade1ccb91268ea0533c4afced66846773a5b004099636edf951bd -size 107344 +oid sha256:d399fccd91c88f0d506ae2ec1e28f38b7d745ba095b86772de3bfe9fc7511e06 +size 107245 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube.uasset deleted file mode 100644 index 90d0c4d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04ea9a2549ae4c594a4ef4534b0651874db69a5a24fe7bfc7eb693d6f7918091 -size 74593 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_001.uasset deleted file mode 100644 index 62b9300..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1053f1659705b9a98c42fd5fd2e69b180b51cadee378c555f8cd253f4f1ebf4 -size 58990 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_002.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_002.uasset deleted file mode 100644 index e60d3a3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/Cube_002.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10ad76a08c8bd989747bcd84ebb6423aed37bcae4014812c54147186fa4b9d2e -size 79443 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/M_CaptchaDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/M_CaptchaDoor.uasset new file mode 100644 index 0000000..95cab08 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/M_CaptchaDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e287bedfaca934fa3984862c03dbc347bb6a1511f65a701c7a097d1aecd3986 +size 16216 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset index 390eb53..d5ba84b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea762696a57538ec2ecf77f9f735bea10eda1016b131a120010a17a01c57657a -size 18763797 +oid sha256:d9a843c69ddbcdfd3751c2c6eba86eaa7c3b81857b40bfc2f2964a33b5c1a0ce +size 19640873 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset index 1d5bebf..cbe5a4b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a797009fec205efdfea0c003dff1cbad7623bdcfee471e48daa30831288745ae -size 83266079 +oid sha256:a566ab3ee58e407ce98c7def0b32eb83ada47aad3b5fd40257d51c6a1071004f +size 64747933 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset index d34a630..69ffb70 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f9d0ccaac0f1e6fcb97ae258d50ce642d16b704e0b8b2ffc0afd0a3db087afa -size 17848784 +oid sha256:9b46d18072e86d8bec1e3ffe4298d390b886fa729afd031c21b1a64272b82677 +size 16090211 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/NewMaterial.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/NewMaterial.uasset index f82fd7c..4f7096e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/NewMaterial.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/NewMaterial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dda27355b295a03cf961a23e247ec7b0c72b23654ed889fdfc63a820069c5c3 -size 18859 +oid sha256:fc85749e5d87c2e87061a1c1dc9e1d6e7b1fad2d00b0f303f3c2c6b0f686bd91 +size 1417 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Displays.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Displays.uasset new file mode 100644 index 0000000..efeeb0a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Displays.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a09a01c5e74a1c2521dac9d68af2519b1f93cd7967c15a82d9a03f0d45069436 +size 87958 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Door.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Door.uasset new file mode 100644 index 0000000..cb58846 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Door.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e74b50a8f07cb48d5b4e50152804a063145fc119b72eff005f5aaa9f3de379f +size 72535 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Frame.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Frame.uasset new file mode 100644 index 0000000..daa9b1d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Frame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d23dc77ba98e6e876356c13af7ea6d6619ea0b9142ca3a12013d4ce423a30bc0 +size 80346 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset index cf94667..f43c70b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:107879bebf9f2024316d2bdd00cc979558d935e255c039f8e20fa1bfef0a949e -size 113928 +oid sha256:becbfd76dbcb7747980ff036c4a95c8114d78a7af25ac806a0ac316c2b31a098 +size 114611 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/BP_SlidingDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/BP_SlidingDoor.uasset index 1ffe1e6..11cd790 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/BP_SlidingDoor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/BP_SlidingDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6616cb5de102068f6c6722885fb0ac6e687ef1c4dbf440596ca7d56b764891d -size 39357 +oid sha256:5c41d3513205be2d052c7a1b9e3455ac2a48cce240af3323fc42031594510f4f +size 39205 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/MI_SlidingDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/MI_SlidingDoor.uasset deleted file mode 100644 index 5dcdead..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/MI_SlidingDoor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83f6daf1bee9a0014e6c09f2f67282d5f6587cd21e522891d104b078e43f7371 -size 15424 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/M_SlidingDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/M_SlidingDoor.uasset new file mode 100644 index 0000000..5c26596 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/M_SlidingDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2554aa57ae222edb9267ad1a18f81325c4dc7d7814c7b37b023256b9abe7985 +size 16862 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Diffuse.uasset index e4e271f..03b414d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Diffuse.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Diffuse.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ace3f897d570b47292e67df0f27a86c32a40e9d805a835f77d321c8d162af9a -size 25253822 +oid sha256:b944cf74035fb69298bfc29bd44cf91af439ef7b59da189e92cc0a8179f51a5c +size 26718138 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_MetallicRoughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_MetallicRoughness.uasset deleted file mode 100644 index 8aaefdf..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_MetallicRoughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b756cdda602969353671f4b72d441583b87e867ecdb2aefe418b3519895dfd0 -size 12201623 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Normal.uasset index d9fe162..3eab304 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Normal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Normal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5c243668c1c1b432d7a33af11f8ff650ffb05ced4b5c4c2a0d5a63f9ddc8d62 -size 82134236 +oid sha256:7b3dc68088acef7e67ac5a74e4d8b96334ccf1ee0c1da8c5bed09dfd44f4a3ba +size 88975053 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_PackedTex.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_PackedTex.uasset new file mode 100644 index 0000000..14c7000 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_PackedTex.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f3c99d318fe22186943191482ad9cae326b6777d408e6eecb474b71c2633b85 +size 14557895 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/White_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/White_001.uasset deleted file mode 100644 index 19fe99e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/White_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3522dc4d0a037518e8ab01d1b3a06ef6931af058eb4fe38ba303567e0c57b924 -size 53412 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/sliding_door.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/sliding_door.uasset index 71561de..8da5608 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/sliding_door.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/sliding_door.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dd74cfdb5336f49e5798289692ad9299588b92827f2f76e16b97cd6a30f8520 -size 74013 +oid sha256:f345aad95f6c224ca7be21f44ee59338b03dff5a482447d807e124948baff7a0 +size 88357 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset index 067eb1d..9a2e632 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:358a278ad3d9245e25997dfb27b32e83d508ff72e4a65a14ae62c163e5792d5f -size 229854 +oid sha256:f4304c84e135537a25367d25c5e4b250198cb5278cabc8a0ad3ce9d2b4a62854 +size 228256 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset index e7dc4ce..de58a73 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e709128c36a5f57b3d4290a9a5c58675acf24a6896036f732b01661df63ee0e5 -size 25213 +oid sha256:e7eb29496224b2dc2bcf237191aa4ae0479f6fa01097934ce87fd14b6321ecd9 +size 25816 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/Material2_287.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/Material2_287.uasset index f6ae0ee..8ecaffb 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/Material2_287.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/Material2_287.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eeef1d3a94029ed4e161982a4c234151e3a34efa3372f66194a95fdd74b02039 -size 343268 +oid sha256:4d2b9560f35bc67215d613bffc235b171a737e6430704a00f9a57230163d7b91 +size 341748 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Tables/Table/BP_RoundedTable.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Tables/Table/BP_RoundedTable.uasset index e9d9b42..d3ffeda 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Tables/Table/BP_RoundedTable.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Tables/Table/BP_RoundedTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82061b7fecc3cf71c7211f374818cbf54a36a131508c593e6487853d5522b71a -size 33999 +oid sha256:fee5ef683ec953f23a8a86837c9f63b094f237ae39e749ab6bf55b96f097b8e0 +size 36616 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset index 42c537a..6032162 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2487c83ee7e82d9017643588e11b06f2713ae640be7cacb05c412d7a78d335e -size 204142 +oid sha256:91a9e6be15e5f2d7987470dbd0e57dc9dd4fb7279cc5a01764479715321fbf15 +size 208266 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset new file mode 100644 index 0000000..fe881ab --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6a59a3b691a7d5b2faa36df632d96cb891e4e63690fe11591890fc79b224eb6 +size 25154 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset new file mode 100644 index 0000000..dfa6ceb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:580d8c84efb62496f5bd3ea58b43c8da76b016e0d7968515e79634ce8d89cc09 +size 15481 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..69a4f5c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f9542d8e3c2477957640f7cdabfe2e52e45f6f9f1cc7e575b834f49b331ec71 +size 2023837 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_MetallicRoughnessAlpha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_MetallicRoughnessAlpha.uasset new file mode 100644 index 0000000..38e04f0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_MetallicRoughnessAlpha.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9a3bf25e3743f4f819190ee6848d6a209004e9a14efb9e4b913d9f99277c4a7 +size 1855977 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Normal.uasset new file mode 100644 index 0000000..f8cc746 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:533d3420fcd0ba4c2dec6433205e3bec6efa08149b1d5dab1ffe959828c5fd76 +size 10241968 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/ShipLamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/ShipLamp.uasset new file mode 100644 index 0000000..d2b71a1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/ShipLamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3494398f935da27b6b7136e8bc8d46202c16f19a60d176f165cfc58b310f7372 +size 261237 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Big.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Big.uasset index 569faea..3aeeb2b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Big.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Big.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a1ef84c0c55d6ca61e302692b36320e2355ba12a1134cf450ba1b226570abea -size 78727 +oid sha256:86f2ceeca3ab49263b603b2ce8c877fefccef60fce8f2f33a281cc11e8876af6 +size 97992 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Small.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Small.uasset index fdacd9f..d7e2316 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Small.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Small.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:264a6a8a08fec9cedec413a0e8882d1761f676711026ee4b313d14bf7afd8f2d -size 79247 +oid sha256:3c5cc0dcccb8c9567af8d72ff388f1dc177a53a7dcf6439a2960df30c2c37db6 +size 98499 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset index 2a7aa44..7896a9e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49f7bf9f0c314f709fdf6828a3dbab2aded4ffd2aab58634ac7da8d9fca20ff0 -size 85563 +oid sha256:60ca43360de9e767dce6a5301306ca616835a23b0b8cdb238c01d88f8c48f696 +size 106878 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset index 8ed4ec6..833e29b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dad754d8f21e4b906117d38c7e061a5308bc17b257fbd9c7425d75b324552c4 -size 83770 +oid sha256:1105a28001bc8fd40ec297dbe8b18354c9e1f2083fa1ff39d3e487cbfd18c1ec +size 85041 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset index 2816180..4b9e85c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45739ff08b2a581cc571b427ae310607797727e95420e0fd331bd569c868033c -size 10406 +oid sha256:83228700a68db0ca3222b3f0e9575f1b8128c5364f98a9ee2214b5cea4497e11 +size 10304 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset index 6cbc73d..f345516 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8417e207e37edc7b65b23b6a980575fcc51bbf73d2dfb2599642269d4e8b2cdf -size 15351 +oid sha256:917270dad13bb2815bac6e61110d01307f2b1dbf89854571fda896550bb5083a +size 10449 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Curve_BW_carpet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Curve_BW_carpet.uasset deleted file mode 100644 index 55a1f01..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Curve_BW_carpet.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:113595638baf97723d2b0dcec06c2aea05d3d8038d706965bd035af50889da05 -size 4885 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/MI_Carpet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/MI_Carpet.uasset deleted file mode 100644 index a197cb0..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/MI_Carpet.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f702c18a5b179f3aee3f1861379632b1f59ed4442a99c062bb87f22698534b8b -size 16524 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NewCurveLinearColorAtlas.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NewCurveLinearColorAtlas.uasset deleted file mode 100644 index 8069314..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NewCurveLinearColorAtlas.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:35c58e232f91365d91a5b2d09ae93772f80c255e75cd64f7450cbf3c751bd12a -size 6467 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NormalMap.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NormalMap.uasset deleted file mode 100644 index f59c62c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NormalMap.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef318a1b599feda1747352565237b61ce2d60a1f8f97beabd05a23cbde3351db -size 50538774 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset index f985ff8..cc297ee 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fb2899ae954161fb513a82cc8cf13567200a12773fad08c54cc16c1b1cf85fc -size 128972 +oid sha256:b6eeb90a6c56c4371328f9785f4f4b8d513a154cb5155d4c1b7fb1fa011aa766 +size 100194 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet_-_223_x_135_cm.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet_-_223_x_135_cm.uasset deleted file mode 100644 index 64df0f8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet_-_223_x_135_cm.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82010606d484018daa4dca414ae036621892c2be44c27c0ff6df8fd535cab7cc -size 3478857 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet.uasset index 03444b1..967e03f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb91b34e960b33827ea7d25232dd75edcfb49e14af96b763ffcd4349502ce1fe -size 73823 +oid sha256:065d31addbe1defb228c9d346f0d00ac6206478d4260d898b4e42e023cb6d1da +size 62165 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..36a9b79 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a862c8f597bc27638f12b9551b446060194f0e6a028fd4819bd8d0e42ef668cf +size 3105425 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Mat.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Mat.uasset new file mode 100644 index 0000000..01a2df8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Mat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9355419592f13705bfdb084bc24b8b4bb07a0579dbd172dc3c36108d5db60358 +size 18769 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Normal.uasset new file mode 100644 index 0000000..33365a2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:619f393709d4d1b05deafdfb54421a9ac7be620c04c223706d675d9c144511a2 +size 5331892 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Roughness.uasset new file mode 100644 index 0000000..90809ee --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7605b423e02832caa119043323c0c88007d51a41b3fc77addb22f3d575d33e02 +size 303782 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Material_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Material_001.uasset index d365cab..53bab7c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Material_001.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Material_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e52d951cea09dd4556fcb3229311d7d6265c1613ca2204dd82fce86fae341c34 -size 58771 +oid sha256:1cf468ec32896a96f03912a256f9ff1082c55d4b94d21b702f3ff37151c8defa +size 58653 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Rugs.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Rugs.uasset index 5ce0168..ca313e9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Rugs.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Rugs.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92f614fb5218ed5604addc90b1813f67dba64a6e5e7171f207a3e52e5b9962e7 -size 122677 +oid sha256:a783e7e463a6e1b8a38500ce3fd8e836cfaf11f4d1ba89501b89af8042edccad +size 123358 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/SM_Hideout.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/SM_Hideout.uasset new file mode 100644 index 0000000..d52a263 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/SM_Hideout.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d21312e24b719d52326966ceb13badcabcc2dfa700fa848ef6ddfc5c6d915694 +size 69575 diff --git a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject index 68c8a41..d6e86c3 100644 --- a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject +++ b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject @@ -17,6 +17,7 @@ "SupportedTargetPlatforms": [ "Win64", "Linux", + "LinuxArm64", "Android" ] }, @@ -61,6 +62,7 @@ "SupportedTargetPlatforms": [ "Win64", "Linux", + "LinuxArm64", "Android" ] }, From b103855ba486945173ebb79c2ec243d6ee4fe770 Mon Sep 17 00:00:00 2001 From: Waldo Date: Wed, 17 Sep 2025 12:52:27 +0200 Subject: [PATCH 30/56] Commit before testing Skeleton Changes on Clarice --- .../Core/3D_lamp_3-Ean/StaticMeshes/3D_lamp_3-Ean.uasset | 3 --- .../Content/Core/BP_GlobalMusicManager.uasset | 4 ++-- .../Content/Core/BP_HangingLamp.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Room_Kitchen.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 2 +- .../Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../World/Characters/Clarice/ClariceMain_Skeleton.uasset | 4 ++-- .../Content/World/Characters/Clarice/TestLookAtTarget.uasset | 3 +++ .../World/Static/Lights/HangingLamp/3D_lamp_3-Ean.uasset | 3 +++ .../World/Static/Lights/HangingLamp/3D_lamp_5-Ean.uasset | 3 +++ .../World/Static/Lights/HangingLamp/BP_HangingLamp.uasset | 3 +++ .../Content/World/Static/Lights/HangingLamp/M_Lamp.uasset | 3 +++ 16 files changed, 32 insertions(+), 20 deletions(-) delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/3D_lamp_3-Ean/StaticMeshes/3D_lamp_3-Ean.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/TestLookAtTarget.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_3-Ean.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_5-Ean.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/BP_HangingLamp.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/M_Lamp.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/3D_lamp_3-Ean/StaticMeshes/3D_lamp_3-Ean.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/3D_lamp_3-Ean/StaticMeshes/3D_lamp_3-Ean.uasset deleted file mode 100644 index c026a83..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/3D_lamp_3-Ean/StaticMeshes/3D_lamp_3-Ean.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdb6dee40976f4dec281bf480fca8bc8a3cbd7b63fe5511ebe18d2e38278a240 -size 337190 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_GlobalMusicManager.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_GlobalMusicManager.uasset index 6e4c273..4f877a1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_GlobalMusicManager.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_GlobalMusicManager.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e908d6676237abe6178c6bf8cb520774f7d6f70df56c5becc41b1ec00a3b2a4e -size 30793 +oid sha256:bddc9a7dbc0928e50e4c2834039c1432696b5e611bed9816aa7a3672ca4cf697 +size 30132 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_HangingLamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_HangingLamp.uasset index b6f92df..6320f83 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_HangingLamp.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_HangingLamp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4eb5cacd200607ac6218d70bbb28296b5073018c63ea5dd5e56fa51949f57366 -size 32062 +oid sha256:721942c0157ef8dabb4dfeed35203328ce303eebd2d97b88a6ff79207fec5006 +size 2356 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset index 170eed5..9ae137a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58887afd4d392d243173298f59ecbc6b95f1b34836490287a460efef80b0f177 -size 10715 +oid sha256:fa568a43725d6ae525316d921096416102321138683fcb8d80d2c4c113e841f5 +size 1275 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index e588d30..e1678d4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e134a72f7431b305f11236a885b883711d0de7665b71afd52ca3b65b858b7a52 -size 553495 +oid sha256:cc421bd437c61831ccb9fcb435562c4b970ef129d2557d51b71b85bcaf002629 +size 556664 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index d5730a4..1acc9fd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5193637bdfd2810ae1e736019f77da0f5219207aba2c41eda7f10a3465ffe231 +oid sha256:3d78b4706b2cb7441cfdad7f5f0974a550ba5767339c51da3dfe1e5deebc7e4e size 157733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index 689c79e..dd0e4b8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89f6a0e37aee2b41011fcacc4c4cdd9bca076af5464bab2cf9e58363bf658b6d +oid sha256:08c17b0118beacc9eeb195b133578672165dcd35dff3eca45b3bb071ea055331 size 67378 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 06f1b14..39d12a8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9563585f740a4de705c3ec823e77823bcfc25a04e2b8853faee1bf413458360 +oid sha256:0c0e81e930bc4abe800d3e8420a9c0f5fdad24cf9cef8bd15a1ae7c5d8090102 size 157391 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index 82e2ef7..a25147b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d495b8d5065475f4a7ecd3e839b7e198633ca1c45062114ab581f4b4110fecd9 -size 5656535 +oid sha256:a61c7d00add04b70c87448a5399fe00c1bc17b43620526dfc6691f2eab5dbc71 +size 5654166 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 98cf592..89d9824 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8eb01791595c75fb98afeb28fe605606faa99c11d81163681191b0a5abdcdb17 -size 508689 +oid sha256:e7e5b42b2bb7a607ff27d7eef133d4e9fc3aeeccd170a127edb32fbe73df6c53 +size 549545 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset index 79e88a0..8438203 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8f18899b3c474fdf12181c3624b4ef0da15382a3a45b3957dad47f4e731fe39 -size 14402 +oid sha256:c21db40aaa93b0a93148e20ce04679a497fdbba054dd3098e583d5dee1dd2bd6 +size 14196 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/TestLookAtTarget.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/TestLookAtTarget.uasset new file mode 100644 index 0000000..535c6f2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/TestLookAtTarget.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65b065a6a8ced7f622047f229d5f5c35d2f9fd41c33b73bf2629a0f136867937 +size 22788 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_3-Ean.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_3-Ean.uasset new file mode 100644 index 0000000..04aba4d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_3-Ean.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9533ac68d8a6abafb00a2a6892720f3fe9c6baf2f83e761e38e1ecfdb437ab5 +size 338590 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_5-Ean.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_5-Ean.uasset new file mode 100644 index 0000000..80befce --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_5-Ean.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf3ee58962a840d79e0e72c3835aec94327717b085c05d93fccd16192b8fef30 +size 79579 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/BP_HangingLamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/BP_HangingLamp.uasset new file mode 100644 index 0000000..e39b5d4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/BP_HangingLamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87ca83a7f65d8ce424bc1a875062e3a00bbd10ed1e421f28e50179e7979d5467 +size 35815 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/M_Lamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/M_Lamp.uasset new file mode 100644 index 0000000..7da27e5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/M_Lamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66bef455ab67140e5a16e1fe72f8d96e62f878b94630df0fa9e241bf0fc8a107 +size 10769 From 27dba97f8a193d49d0d9370bc2fb60d7fd23b01c Mon Sep 17 00:00:00 2001 From: Waldo Date: Wed, 17 Sep 2025 14:41:48 +0200 Subject: [PATCH 31/56] Tested Control rig to circumvent Reimport, but unlikely to be a good way --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../World/Characters/Clarice/ControlRig_Clarice.uasset | 3 +++ .../Content/World/Characters/Clarice/IK_NewIKRig.uasset | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index e1678d4..92e38d4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc421bd437c61831ccb9fcb435562c4b970ef129d2557d51b71b85bcaf002629 -size 556664 +oid sha256:290ffbbb1299ed7e46187354351da111ffa6d2ac4e39ebb5100ba528468d4473 +size 556655 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 89d9824..5e4b2c8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7e5b42b2bb7a607ff27d7eef133d4e9fc3aeeccd170a127edb32fbe73df6c53 -size 549545 +oid sha256:21c306610fd7e3431dd98a845096d2a96e88100c38b6a2623bbc6947f7ff6a76 +size 540420 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset new file mode 100644 index 0000000..0bc2062 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f83c6ab432058c174f702ac89cb32f773c47ffb6d392ddf0e743af93bdc3c5ac +size 290987 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset index 4152aa2..767776c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18d4b230b1b39ef95aa03cf8264b5da22eec160a3af40cd1b8625c53ed13a72e -size 32898 +oid sha256:f6fd368ffe5548091262162fc018d4b0fc6bb7b85f503a4239af5ac482e3909a +size 34109 From 7391e3d382a8d7e0d23582f1ee230cc14267659c Mon Sep 17 00:00:00 2001 From: Waldo Date: Wed, 17 Sep 2025 21:18:02 +0200 Subject: [PATCH 32/56] Changed Clarice Skeleton, but not solving the issue (would likely need full body ik in control rig) --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../Content/World/Characters/Clarice/Animations/Idle.uasset | 4 ++-- .../World/Characters/Clarice/Animations/IdleLookAround.uasset | 4 ++-- .../Content/World/Characters/Clarice/Animations/LegsIn.uasset | 4 ++-- .../Characters/Clarice/Animations/MoveProjectorUp.uasset | 4 ++-- .../World/Characters/Clarice/Animations/OpenBackdoors.uasset | 4 ++-- .../World/Characters/Clarice/Animations/OpenBottom.uasset | 4 ++-- .../World/Characters/Clarice/Animations/OpenTop.uasset | 4 ++-- .../World/Characters/Clarice/Animations/RocketOut.uasset | 4 ++-- .../Content/World/Characters/Clarice/Animations/Walk.uasset | 4 ++-- .../World/Characters/Clarice/Animations/Walk_01.uasset | 4 ++-- .../Content/World/Characters/Clarice/ClariceMain.uasset | 4 ++-- .../World/Characters/Clarice/ClariceMain_Skeleton.uasset | 4 ++-- .../World/Characters/Clarice/ControlRig_Clarice.uasset | 4 ++-- .../Content/World/Characters/Clarice/IK_NewIKRig.uasset | 4 ++-- .../Interactibles/Electrical/NitroScan/BP_NitroScan.uasset | 4 ++-- .../World/Materials/Master/M_WorldAlignedBump1_Inst.uasset | 4 ++-- .../Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 92e38d4..89503b0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:290ffbbb1299ed7e46187354351da111ffa6d2ac4e39ebb5100ba528468d4473 -size 556655 +oid sha256:6d30efa4f210786c25ad6f1ac95986a047639e25ab854c496e31698e277e637f +size 556569 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 5e4b2c8..c27d4a0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21c306610fd7e3431dd98a845096d2a96e88100c38b6a2623bbc6947f7ff6a76 -size 540420 +oid sha256:3b2c90b5c9ef8ef872d98289b78cc6e42d53bc8c17b67d9afea96230fe0f1528 +size 540179 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle.uasset index c84f97c..6467d6f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0556f79baba9a642f1e5785c37f468a368df229b4f0da74b925dbbbf83d8c220 -size 144081 +oid sha256:a8127dd37101cd8ed0cf6b358f295beb2eacadae12e44195e6e0073a1d0457fd +size 151826 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround.uasset index 8a47e88..2c483ad 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5c980fabe0a21b0a3cda8d3f10a6d49af9ae5e3626d0ddf5be47adda1023d94 -size 141693 +oid sha256:464595fbb622739fd9d6cd0d3cf3a0424afcf7adb628fd0ae13635b8b8781fc0 +size 153656 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/LegsIn.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/LegsIn.uasset index f844caf..a66cd07 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/LegsIn.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/LegsIn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4f765cba113a81b200496570f0139ad1e63e0e9230e1ee5dd1651d027da9de2 -size 139408 +oid sha256:426ba1c6c9625250e6476b5d99deaa9ed156b7cad003f79ddf8485675cb75926 +size 147153 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset index 17ad3f4..1773191 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52a80921766f3d38d2baa37486bd146d02db771cb14a8486e1cb822db05da34e -size 112635 +oid sha256:e872383130afbba1f2d98162b43edf9c86e4c7b19ab6b1e209774360dcc270b7 +size 120366 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBackdoors.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBackdoors.uasset index 7005118..4488f2b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBackdoors.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBackdoors.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd2e9a4842b33bda549613b074678e163e935065df629e3083e6f96532017539 -size 111283 +oid sha256:bd0a663d91c8072e1d745b522b15e98193816f0356eadbb096295ffb08d8a8a7 +size 124115 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBottom.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBottom.uasset index faca246..12d1c4c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBottom.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBottom.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d8f89ed144d5338cea788e80d6eb982e83aeedc6da732490a9e6dbe31270629 -size 112524 +oid sha256:ad015925fb89a9e367cb7f09243d400427d6cf40ccd1d0d350331725c6e67aef +size 121508 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset index 984b8a1..dda12ee 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e8e996a064f4232acd420ca4221182f85581259a604d65cfb68e44d3e2a53e4 -size 113170 +oid sha256:6113125835ddfc2d4350e783e46dfa267eecdfea6095b2224ab24d7ddd4f7ad9 +size 120902 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RocketOut.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RocketOut.uasset index 74946ef..2d93b11 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RocketOut.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RocketOut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cb47a3dc6174f05e41627c1e30679f6f5e45b4f0ed79b339356a0464f86c84d -size 112511 +oid sha256:b14342fa5cd7d8c6febaad5cea1d54e2d1824dc19691604ca3155850dcfe46d1 +size 121493 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk.uasset index 6fbe112..55d7acb 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f781f55a730d34e0a0cf276fb213f6b05af1c1d5582dc4cdf50f7a469e05e7b8 -size 148173 +oid sha256:b55fdeff60eedd8013ee2641fed2a914f0750e4abba2f1f4ec856d0574b84e97 +size 155920 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset index d194357..cd0dfbd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e38fd53f59f24360ac23bb9ed4f32c8abfbb5d5303bd656d7de4d8c4252d82d5 -size 147394 +oid sha256:afaedc4823d7f3250285b905c00fe7e9e7b382a37ed76ab1bc0873a87541f55b +size 155146 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain.uasset index 057097c..a89d86b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5b4e2cb2d675f41b8f7981968e76099fa45ca465dbb54db24ff9ee8c3f4fd35 -size 2073881 +oid sha256:5230544b51d7d92a054a1790db10b40382ed57f406aca0e4803c67bcc5d4d9a0 +size 2091140 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset index 8438203..50d87ba 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c21db40aaa93b0a93148e20ce04679a497fdbba054dd3098e583d5dee1dd2bd6 -size 14196 +oid sha256:98e00efad14f8108dcc22813eeab910d4c1a45955f829e0a7eb9b83b392aafdd +size 14387 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset index 0bc2062..5d30b67 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f83c6ab432058c174f702ac89cb32f773c47ffb6d392ddf0e743af93bdc3c5ac -size 290987 +oid sha256:0ecebde841b38512e2d22b5665a6f9f523829c298b37ff4bd56a0e07cb01648c +size 98003 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset index 767776c..3515c6f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6fd368ffe5548091262162fc018d4b0fc6bb7b85f503a4239af5ac482e3909a -size 34109 +oid sha256:ea837cedd924c9effd719a0872deed0e2f0b6e39a18d4ec5389a1983dfff6fdd +size 37491 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset index ef28609..2aa1bab 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f04a6a8954608e134988239b59b61817fee66ee21d075038ed1df1cfcc0c72b9 -size 197127 +oid sha256:c63fbcd646669fbc7ef445dd4a794aa5dff8f447740238bfac789b41c1f37ed3 +size 197357 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1_Inst.uasset index 499152a..b848906 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:874c7045f7406dc2a6e67b5d8290c277415ff3ea2c22f903c59a12bb5a2b399d -size 17911 +oid sha256:41aa08c0a9b6b06dd14eab83db3f491cac4772b2a5c037e99480d46fe2800470 +size 18795 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset index cc297ee..093291b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6eeb90a6c56c4371328f9785f4f4b8d513a154cb5155d4c1b7fb1fa011aa766 -size 100194 +oid sha256:8af7f5e16d707a0078cdb48e35acc40cd1d0c6f0e97f8906eca1b8212aa59fa7 +size 98358 From e6158f4317a30393c80e98167422310a01f70315 Mon Sep 17 00:00:00 2001 From: Waldo Date: Wed, 17 Sep 2025 23:05:24 +0200 Subject: [PATCH 33/56] Start fixing possibility to push multiple buttons --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Interactibles/Electrical/Recorder/BP_Recorder.uasset | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 89503b0..02d7a9c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d30efa4f210786c25ad6f1ac95986a047639e25ab854c496e31698e277e637f -size 556569 +oid sha256:855786dc0f39cb76894286b5de77f71512e1374a812282ec4dfc94c0cd1199ac +size 557523 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 0cea479..4708421 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee3fd351b73a724bf996062ba75996fe81926a83c30f3868e6c02d07a0b5a9df -size 1761712 +oid sha256:fb9f6207c9dbe4e5a006693680d4514243f814c0d5f7b3506b6f511da2b2f135 +size 1753169 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset index 6c274f7..ec170da 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b1d1fc65b1a67d26e02e7d08538c84465deabc434d8676541dd519c729dc7cf -size 347233 +oid sha256:77d71940636bdd0738d0767123efa6910273cb1f3dbf4fc8d920b19d065fe636 +size 445172 From 62642dbb1c8b54f46dd16345f8d019229d90e96e Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Thu, 18 Sep 2025 11:50:00 +0200 Subject: [PATCH 34/56] Trying to fix Engine crash with Assetion Failed Array, but its likely an Engine bug, also happens in the Example Potion --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 2 +- .../Content/Maps/MotionControllerMap.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../World/Characters/Clarice/ControlRig_Clarice.uasset | 3 --- .../Interactibles/Electrical/Recorder/BP_Cassette.uasset | 4 ++-- .../Interactibles/Electrical/Recorder/BP_Recorder.uasset | 4 ++-- 7 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 02d7a9c..b1fae52 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:855786dc0f39cb76894286b5de77f71512e1374a812282ec4dfc94c0cd1199ac +oid sha256:fb689500370733cd348a29955499f8487aad0d4771d2c6a5199022218f4ea633 size 557523 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 4708421..cdede75 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb9f6207c9dbe4e5a006693680d4514243f814c0d5f7b3506b6f511da2b2f135 -size 1753169 +oid sha256:2c85d10d7fc5d0a5bec1e5ea8772cc323a7028b2abd475eb865775b8e6b16d3f +size 1752393 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 39d12a8..71addba 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c0e81e930bc4abe800d3e8420a9c0f5fdad24cf9cef8bd15a1ae7c5d8090102 -size 157391 +oid sha256:5e2f7c668e6d6e276116984f2c62abcab392127b843da978b9278005340f15cc +size 154630 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index c27d4a0..054e185 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b2c90b5c9ef8ef872d98289b78cc6e42d53bc8c17b67d9afea96230fe0f1528 -size 540179 +oid sha256:eccaa82c6fc0d97229e8327430286f61625c0633bb9a64f3d64c44c4a42bed2c +size 539998 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset deleted file mode 100644 index 5d30b67..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ControlRig_Clarice.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ecebde841b38512e2d22b5665a6f9f523829c298b37ff4bd56a0e07cb01648c -size 98003 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset index 02631ef..4a194f3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f836afaa5c92697ac2f74c8ca548bc48129590baa17a7d0bacf5600df699db8d -size 53529 +oid sha256:23966320a31cdcccae3658f353281233e1ecfabfbefc6de6ab50779fdd6bd21d +size 43198 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset index ec170da..4e2b2b9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77d71940636bdd0738d0767123efa6910273cb1f3dbf4fc8d920b19d065fe636 -size 445172 +oid sha256:858a3e2c34e0bd47f1eaa8d551a3ef27cb3d05509ad3789f55fa38e0f253aa42 +size 447714 From 77123ff8f9ed50a6040dcf5eea7c580fe2505330 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Thu, 18 Sep 2025 16:54:33 +0200 Subject: [PATCH 35/56] Building Portal Opening Logic --- .../Content/Core/BP_DynamicLineSpawn.uasset | 4 ++-- .../Content/Development/BP_Portal.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset | 4 ++-- .../Content/VFX/Portal/M_Circle.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset | 3 +++ .../Content/VFX/Portal/NS_Portal.uasset | 3 +++ .../Interactibles/Electrical/NitroScan/BP_NitroScan.uasset | 4 ++-- .../World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset | 4 ++-- .../Electrical/NitroScan/NitroScan_RenderTarget2D.uasset | 4 ++-- .../World/Interactibles/FreezingChamber/Tank/M_Tank.uasset | 4 ++-- .../World/Interactibles/Portals/BP_OrbComponent.uasset | 3 +++ .../Content/World/Interactibles/Portals/BP_Portal.uasset | 3 +++ .../World/Interactibles/Portals/BP_RiddleComponent.uasset | 3 +++ .../Content/World/Static/Lights/BP_Light.uasset | 4 ++-- 18 files changed, 42 insertions(+), 24 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/NS_Portal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_DynamicLineSpawn.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_DynamicLineSpawn.uasset index 69700cb..1d0feab 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_DynamicLineSpawn.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_DynamicLineSpawn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1094170063049e7865eec772194cecb01fa2af73caef434739720096c980419 -size 136054 +oid sha256:4913fed2fa696d3c3d7e8d5dc250181cf88279ab32e018e2bbc965206a9db204 +size 141396 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/BP_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/BP_Portal.uasset index 7fbdf40..20325a3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/BP_Portal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/BP_Portal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d332fdaf439982b6a1dce5b9d5e5d2953322c3a528be717e6dd37ea2703df1f -size 25050 +oid sha256:d3e0993a0d14963037767819bf46fea535fba1798ccd39658b76d5f30df65332 +size 2250 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index b1fae52..3d1c6ee 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb689500370733cd348a29955499f8487aad0d4771d2c6a5199022218f4ea633 -size 557523 +oid sha256:98dbd8913cd7572a1406ea55978b79dc388f0869cdb8583e3bf41c67a2d2d1a3 +size 559997 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index cdede75..a739452 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c85d10d7fc5d0a5bec1e5ea8772cc323a7028b2abd475eb865775b8e6b16d3f -size 1752393 +oid sha256:b6d5817ef001b3958a5672a75f9554ccda596631cd2f140ead67e9768d8128cf +size 1759071 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset index 5cbc585..69a4c79 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a076a6f4f7bce4bb8310a29cd0cf921f277fbb20865fb6d6d360c33d7ab3329 -size 23762 +oid sha256:49bd3247fef2df4e33dd191702031979533bb0880029e84f2699986c78b57703 +size 1247 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset index bb5ab16..bca2a23 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2e06c9ff74bb112414b09eee960997bed19e1e28b6686b28fc9380f8658e129 -size 28984 +oid sha256:e1b7546f8cebe56b6b67ab54d705d202190218b59f45af82ad0be974eb5c2bb8 +size 1231 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset index b73806a..670ebde 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:904383cda47b9fc0c73b2ec872ffceb4dad8eb8fa252881b877c1e2e0c9fb1d7 -size 1192957 +oid sha256:b537fa1fc29300421dc6e9000093d976580207003163afcf39bf74e944900ca7 +size 1267 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset new file mode 100644 index 0000000..de4eacf --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2707de2e5db3b0a36468599646d5a151f10b859f47e2d694082177760de28ef1 +size 23776 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset new file mode 100644 index 0000000..ca85523 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d8c911929659f8e6b817c247d965f32b80dc562e2d3646e11e28c08db34903a +size 28998 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/NS_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/NS_Portal.uasset new file mode 100644 index 0000000..266b4f8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/NS_Portal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e80750623abf8822f75b381ed5b4f01f7bd47487ac1f3037ac43aba5084ee8cf +size 1163067 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset index 2aa1bab..91f8dee 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c63fbcd646669fbc7ef445dd4a794aa5dff8f447740238bfac789b41c1f37ed3 -size 197357 +oid sha256:26eb90407040175110d80ec572413262770d9c930f1a3a19df43231cfbbf8710 +size 216541 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset index 32d4a92..a80df63 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd25d465fcd7584011c510a24afd70962af450810fa1080dcfba67e08d98482e -size 41643 +oid sha256:efb872d8d2315667b7a3f8fa6418d0794d0d35a77175fa87cfe04d4f48cf6874 +size 41063 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset index 115fa2b..f20fb27 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:704cc4bdf2f13601d0517eb1f67c3128bde9ff09bb681ea105895d408680dd76 -size 4563 +oid sha256:1959a7b0668a17f90f7e4d5c85c443a3ed8af23d04c5b9868ddd7c8899310961 +size 4653 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Tank/M_Tank.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Tank/M_Tank.uasset index 4f7ca03..55613b4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Tank/M_Tank.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Tank/M_Tank.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:060c695f4e0d08eab3b73cf37b349ffa853d6b1f596f63e5276111e5ae4ec224 -size 19067 +oid sha256:c8a3118a5bdb923f5a9e6585b22d3d3f65d2200bf447c3c71f7c4ef93c89364b +size 18668 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset new file mode 100644 index 0000000..63fb3d0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6423c49d93ccb8b34449462370a13865886101d22a2c9ab377617d1fb1496bcb +size 22099 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset new file mode 100644 index 0000000..bdf21ac --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37ca1e2af59e71f64d804815d019c3fee31f3bf94fff2dadf997c846cea12887 +size 64069 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset new file mode 100644 index 0000000..551dfa5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29300cbaafa39dfc4738523ab5a55fe1c94a1f7f66109473721c22decfa8355a +size 167934 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset index fc171d1..4edd4f7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0f6b020bcbd40e162498cbd6e2d3fa816aa97d4c894a26b1cc090d50ffcdb77 -size 62962 +oid sha256:f04e5653bb18030fea5e0bb487974d2a21ec84f0698c7b3e26a41f3c8e7d85f9 +size 62733 From b9cd77f3f0398e2c1b8119b2f1759fbdad9b865d Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Thu, 18 Sep 2025 17:13:05 +0200 Subject: [PATCH 36/56] Only in SceneCapture instead of Render in main pass --- .../World/Interactibles/Portals/BP_OrbComponent.uasset | 4 ++-- .../World/Interactibles/Portals/BP_RiddleComponent.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset index 63fb3d0..bd2af0f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6423c49d93ccb8b34449462370a13865886101d22a2c9ab377617d1fb1496bcb -size 22099 +oid sha256:c06fa55af3cc610bfdd15019d9d84b9ca85366c0742abc63c288d38404e17c11 +size 21631 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset index 551dfa5..0c3c779 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29300cbaafa39dfc4738523ab5a55fe1c94a1f7f66109473721c22decfa8355a -size 167934 +oid sha256:195ba538243450077f5614fc6704202e646111afb998c914a74651d93be6caab +size 166178 From 7c657797963783064f23e8e48215cf9ddcce614f Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 19 Sep 2025 16:29:57 +0200 Subject: [PATCH 37/56] Work on Interaction Widget and PP --- .../Content/Core/Functions/CommonFunctions.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Content/VFX/Portal/M_Circle.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset | 2 +- .../Content/VFX/Portal/NS_Portal.uasset | 4 ++-- .../Content/VRE/Core/Character/BP_Trace_Controller.uasset | 4 ++-- .../Content/VRE/Grippables/Weapons/Guns/GunBase.uasset | 4 ++-- .../Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset | 4 ++-- .../VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset | 4 ++-- .../Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset | 3 +++ .../Interactibles/Electrical/NitroScan/BP_NitroScan.uasset | 4 ++-- .../Electrical/NitroScan/M_NitroScan_Screen.uasset | 4 ++-- .../World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset | 4 ++-- .../Electrical/NitroScan/NitroScan_RenderTarget2D.uasset | 4 ++-- .../Furniture/Doors/MetalDoor/BP_SliderDoor.uasset | 4 ++-- .../World/Interactibles/Portals/BP_OrbComponent.uasset | 4 ++-- .../Content/World/Interactibles/Portals/BP_Portal.uasset | 4 ++-- .../World/Interactibles/Portals/BP_RiddleComponent.uasset | 4 ++-- .../Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset | 4 ++-- .../World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset | 4 ++-- 21 files changed, 42 insertions(+), 39 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset index cdd03ab..afef8ff 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbe671da395ce2c6ff6bedd55168b47a2f8d2c33a0d78ca60cbd3ddd6fe0827e -size 180270 +oid sha256:feed9092b5e3fcb2f2f8841e7a96af8ef3b77c14b5b1a7b9ae4d42acc92c7b4c +size 233063 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 3d1c6ee..bd4887e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98dbd8913cd7572a1406ea55978b79dc388f0869cdb8583e3bf41c67a2d2d1a3 -size 559997 +oid sha256:5ebfb1be696a161fde1c1d3759d40e0059548e25f744b829eab5594fb2610c46 +size 559383 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index a739452..d465b18 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6d5817ef001b3958a5672a75f9554ccda596631cd2f140ead67e9768d8128cf -size 1759071 +oid sha256:1b1c5c71226c79a18bf7c2f434d28d0d1780a35219a508a4d1416177773f3c13 +size 1749833 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset index de4eacf..fe2674c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2707de2e5db3b0a36468599646d5a151f10b859f47e2d694082177760de28ef1 -size 23776 +oid sha256:ce78c2fbfccc62f5acf29b14c0d89b18c2fa1214c5667951185096a0c4e79e60 +size 23903 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset index ca85523..9d2c925 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d8c911929659f8e6b817c247d965f32b80dc562e2d3646e11e28c08db34903a +oid sha256:325212d0aa40fef2946d0e56ee21b23c897b4e381b013c688b367dc9b6d93f98 size 28998 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/NS_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/NS_Portal.uasset index 266b4f8..103e39e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/NS_Portal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/NS_Portal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e80750623abf8822f75b381ed5b4f01f7bd47487ac1f3037ac43aba5084ee8cf -size 1163067 +oid sha256:e59b642b3b728e85ecf0cf4ad4a79d07381abe74f12f6622e437f1106b9d6f20 +size 1161615 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index dbadc83..b256e64 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3610b11675c479bd6d61f635a4c82177aa8cffaabaa1142f335830b7024d7ee0 -size 1813474 +oid sha256:d48fb855a239aac07d3da8bf57af291e512ad2db7e752b7bf7ec61095d73039e +size 1815377 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset index 3c6afe6..3e14cee 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85bf8a9ff9978579f3ceb8b437fad4afeefc53161385bcd539bbf2a05d7eb028 -size 917596 +oid sha256:92c0a1fd3c0dd4e3e2636913955d33e77201075ef9dccc31e5ff2484ce2bd7aa +size 934654 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index a25147b..63e3f66 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a61c7d00add04b70c87448a5399fe00c1bc17b43620526dfc6691f2eab5dbc71 -size 5654166 +oid sha256:97ec93e9176d4c29ed16f7cd3e9f162bbc11fe12f06ff18bc280036c2d2c6a3c +size 5666120 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset index 5c0ef27..42294e4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3054af254ff6ecaa3b4c8586043d7ee1a3f6eebeb7cba264c046b326a7ee7009 -size 2540953 +oid sha256:dffb49312a163ae82d783d169dc05ab6b43ed082f89789159905bf3856138393 +size 2549247 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset new file mode 100644 index 0000000..9ec9b8c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:173432e259f311a396351511100f2504b43ed1dceeff27a1b955db533e7c021b +size 28877 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset index 91f8dee..bac857e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26eb90407040175110d80ec572413262770d9c930f1a3a19df43231cfbbf8710 -size 216541 +oid sha256:2eb007afe53a879e1e68215e81b8a6c88e89da9f8fd273effb5ce4638ff92bd1 +size 210045 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan_Screen.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan_Screen.uasset index 0db7190..635b566 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan_Screen.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan_Screen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d876067794529675dc000c7c152365a08411057c9efb6ddcaaf94768074647e -size 16770 +oid sha256:edc4d0ef8d649ef4cfcbcfff7f900043b1586fd9bc4229f5c89ad9b55592e8f2 +size 15198 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset index a80df63..53496de 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efb872d8d2315667b7a3f8fa6418d0794d0d35a77175fa87cfe04d4f48cf6874 -size 41063 +oid sha256:897e1185ae3b698e44a6db113da37a32b1e10475c842b32e87240b5a972762d0 +size 44100 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset index f20fb27..ce517ea 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1959a7b0668a17f90f7e4d5c85c443a3ed8af23d04c5b9868ddd7c8899310961 -size 4653 +oid sha256:d85dcdccff3baa6d57ca5e71c000bf72eb508b8114f8ef2e5f6167b94401aaa8 +size 4982 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset index eaea6ac..d39a513 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d50a4544e17bf874bd915acaa3bd26a37884dee9766fa8ff7230177eaa10f5e -size 281424 +oid sha256:e81a427d2c28a053bf56947a0e949a0fa983dde3fb8c9afc0a467581cdd2d657 +size 281310 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset index bd2af0f..7b7cc5f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c06fa55af3cc610bfdd15019d9d84b9ca85366c0742abc63c288d38404e17c11 -size 21631 +oid sha256:eea1ab6f61e569729345ddf5e6139ec9894189492bfc152080be47602ebd76e9 +size 22014 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset index bdf21ac..07dedfd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37ca1e2af59e71f64d804815d019c3fee31f3bf94fff2dadf997c846cea12887 -size 64069 +oid sha256:adc329078f6797010df4b273c91897f944fa0d38dabfb02924a30c49796a37c9 +size 86620 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset index 0c3c779..86e7b98 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:195ba538243450077f5614fc6704202e646111afb998c914a74651d93be6caab -size 166178 +oid sha256:e779831f1e940e06ea18b81e6a947c5016e2162823ca70a6d1738e27ae5d4e77 +size 173600 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset index fe881ab..4948e6d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6a59a3b691a7d5b2faa36df632d96cb891e4e63690fe11591890fc79b224eb6 -size 25154 +oid sha256:0ff97ad34080aece447521134fd502a82a646da2f0a6ebbfaadd70ddc333694f +size 25268 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset index dfa6ceb..c10a4b6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:580d8c84efb62496f5bd3ea58b43c8da76b016e0d7968515e79634ce8d89cc09 -size 15481 +oid sha256:500e5dd2ef9b476db4f8eed8b9cbc347ba4904f823b25d3ac7240316b7e52ec4 +size 15648 From 3de7e87a8ca16af1a8d03da471cd5a39ed4f09ca Mon Sep 17 00:00:00 2001 From: Waldo Date: Tue, 23 Sep 2025 20:31:25 +0200 Subject: [PATCH 38/56] Misc, mostly Teleport Portal --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Room_Kitchen.umap | 2 +- .../Content/Maps/Map_Stream_MachineRoom.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap | 2 +- .../Content/Maps/MotionControllerMap.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Content/UI/Inventory/BP_VRInventory.uasset | 4 ++-- .../Content/VFX/Portal/M_Circle.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset | 4 ++-- .../Content/VRE/Core/Character/BP_Trace_Controller.uasset | 4 ++-- .../Misc/Examples/DialIndicator/DialComponent.uasset | 4 ++-- .../Grippables/Misc/Examples/Lever/NativeLeverActor.uasset | 4 ++-- .../Content/VRE/Grippables/Misc/Examples/M_GripOverlay.uasset | 4 ++-- .../Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset | 4 ++-- .../VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset | 4 ++-- .../Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset | 4 ++-- .../Interactibles/Electrical/NitroScan/BP_NitroScan.uasset | 4 ++-- .../World/Interactibles/Portals/BP_OrbComponent.uasset | 4 ++-- .../Content/World/Interactibles/Portals/BP_Portal.uasset | 4 ++-- .../World/Interactibles/Portals/BP_RiddleComponent.uasset | 4 ++-- .../World/Interactibles/Portals/M_OverlayLoading.uasset | 3 +++ .../World/Interactibles/Portals/M_OverlayLoading_Inst.uasset | 3 +++ .../Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset | 4 ++-- .../World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset | 4 ++-- 24 files changed, 47 insertions(+), 41 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading_Inst.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index bd4887e..a3e768f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ebfb1be696a161fde1c1d3759d40e0059548e25f744b829eab5594fb2610c46 -size 559383 +oid sha256:e4fbaf83f085c77dc856fd3632ac572cf5015c2fc5c7ca0fd0a0b546d089c33a +size 559958 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index 1acc9fd..b1d56b6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d78b4706b2cb7441cfdad7f5f0974a550ba5767339c51da3dfe1e5deebc7e4e +oid sha256:6ba068a82a937fa8ed7189926d8ac95e13a5a12a15cf730db0302bac9c549138 size 157733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap index ad7aa1d..8515c1e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e35235979c5d1bb4f1c045919c0133cdfed2db8a397617366468521e2b154d64 +oid sha256:889e950e827979ef539d27209e672d02c2dfd78643ec24453d93a3893fa12755 size 27574 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index dd0e4b8..652b874 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08c17b0118beacc9eeb195b133578672165dcd35dff3eca45b3bb071ea055331 +oid sha256:a32a4541bfa7b0909458a79de5a92b2fad5419ac5341476e7f3b88240265e1ce size 67378 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index d465b18..9b75457 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b1c5c71226c79a18bf7c2f434d28d0d1780a35219a508a4d1416177773f3c13 -size 1749833 +oid sha256:ecd1700b5df5723c7c87ac11acb92e3c897b0f8e759fcfaa4c242e531c37eab1 +size 1758840 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 71addba..b1cc2e2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e2f7c668e6d6e276116984f2c62abcab392127b843da978b9278005340f15cc -size 154630 +oid sha256:e859021ff2687bdbc34c1fb7c605a6e10d97105bf50356ca0e0e5f6a7397c21f +size 157492 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset index a7ecb26..6ce827c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ed0e624b4f3ca0c55e995eac72be2512cdce1be5e0ad99fc0379fde07b099bd -size 733055 +oid sha256:98be64dc15c3870b5bb4f6ec7c1aefac3075591c92f01677f0117df2d78e6973 +size 735044 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset index fe2674c..7c0c1ae 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce78c2fbfccc62f5acf29b14c0d89b18c2fa1214c5667951185096a0c4e79e60 -size 23903 +oid sha256:dc7dee41ed1b67841f527bfe01fa7e22a30408d036b023e92b121ac110ee2c22 +size 23945 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset index 9d2c925..b8c5edc 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:325212d0aa40fef2946d0e56ee21b23c897b4e381b013c688b367dc9b6d93f98 -size 28998 +oid sha256:bb543b54f3bdc0cbc428eecfb1d4e5d9735bf841f2ce959846fb38d1f6a42c24 +size 29040 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index b256e64..da3c0dd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d48fb855a239aac07d3da8bf57af291e512ad2db7e752b7bf7ec61095d73039e -size 1815377 +oid sha256:79ea2cb15147467708c959c95b8d61fea566034a005d62846c6cc2fd80f5d8d1 +size 1809889 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DialIndicator/DialComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DialIndicator/DialComponent.uasset index d4a89ed..4073780 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DialIndicator/DialComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DialIndicator/DialComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e1a99dd8b3ca2b77246336f1d27da028e603b27eac7f771784f68fe25e3afd2 -size 131681 +oid sha256:465a827c6bb6bab064184dde18f0ca684328e069180d4a4e8aa124b11b6df84b +size 133051 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Lever/NativeLeverActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Lever/NativeLeverActor.uasset index 127358f..910958c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Lever/NativeLeverActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Lever/NativeLeverActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a17a4ef9754e7c8c1b3dd8f963efc63bafe68c8c63f99bb5838b645765851e5 -size 87973 +oid sha256:afab9cda43f3e3a4cdf04e113374fd1e04ed4c0b026b3dbde0e04da90fc06f22 +size 91311 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/M_GripOverlay.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/M_GripOverlay.uasset index 8c4427c..3570a15 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/M_GripOverlay.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/M_GripOverlay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2e80b479a197d55c1f34408d02a43b09f420da682ed35c5375bd914ad1cced8 -size 34199 +oid sha256:d18d8841f2c9453e82d9a5d3781b6ab00e75eca0c40e0cfa6bae9ede1682a6ec +size 33950 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index 63e3f66..3f084dd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97ec93e9176d4c29ed16f7cd3e9f162bbc11fe12f06ff18bc280036c2d2c6a3c -size 5666120 +oid sha256:6dd070606a67bf08f31579b53ac28d72ab4b5ae05c3069eed6c10b551bc8d81f +size 5784333 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset index 42294e4..861413b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dffb49312a163ae82d783d169dc05ab6b43ed082f89789159905bf3856138393 -size 2549247 +oid sha256:8704f1be3876c6336d0516aa05cce659b88311a661204eb81afe03ba80d12c32 +size 2548622 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset index 9ec9b8c..8e58e7a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:173432e259f311a396351511100f2504b43ed1dceeff27a1b955db533e7c021b -size 28877 +oid sha256:149e7393db6d0fef7fdc45c304459a0e8d3952d656c93cd84d0fb0ba0c525024 +size 55337 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset index bac857e..e48f3dc 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2eb007afe53a879e1e68215e81b8a6c88e89da9f8fd273effb5ce4638ff92bd1 -size 210045 +oid sha256:dc659cba0a0d231d3ebc64c917b2d05fa1a4cd72f3645ade55bce21517825160 +size 215087 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset index 7b7cc5f..af8c12a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eea1ab6f61e569729345ddf5e6139ec9894189492bfc152080be47602ebd76e9 -size 22014 +oid sha256:07023f1cbd02bd8a68549deadde9213d790d51035e4582a1ee45a84565b0b342 +size 22422 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset index 07dedfd..1126763 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adc329078f6797010df4b273c91897f944fa0d38dabfb02924a30c49796a37c9 -size 86620 +oid sha256:b8c67ceca7c69ba38628666b1930fc03b70251cedfec99e50b03f67136ca2f01 +size 366048 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset index 86e7b98..8df543e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e779831f1e940e06ea18b81e6a947c5016e2162823ca70a6d1738e27ae5d4e77 -size 173600 +oid sha256:31abff51f40112acbeadf733613b61b9f3fdba7ac60393fb400d1b2e2ee41018 +size 173497 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading.uasset new file mode 100644 index 0000000..99b96a6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2abddea0a443ab4942c12e8dbcbd0fdd659585b79bea9c5d270514ab925f6d7 +size 33869 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading_Inst.uasset new file mode 100644 index 0000000..1cddbd8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6e18e73d9329d8fe4ec1c0a593610e758778dfa2004e43dd4c16a71029357cc +size 9339 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset index 4948e6d..69271b9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ff97ad34080aece447521134fd502a82a646da2f0a6ebbfaadd70ddc333694f -size 25268 +oid sha256:661a0303686dda62f040776e4f36a039f5f574ad357bddcd074e1a97a0a7043b +size 28281 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset index c10a4b6..4564590 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:500e5dd2ef9b476db4f8eed8b9cbc347ba4904f823b25d3ac7240316b7e52ec4 -size 15648 +oid sha256:caca881b55e388fbd9715e289bd0c9550d1a6dea2a006be150796c1164c9b409 +size 14668 From 883ddb278f1d8e8d21c0a71c30785f7a5dc58366 Mon Sep 17 00:00:00 2001 From: Waldo Date: Wed, 24 Sep 2025 22:29:30 +0200 Subject: [PATCH 39/56] Fix Grating Mat, add Portal Sound, Misc --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Room_Kitchen.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/Map_Stream_MachineRoom.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../DrawerBase/FileCabinet/MovablesSoundComponent.uasset | 4 ++-- .../Misc/Examples/DrawerBase/Locker/Cabinet1.uasset | 4 ++-- .../Interactibles/Electrical/NitroScan/BP_NitroScan.uasset | 4 ++-- .../Content/World/Interactibles/Portals/BP_Portal.uasset | 4 ++-- .../World/Interactibles/Portals/BP_RiddleComponent.uasset | 4 ++-- .../Content/World/Interactibles/Portals/Portal_1_Loop.uasset | 3 +++ .../Content/World/Materials/Master/M_WorldAligned.uasset | 3 +++ .../Content/World/Materials/Master/M_WorldAlignedBump.uasset | 4 ++-- .../Content/World/Materials/Master/M_WorldAlignedBump1.uasset | 4 ++-- .../Content/World/Materials/Metal/Metal_017/M_Metal.uasset | 3 +++ .../World/Materials/Metal/Metal_017/M_RustyMetal.uasset | 3 +++ .../World/Materials/Metal/Metal_017/NewMaterial.uasset | 4 ++-- .../Content/World/Materials/StoneTiles/M_StoneTiles.uasset | 4 ++-- .../World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset | 4 ++-- .../World/Materials/StoneTiles/Test_WS_Parallax_Floor.uasset | 3 +++ .../Materials/Wood/Wood062/Wood062_4K-PNG_Color_Mat.uasset | 3 +++ .../World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset | 4 ++-- .../Content/World/Static/Stairs/Gratings/M_Gratings.uasset | 3 +++ .../World/Static/Stairs/Gratings/SM_Grating2_Square.uasset | 4 ++-- .../World/Static/Stairs/Gratings/SM_Grating_Large.uasset | 4 ++-- .../Content/World/Static/Walls/BP_Floor.uasset | 4 ++-- 27 files changed, 58 insertions(+), 37 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/Portal_1_Loop.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAligned.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_Metal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_RustyMetal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Floor.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Materials/Wood/Wood062/Wood062_4K-PNG_Color_Mat.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/M_Gratings.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index a3e768f..5b192bb 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4fbaf83f085c77dc856fd3632ac572cf5015c2fc5c7ca0fd0a0b546d089c33a -size 559958 +oid sha256:b59cd3f6196c4b955e297e1db9d8c2de2f6df50de154c8ffcf9a766e9523a8f7 +size 560065 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index b1d56b6..e55e50c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ba068a82a937fa8ed7189926d8ac95e13a5a12a15cf730db0302bac9c549138 +oid sha256:b02a2d71d59d6901ed2c12859eaece724381528211ba7165265cc500b597ba1d size 157733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 0ab2a6f..5266cf2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12f988f7ff31a4e8dc056590bd1abfa259971daeb0419953b0fbce23718cb317 -size 68863 +oid sha256:823b4cb5769630afc4c7330eb153b6f5e1e4a000778ce2b8ce50265fea237b98 +size 65250 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap index 8515c1e..65b4f91 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:889e950e827979ef539d27209e672d02c2dfd78643ec24453d93a3893fa12755 +oid sha256:e6483694b020dc302f53b5b7651e52ce61424b3a7da9ee96a02403426e407b5a size 27574 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index 652b874..dec6c85 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a32a4541bfa7b0909458a79de5a92b2fad5419ac5341476e7f3b88240265e1ce +oid sha256:bbc8cab3d62181ee8f4f91099401eca3f7eff79b2fd43378b5bdad999ba117fc size 67378 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index b1cc2e2..47da47e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e859021ff2687bdbc34c1fb7c605a6e10d97105bf50356ca0e0e5f6a7397c21f -size 157492 +oid sha256:29786c9f188baee6a384277b554d846472068546e23b403d86ab815c6b94bd89 +size 153290 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset index ff6a60f..622dfef 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ac9821592f5c151bd8949f0c2a296b401e002920b09f36f8947194f9213837f -size 721094 +oid sha256:d2c33ea7248d097fcbbff233e778a90329fdeb525402aedf23b033a9dc3a0dbf +size 772056 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset index 042730f..15b0331 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bec3bdc8d9d73f11ffb56cc09a66e92d53ff23ba8df94ee82af7f032eeaa3da -size 85039 +oid sha256:6125ceaabe2a042f9f3bbd3da596cab04242802c3797fd52e0c94a6b87d2d296 +size 84302 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset index e48f3dc..4f8de0a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc659cba0a0d231d3ebc64c917b2d05fa1a4cd72f3645ade55bce21517825160 -size 215087 +oid sha256:c1b05223147020aaac1528037d68cdcaab7a81214468a7470d169c9d3439f66b +size 240074 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset index 1126763..7807d39 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8c67ceca7c69ba38628666b1930fc03b70251cedfec99e50b03f67136ca2f01 -size 366048 +oid sha256:116f28e18da4ad886f617c448241895f3882f3208301ea5a899ff712d47652a8 +size 356717 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset index 8df543e..a022985 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31abff51f40112acbeadf733613b61b9f3fdba7ac60393fb400d1b2e2ee41018 -size 173497 +oid sha256:629f274f9010bc6e397b0407468ab514774523ce3abba5adeaa6a0014f8d2aaa +size 173403 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/Portal_1_Loop.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/Portal_1_Loop.uasset new file mode 100644 index 0000000..baca0f5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/Portal_1_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5eee9d0572fd524b91901340d485651720eae4a76240de5eea058ffab78cd97 +size 461909 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAligned.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAligned.uasset new file mode 100644 index 0000000..9266805 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAligned.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd6de775a8e2281cacf50445953da4db076f19178c65be4e7b0ea89b68d7f083 +size 29643 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset index e03400a..d7c2137 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b6595f4335e7a62fab61f02da6641ee2d471a11ac9631320d9b6c072862be63 -size 96380 +oid sha256:6fd32a9c605a8220a6aa51e5f8c036c4ea2b8238a78226555ec90723759c5015 +size 95952 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1.uasset index a623e11..218ef0b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f98c09dfba98de220aafb4a7f497ad2cbe9907eb18f77a7fa44e028be5e863c -size 111266 +oid sha256:619be41cfbd07c368ce2370a55295e15749d21458c365f487e58dae684bebc61 +size 110838 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_Metal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_Metal.uasset new file mode 100644 index 0000000..8cea99b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:118985dbaf05dfbe1667a68fc2630c5d292127aee219705cf9cdcecd16e08930 +size 1373 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_RustyMetal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_RustyMetal.uasset new file mode 100644 index 0000000..f5a964b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_RustyMetal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1749d2e77dc214b6f7d654c08e2d3aed35349eab6aded9f2df4d661db6ee117 +size 21618 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/NewMaterial.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/NewMaterial.uasset index 7e049e2..58b5983 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/NewMaterial.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/NewMaterial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41945547b88a2c93a7814490e142153ba08ea8f8ddc02208d2992e7927321138 -size 11706 +oid sha256:5279e66f802745049e486959e1562e67aa9dc96e215c48f276ef0b46ebef118a +size 11218 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/M_StoneTiles.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/M_StoneTiles.uasset index fabead6..1af24f7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/M_StoneTiles.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/M_StoneTiles.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85c73714ea07ba39ec913bbbe8f5a1d2ec4064ba9550c8a28fd1d92337bf5c9d -size 66657 +oid sha256:89c92be38d3a5cd330a6d1b4dd26303f2774257f69f9e880b351f33415b0cef7 +size 66310 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset index 9bb6fe0..9cd22a2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef334e60c2a73528ed17f858ca16a441bd12b82e8a5c704cc8a0224af40568d0 -size 19072 +oid sha256:5d5ba7d03441bf5542cbf98918a735b6d3ded31b11da1fc950d0288cbafb83b9 +size 1500 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Floor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Floor.uasset new file mode 100644 index 0000000..36d508f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Floor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2769ea3bd627f0c4e36949867c468eced391dab279037c3e23a0b80da98d9cb +size 19072 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Wood/Wood062/Wood062_4K-PNG_Color_Mat.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Wood/Wood062/Wood062_4K-PNG_Color_Mat.uasset new file mode 100644 index 0000000..4a7600e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Wood/Wood062/Wood062_4K-PNG_Color_Mat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e691f738fa5f43f1c4437d833cc9603845b2cb7c65121a2ef723e6fee2f59dde +size 12355 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset index 4564590..018a476 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:caca881b55e388fbd9715e289bd0c9550d1a6dea2a006be150796c1164c9b409 -size 14668 +oid sha256:cdfd134e5bc1417a47da7451fbbda244fa1ea8f376d3b4cdc0ca8b0587e1adb2 +size 15009 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/M_Gratings.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/M_Gratings.uasset new file mode 100644 index 0000000..60092c6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/M_Gratings.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20ddb4af8554a1792a7f5fbe44f3e5c3e5400b377edfd4b00f65c502a61a9bbd +size 11074 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset index 4ef82d2..216f647 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9414e064da151ad24a2aab4c08abf1635c1e13dc633b1e87f4698445ef4594b1 -size 89316 +oid sha256:df9d1f6c541b49c3eedb19628cecc30dfcc6cef7739e44f1b62818cdb04c34a2 +size 90033 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating_Large.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating_Large.uasset index 9a5213e..553cf5e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating_Large.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating_Large.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc0f5ede92d3aabb8ed7966a33794a2e5fcffdc4f1eb2661c399874ddde2cf86 -size 323008 +oid sha256:53022e7c38896817f9850b934a6d459a2957602b5a17cfe5f280556fef0ae272 +size 302266 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset index 30b9603..9cefb53 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a4dc95a1dadeb5eaca809ee326f14bd615aa6521a921a531d0a6ee606bd3ef0 -size 113945 +oid sha256:22d12ad7d2820d60180812a1516887fe724842fd6a9b24adebf57c1595ab89d7 +size 115630 From 16e7dab92dbc43d0dd3be29a0ab4f2a52a092f9e Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 26 Sep 2025 16:53:02 +0200 Subject: [PATCH 40/56] Fixes on door and MovableComp --- .gitmodules | 3 +++ .../Content/Audio/Portal/Portal_1_Loop.uasset | 3 +++ .../Content/Audio/Portal/SA_Portal.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Misc/Examples/Button/CaptchaButtonComponent.uasset | 4 ++-- .../Misc/Examples/Button/ColorChangingButtonComponent.uasset | 4 ++-- .../DrawerBase/FileCabinet/MovablesSoundComponent.uasset | 4 ++-- .../World/Interactibles/Captchas/BP_BaseCaptcha.uasset | 4 ++-- .../Content/World/Interactibles/Captchas/M_Captcha.uasset | 4 ++-- .../World/Interactibles/Captchas/M_Captcha_Inst.uasset | 4 ++-- .../Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset | 4 ++-- .../Interactibles/Electrical/Doors/ScifiDoorButton.uasset | 3 +++ .../Electrical/Doors/asd/StaticMeshes/asd.uasset | 3 +++ .../World/Interactibles/Electrical/Doors/asd__2_.uasset | 3 +++ .../Interactibles/FreezingChamber/BP_FreezingChamber.uasset | 4 ++-- .../World/Interactibles/FreezingChamber/Material_021.uasset | 4 ++-- .../Content/World/Interactibles/Portals/BP_Portal.uasset | 4 ++-- .../World/Interactibles/Portals/BP_RiddleComponent.uasset | 4 ++-- .../Content/World/Interactibles/Portals/Portal_1_Loop.uasset | 4 ++-- .../World/Materials/Metal/Metal_017/M_RustyMetal.uasset | 4 ++-- .../Content/World/Static/Lights/BP_Light.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers | 1 + 23 files changed, 51 insertions(+), 32 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/Portal_1_Loop.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/SA_Portal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/ScifiDoorButton.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd/StaticMeshes/asd.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd__2_.uasset create mode 160000 VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers diff --git a/.gitmodules b/.gitmodules index c71eda9..91cdba4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "VIRTUOS_ExpansionPluginTests/Plugins/SPUD"] path = VIRTUOS_ExpansionPluginTests/Plugins/SPUD url = https://github.com/sinbad/SPUD +[submodule "VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers"] + path = VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers + url = https://github.com/sinbad/StevesUEHelpers diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/Portal_1_Loop.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/Portal_1_Loop.uasset new file mode 100644 index 0000000..981adca --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/Portal_1_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c4b505f0c494c9255f0895c0debad47c68f4ebaa59266f867b366a66ef4a4bb +size 461879 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/SA_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/SA_Portal.uasset new file mode 100644 index 0000000..6147a47 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/SA_Portal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e01173af7fa9cb7e1d712a7bbcc4ca6ec8d2fda789f5fb67426e0967b3bae13a +size 1044 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 5b192bb..ee3d9d7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b59cd3f6196c4b955e297e1db9d8c2de2f6df50de154c8ffcf9a766e9523a8f7 -size 560065 +oid sha256:30a9f34ddd36660ef1a9cb2e59208b65c170544cc1b283f74e739bac057572a2 +size 562753 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 47da47e..f096bde 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29786c9f188baee6a384277b554d846472068546e23b403d86ab815c6b94bd89 -size 153290 +oid sha256:7ee3c35c7958a370c643308392201fd6461e42fb1bb8fbda356cae13a0dd9c8d +size 153137 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset index 978897b..ae30cd5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e95d8aa6644892c964e96f3ea093c6fc6e6161f449e46e84416f2d3cf20cdd23 -size 51570 +oid sha256:71108b7e1e27a8f32592f80525d921d1296ceab41566e330533bb6d6ff38d560 +size 52066 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset index 6524f91..72d55e6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af77a56053a1badf1a8f74d8b4527cee850749d5efdcac54ae65ed841609599c -size 89749 +oid sha256:dfcbb8df6038bd3a83d1daffccccbeac026003954415952386371631f6818005 +size 107094 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset index 622dfef..163c061 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2c33ea7248d097fcbbff233e778a90329fdeb525402aedf23b033a9dc3a0dbf -size 772056 +oid sha256:7ebc043bb4b2c3fb97dfb1030725c4aadac9f5e0114da2587d4dbf461d78146f +size 647461 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset index 33cb886..b93c99b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2f52d0246317b7129a9afd96591f1a07fdffbe0c553b6c75893d91d658e2613 -size 237808 +oid sha256:d5efe9705e1f1e2d986af8e1d6feea02bf7e59b6838179d62bb3383184ad773c +size 340587 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset index e4aaeba..a072b5d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcb5c15a27f40897e54192d9cea3adf3391e1404b2b2590e101a750961832723 -size 29136 +oid sha256:8ea6393212d38bb403f3523378a7c0e1b6e11a9b57459c290c2cb0a31cf58585 +size 29196 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha_Inst.uasset index 207d2a2..f415b93 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbd03ff241afeea661aedeb952a3a5c748630dbda01fe36a7941de1a14800413 -size 12023 +oid sha256:73aa038bcb57c3f3583dabd4cf34eee78bd4101b1c3f81ed79ebc0270f6695a3 +size 8621 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset index 971f5b5..7c3e32a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d399fccd91c88f0d506ae2ec1e28f38b7d745ba095b86772de3bfe9fc7511e06 -size 107245 +oid sha256:69d4d9f482db7ea1bb883590f35373bc9a9d275156a30eec41deb513e809023f +size 129288 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/ScifiDoorButton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/ScifiDoorButton.uasset new file mode 100644 index 0000000..54f7f00 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/ScifiDoorButton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61ad8bcdf99281517a13dd29ef585fb01a40d4ec2d97ef79f1a420eda36601ca +size 73811 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd/StaticMeshes/asd.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd/StaticMeshes/asd.uasset new file mode 100644 index 0000000..204bb75 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd/StaticMeshes/asd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e0afb1c8e9d97bb8260c947875ce6528c83f2f85b1e81765c20c1d9634e0a9b +size 61535 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd__2_.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd__2_.uasset new file mode 100644 index 0000000..1a22e36 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd__2_.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73191cafb72b2e7c4942580e85e4a6b846f5b13e1e5350a82df0e2badea4a3f4 +size 1409 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset index 4deb4c5..cfa660f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:755ddbc7d903257846d3b1c6ef574af7b8212fd3b46540d1791328ede60ee1e4 -size 68891 +oid sha256:23538d57a83ac11c0f2fdabea3085f256652a2f7e121848ba6c8559f04b5eae3 +size 68974 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Material_021.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Material_021.uasset index f782c18..ab2ab8a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Material_021.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Material_021.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b84dca2cbe5146ac7fd0207c863d0afdaa0e0c97170e3edd07af6e4f5c2ac537 -size 73517 +oid sha256:bcab3301b43c02a2728a1cc5054849c94b2aeb679541d34c7226f59b4fa036d7 +size 74303 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset index 7807d39..bcae9a2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:116f28e18da4ad886f617c448241895f3882f3208301ea5a899ff712d47652a8 -size 356717 +oid sha256:d145403cf122c79f868d774d6261eb80f9440e7cc0e7d5c9fe384147cc389069 +size 351325 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset index a022985..5cb9772 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:629f274f9010bc6e397b0407468ab514774523ce3abba5adeaa6a0014f8d2aaa -size 173403 +oid sha256:9ab9799b78a73faa61803ed92cb4afb4d3770dd06f826c5a51209ea4f8ed1139 +size 177604 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/Portal_1_Loop.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/Portal_1_Loop.uasset index baca0f5..c5954d3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/Portal_1_Loop.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/Portal_1_Loop.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5eee9d0572fd524b91901340d485651720eae4a76240de5eea058ffab78cd97 -size 461909 +oid sha256:b224e30461316e06bee9204e4fa4835a0594c86b0252aae24388869ae5c510ee +size 1341 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_RustyMetal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_RustyMetal.uasset index f5a964b..e477ba7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_RustyMetal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_RustyMetal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1749d2e77dc214b6f7d654c08e2d3aed35349eab6aded9f2df4d661db6ee117 -size 21618 +oid sha256:d7e3e416d23c70143faf12496dedabdf2778aad8f896600d6a1a37b63fb2dc31 +size 22684 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset index 4edd4f7..657a02b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f04e5653bb18030fea5e0bb487974d2a21ec84f0698c7b3e26a41f3c8e7d85f9 -size 62733 +oid sha256:8d2344351fb6d7083f9fab50a40333d3937577011bada2db34b5d0e81049283d +size 122424 diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers b/VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers new file mode 160000 index 0000000..d6fbc18 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers @@ -0,0 +1 @@ +Subproject commit d6fbc18c862cc9d1e9c8418a16273a8562078403 From 4b08b79ffd58738b6d84a3e8fcf00934ad77fcc6 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 30 Sep 2025 15:23:30 +0200 Subject: [PATCH 41/56] Work on Bathrooms --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Room_Kitchen.umap | 2 +- .../Content/Maps/Map_Stream_MachineRoom.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Content/VRE/Grippables/Misc/Examples/Door/DeadBolt.uasset | 4 ++-- .../VRE/Grippables/Misc/Examples/Door/DoorActor.uasset | 4 ++-- .../World/Interactibles/Bathroom/BP_ToiletStall.uasset | 3 +++ .../World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset | 3 +++ .../World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset | 3 +++ .../Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset | 3 +++ .../Interactibles/Bathroom/Sink/T_ToiletSink_DIffuse.uasset | 3 +++ .../Bathroom/Sink/T_ToiletSink_MetallicRoughness.uasset | 3 +++ .../Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset | 3 +++ .../World/Interactibles/Bathroom/Toilet/Toilet2.uasset | 3 +++ .../World/Interactibles/Bathroom/Toilet/Toilet3.uasset | 3 +++ .../World/Interactibles/Bathroom/Toilet/Toilet5.uasset | 3 +++ .../Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset | 3 +++ .../Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset | 3 +++ .../Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset | 3 +++ .../Interactibles/Electrical/Generator/BP_Generator.uasset | 4 ++-- .../Furniture/Doors/MetalDoor/BP_SliderDoor.uasset | 4 ++-- .../Content/World/Materials/Master/M_WorldAlignedBump.uasset | 4 ++-- .../Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset | 3 +++ .../World/Materials/WhiteTiles/T_WhiteTiles_Diffuse.uasset | 3 +++ .../World/Materials/WhiteTiles/T_WhiteTiles_Disp.uasset | 3 +++ .../World/Materials/WhiteTiles/T_WhiteTiles_Normal.uasset | 3 +++ .../World/Materials/WhiteTiles/T_WhiteTiles_Rough.uasset | 3 +++ .../Content/World/Static/Splines/Pipes/M_Pipe.uasset | 4 ++-- .../Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset | 4 ++-- .../Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset | 4 ++-- .../World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset | 4 ++-- 32 files changed, 79 insertions(+), 25 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_DIffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_MetallicRoughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet2.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet3.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet5.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Disp.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Rough.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index ee3d9d7..e9b20f5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30a9f34ddd36660ef1a9cb2e59208b65c170544cc1b283f74e739bac057572a2 -size 562753 +oid sha256:45822db0e5d0bc99293fe6446249a52ed3dd8a447bfc6c711cde7079a90dd432 +size 599606 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index e55e50c..3131d43 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b02a2d71d59d6901ed2c12859eaece724381528211ba7165265cc500b597ba1d +oid sha256:9106117042bbb9ba257f1b4187ad889617e2aadfaf5d3df4bb5bad37d2960626 size 157733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap index 65b4f91..b301d42 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6483694b020dc302f53b5b7651e52ce61424b3a7da9ee96a02403426e407b5a +oid sha256:8f192977603d6dc809d5f07d0b161b9cc996bcbb2a9954ebc1eee01671a75847 size 27574 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index dec6c85..55db0cb 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbc8cab3d62181ee8f4f91099401eca3f7eff79b2fd43378b5bdad999ba117fc +oid sha256:5aed6ea422ac32c85544a56442bf480d30f3720863483305c356db14a313421e size 67378 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index f096bde..e903e9b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ee3c35c7958a370c643308392201fd6461e42fb1bb8fbda356cae13a0dd9c8d -size 153137 +oid sha256:0c73423074c0aee5ca6a873e5e92ffdb0c75f86be843d1ce7e2b7ab3397513f9 +size 153583 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DeadBolt.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DeadBolt.uasset index f60b36a..736fa0f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DeadBolt.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DeadBolt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6cf5a73b1099be46fc9a148dfb2763094df9f0b64763d56c0aee985ff0ae85b -size 30756 +oid sha256:6cf534fe2215772dc387a298379fc1ba19c4e536784f431a668a97b904da9d32 +size 33023 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset index 6e49353..7c689dc 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12cf02437b66faec6ffca53ba49d578e542de0da647ffb77b26eb2efa2c39f87 -size 481494 +oid sha256:e1958a596d2b9fe6c88023b9ebe34ce07fd67f69ae02c30b5334e99774a7fdf3 +size 487496 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset new file mode 100644 index 0000000..129d521 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2d09c105333d0a56ab5e7ea87f168b28e89a448cbea3f95c28d8b86894a12a7 +size 55646 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset new file mode 100644 index 0000000..ddf673c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e22ef3b6c3dbb4b0e7de6e5fb158b3bee7a5592633a85baa8c328b1204e6bea5 +size 64580 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset new file mode 100644 index 0000000..6c8f79d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b16ee2b42c8bdfa67f194beab2e8a163f1b17a88a024d51e86984aa8ea208c79 +size 329876 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset new file mode 100644 index 0000000..f805aac --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de6f0b756fb8bf1ae6aaf7fbd8bd15aece0ea1ede2025cc137574e2e109ca280 +size 93992 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_DIffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_DIffuse.uasset new file mode 100644 index 0000000..bc2e8a5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_DIffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f23ee348164da089805eb828d216716cb8adc435d2603fe4ede80b667cd6115 +size 724876 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_MetallicRoughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_MetallicRoughness.uasset new file mode 100644 index 0000000..ea7a11d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_MetallicRoughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2feda9d9a9fe93b55d7e377d8402c06cad1d021089106f1cb2d0c5e6d3dd571 +size 574016 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset new file mode 100644 index 0000000..c1558cc --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01004fafd95fbf25434df15d7ae2f6cf88067e0abadde846d631e3d236f9d704 +size 66450 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet2.uasset new file mode 100644 index 0000000..cafffa4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7eb25ac38c6daef9f82c796369ae2b9394cb9016f4a5c68e9b2d4b93627f4dc1 +size 113248 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet3.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet3.uasset new file mode 100644 index 0000000..86ffcea --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:009c3f49798cbc5e3d328eef94df2df23e300f523cf61d278dbe1cfbf8d9fa68 +size 126484 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet5.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet5.uasset new file mode 100644 index 0000000..091642d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet5.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9d44add24375c6d9ec9dbce7fa1dc66182d7f959c15d3e3159b485714262757 +size 284044 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset new file mode 100644 index 0000000..b358b09 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72342dae949c1feef815a626cc36e4c6b2b9bc62c2d2007b00a2b28015ffa477 +size 738542 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset new file mode 100644 index 0000000..cc57b4b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6119d5e296e9ab70fd7b368cfb9f0dc2e06da92c36c76fcff0654ef1be3ae283 +size 1002500 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset new file mode 100644 index 0000000..3487df5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb9116c9feeca4b4ed09f1f1595c631c4032b8055432828130c8bd172c6312f2 +size 4272107 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset index 5879891..c716d91 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3db99065b2fe5879ff5f910187739ce6c7e9f67c3b8edeb40a9c54eb5ac059e8 -size 46235 +oid sha256:60071572f670ee4b8a237c196a577737790eeaec6d749e346fbe526212ee3b3a +size 46595 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset index d39a513..a1e8616 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e81a427d2c28a053bf56947a0e949a0fa983dde3fb8c9afc0a467581cdd2d657 -size 281310 +oid sha256:426dcbfd215af08355194c79ef9f4415ffed91cd3abde450af27d4ec1fb83710 +size 282744 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset index d7c2137..d44d9a7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fd32a9c605a8220a6aa51e5f8c036c4ea2b8238a78226555ec90723759c5015 -size 95952 +oid sha256:35eee5225458e960c04086601eb12d3711bb0c0d87c0013cb79c999822a3db30 +size 96928 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset new file mode 100644 index 0000000..4f84eb1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88e5511da45f9c767dc8a3862393440768c93ebe8d08de6c0551d4354125450f +size 18078 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Diffuse.uasset new file mode 100644 index 0000000..b9b4482 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a00bd70901d60e1fd52360a65a469663f15e384eae1c2e2007124093ecaceb2 +size 4321656 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Disp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Disp.uasset new file mode 100644 index 0000000..f33aae8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Disp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a609995ca8e419822f9f9488271f84fa3f1e6e1f008b13d304f7d974d7f971e +size 3363105 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Normal.uasset new file mode 100644 index 0000000..a747bb6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed72b6deb623ffef59955c946fb35dfecbbd7c8b06b0c9a2060b88fbd72dbacd +size 15165842 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Rough.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Rough.uasset new file mode 100644 index 0000000..24d0d88 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Rough.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae29dff904be5e647a93c63d66b7d41eb63a808fc6e4c221c882c8347f154403 +size 6847342 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset index 833e29b..2c72e05 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1105a28001bc8fd40ec297dbe8b18354c9e1f2083fa1ff39d3e487cbfd18c1ec -size 85041 +oid sha256:74886fbb9fadcd8a31264e93300aca8c814bb8c8a525f6069e3d425a0f646b75 +size 85221 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset index 4b9e85c..c60faaa 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83228700a68db0ca3222b3f0e9575f1b8128c5364f98a9ee2214b5cea4497e11 -size 10304 +oid sha256:0b6ad160cb6555d8c0cf733f29eb448a85458cf64a300424a58a49c6bfaf7b10 +size 10425 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset index f345516..362ad4f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:917270dad13bb2815bac6e61110d01307f2b1dbf89854571fda896550bb5083a -size 10449 +oid sha256:341129f9ab108cd8aaa96d4c50705a4cc6afea6f4efcac99f4eac8a775e568e0 +size 10463 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset index d5b3907..9822d25 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21b25d1b713adb16b47bf7e90572d2f80f7fcff522ad2202b6281ab5a0d9f3c0 -size 14335 +oid sha256:a0b507de9ea6dcda792deafae7a5ae1c47d00ac8bd100758effa297a5be93a43 +size 12088 From 430931a14c70f9922de1d49db329f7f8cc6fd750 Mon Sep 17 00:00:00 2001 From: Waldo Date: Wed, 1 Oct 2025 21:42:24 +0200 Subject: [PATCH 42/56] Toilet/Vent --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../VRE/Grippables/Misc/Examples/Door/DoorActor.uasset | 4 ++-- .../World/Interactibles/Bathroom/BP_ToiletStall.uasset | 4 ++-- .../World/Interactibles/Bathroom/VentCover/VentCover.uasset | 3 +++ ...r_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset | 3 +++ .../VentCover/modular_airduct_rectangular_01_vent_02.uasset | 3 +++ .../VentCover/modular_airduct_rectangular_01_vent_021.uasset | 3 +++ ...ular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset | 3 +++ 8 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/VentCover.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_021.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index e9b20f5..916d034 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45822db0e5d0bc99293fe6446249a52ed3dd8a447bfc6c711cde7079a90dd432 -size 599606 +oid sha256:6c3e4f0db0ab1823818b6207bd1468db603b18aa8066dcd22da316a5bb688e20 +size 599263 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset index 7c689dc..f1819e4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1958a596d2b9fe6c88023b9ebe34ce07fd67f69ae02c30b5334e99774a7fdf3 -size 487496 +oid sha256:b3d1125030db3a7cd7bfd6bc86c5b994c9f66027e25a6ec7d8bbb34afe5dd340 +size 487554 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset index 129d521..2037de1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2d09c105333d0a56ab5e7ea87f168b28e89a448cbea3f95c28d8b86894a12a7 -size 55646 +oid sha256:390c2cc95271f0821bd73275a6b81764ec8ac7224992324cd5516b0d6ec2c1b4 +size 56996 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/VentCover.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/VentCover.uasset new file mode 100644 index 0000000..16f4826 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/VentCover.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0771a1d2cf8f81bc6fe9d36e77ef3ce0358c769f94fc439a27a868e3cc89216e +size 94612 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset new file mode 100644 index 0000000..a7bce06 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d9c5522ff4cbbbbc8f86c867c798b8360fb71a27b4ba47f510212ee2c877ac1 +size 667163 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02.uasset new file mode 100644 index 0000000..c30e4c9 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83bda038faf4a1b42246df052c8bfbeb3072c07c677ba92d029d9eb6e361bc5f +size 3246449 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_021.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_021.uasset new file mode 100644 index 0000000..6e894df --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_021.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3a1b62fc9fb600d7344f06d944d88d1cc90e892e1ef7fdb32458a0fafa2ba8d +size 1356330 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset new file mode 100644 index 0000000..051966c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8554a96abf5ae82bf9f369a5b04211f6099c7c8fde3dc7200b6e5d7b3feb74e7 +size 67887 From a1fcabcc3c56baa9119739ac563a02b830b735f9 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Thu, 2 Oct 2025 14:53:34 +0200 Subject: [PATCH 43/56] ToiletDoor --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/Door.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/Frame.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/Handle.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset | 3 +++ .../Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset | 3 +++ .../Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset | 3 +++ ..._Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset | 3 +++ .../Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset | 3 +++ .../Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset | 3 +++ .../Furniture/Doors/MetalDoor/BP_SliderDoor.uasset | 4 ++-- 15 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 916d034..5271aa4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c3e4f0db0ab1823818b6207bd1468db603b18aa8066dcd22da316a5bb688e20 -size 599263 +oid sha256:b36a0dd37aa6e34107557c3337350664967b464155104d8540b315943b13efbd +size 610381 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset new file mode 100644 index 0000000..90bb4ad --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd598ab60787ecb0d365fbdfa978704b62c62b7f4821cb97ab331d0b759229c4 +size 79654 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset new file mode 100644 index 0000000..2eba228 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c09236bc3056e6220363b3aad38bdf0b0e935ff5b941ce19570ee9dd90ec35c +size 80441 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset new file mode 100644 index 0000000..b20f62d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17ca1250f4446e72806e0ebdfd35d545d6ca49c5c25186eecea56542b9153697 +size 93876 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset new file mode 100644 index 0000000..8e23a05 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ae37cd3ca30c9a167f83ffcf5fd77b404df79c8530b03b8104a4e805f142e9f +size 470326 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset new file mode 100644 index 0000000..087e8b9 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b622605da357183fffef914f9345b98f81e0b6380b1768208329741adf34a65e +size 80298 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset new file mode 100644 index 0000000..eb0b276 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8765580d28055f2d020c880ab24049864f69878f52b0ae7081292d89a37618a7 +size 88660 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset new file mode 100644 index 0000000..bcea0f5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:434cde1f535529500ebd4788ba34cf889db00cd6068c71209b85847b875729c8 +size 87239 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset new file mode 100644 index 0000000..32237b9 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a481fcb0c73888fd8cdd1cf6d407940a25527f34f056fbdad3e4ac0ca4ac15b +size 80306 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset new file mode 100644 index 0000000..91b3ee5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b9c74262f82b5a65c6dacd0279cc4fbf40e5dd7b5446abad576fbb8bcb145b8 +size 85069 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..3609d78 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a257e9e61f01f54fb0383cba9027c37264295e2dcda47ed83b1be0bba935be97 +size 7649597 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset new file mode 100644 index 0000000..ea10a59 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3507a2805906f92412841f9f0792b3463f371457206974225ba832df260a9739 +size 284360 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset new file mode 100644 index 0000000..cebe21f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf0497b2f52b02263c675a85e736bbc1b5d731b7659a44c4e99cfbe69b8cbbf5 +size 78257139 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset new file mode 100644 index 0000000..f640cca --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfca4bf79540ce2460e46db197430ac8dc14ef65db83044d0707c09745c0ecb2 +size 64372 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset index a1e8616..aab8616 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:426dcbfd215af08355194c79ef9f4415ffed91cd3abde450af27d4ec1fb83710 -size 282744 +oid sha256:3ac8d8b42c93cc2b7d7c11a967b134f6b5160fd5ba23aa527c7800cfa31bd2be +size 288742 From 832840f1d6574cb43a110d591e85717e353f51ca Mon Sep 17 00:00:00 2001 From: Waldo Date: Mon, 6 Oct 2025 22:12:50 +0200 Subject: [PATCH 44/56] that damn door --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Misc/Examples/Door/BP_DoorTestFromScratch.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/Door.uasset | 4 ++-- .../World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset | 4 ++-- .../World/Interactibles/Bathroom/ToiletDoor/Frame.uasset | 4 ++-- .../World/Interactibles/Bathroom/ToiletDoor/Handle.uasset | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/BP_DoorTestFromScratch.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 5271aa4..635ba0f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b36a0dd37aa6e34107557c3337350664967b464155104d8540b315943b13efbd -size 610381 +oid sha256:c6ab145796d899b6c16046601284241af8fc7dd2d5f27d8c0c4f4afa83bf3571 +size 612872 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/BP_DoorTestFromScratch.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/BP_DoorTestFromScratch.uasset new file mode 100644 index 0000000..fae573d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/BP_DoorTestFromScratch.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b4e347ddb8cb4fe35023e71d20db43b590d7c988ff8abb59568e52b0fbbdadd +size 72208 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset index b20f62d..d24fde2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17ca1250f4446e72806e0ebdfd35d545d6ca49c5c25186eecea56542b9153697 -size 93876 +oid sha256:e7ec1ad715daa014b42c9c9b34f9e092aa9592830e1b5a5314e6599ce6c3eff0 +size 85284 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset index 8e23a05..bd20594 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ae37cd3ca30c9a167f83ffcf5fd77b404df79c8530b03b8104a4e805f142e9f -size 470326 +oid sha256:df12dbad5bbf7f73a1bfcc2f03df1f239b81778801124b77d18a00221b34b66d +size 478805 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset index 087e8b9..504a2f0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b622605da357183fffef914f9345b98f81e0b6380b1768208329741adf34a65e -size 80298 +oid sha256:6c8e9c3ff1c75be82dd616fac4677171861909f30ac626961ef205f29f7611d9 +size 86558 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset index eb0b276..6f21205 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8765580d28055f2d020c880ab24049864f69878f52b0ae7081292d89a37618a7 -size 88660 +oid sha256:8986a1a730bda1c474b2f90318840ae2a4b79082a28c3e8cd372e6f7b236c8f8 +size 88370 From 51872c65caa13f20a86d4591712349ff6b7b3ddb Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 7 Oct 2025 16:25:35 +0200 Subject: [PATCH 45/56] Wnated to build a hole System for Landscapes but 5.6.1 has an RVT Error, Fixed ToiletDoor (Disable Collision with parent seems to be buggy) https://www.youtube.com/watch?v=ot6ty5cETtU https://forums.unrealengine.com/t/instanced-stereo-broken-in-5-6/2567930/10 --- .../Development/RVT_LandscapeHole/RVT_HoleHeight.uasset | 3 +++ .../Content/Development/RVT_LandscapeHole/RVT_HoleMat.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Outside_Default.umap | 4 ++-- .../Content/Maps/Map_Stream_MachineRoom.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap | 2 +- .../Materials/Landscape/BP_Landscape_HoleCutter.uasset | 3 +++ .../Content/Materials/Landscape/M_LandscapeMaster.uasset | 3 +++ .../Content/Materials/Landscape/M_LandscapeMaster_Inst.uasset | 3 +++ .../Content/Materials/Landscape/M_LandscapeOpacityMask.uasset | 3 +++ .../Content/Materials/MF/MF_CreateLayerOnLandscape.uasset | 3 +++ .../Content/Materials/MF/MF_LandscapeMaterialHoleMix.uasset | 3 +++ .../Content/VRE/Core/Character/BP_Trace_Controller.uasset | 4 ++-- .../Misc/Examples/DrawerBase/Locker/M_Locker.uasset | 4 ++-- .../World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset | 4 ++-- .../World/Materials/StoneTiles/Test_WS_Parallax_Wall.uasset | 4 ++-- 16 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleHeight.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleMat.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/BP_Landscape_HoleCutter.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster_Inst.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeOpacityMask.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_CreateLayerOnLandscape.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_LandscapeMaterialHoleMix.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleHeight.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleHeight.uasset new file mode 100644 index 0000000..07ca792 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleHeight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1dc7f17230cbdc6d287df8fee4c749b5e4b8f785fbf9b2020d5858ddca422123 +size 1505 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleMat.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleMat.uasset new file mode 100644 index 0000000..9f2fdbb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleMat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:986b943a27d8cc8526b1ddfdbaffad58d8e49be0bbf78acd735a498922a69a17 +size 1540 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 635ba0f..ec81455 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6ab145796d899b6c16046601284241af8fc7dd2d5f27d8c0c4f4afa83bf3571 -size 612872 +oid sha256:e9b2700857799d586fb670c62f0b5a7524837eadcf512d0c2f554c505c1ffb1a +size 1087852 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index 1e5bb82..c25b37f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f73771a77db67bdc9dbb75e6a65a9173b19703405c3a3762f6988c4978a912a -size 25547 +oid sha256:1c61e50486db91f7fbc83afe5c60a0491eb22bb81a7750cab9381e236c13a963 +size 1380057 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap index b301d42..ae1df10 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f192977603d6dc809d5f07d0b161b9cc996bcbb2a9954ebc1eee01671a75847 -size 27574 +oid sha256:6e5629b4d2c22960d6585cd39272bb75b086dab977348d3113ce56191bf4636e +size 25303 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index 55db0cb..77dfc15 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5aed6ea422ac32c85544a56442bf480d30f3720863483305c356db14a313421e +oid sha256:427089ee3d061f71dcf26e27fe04c594ed398168bf1a03707b56cde687c78112 size 67378 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/BP_Landscape_HoleCutter.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/BP_Landscape_HoleCutter.uasset new file mode 100644 index 0000000..9a84d88 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/BP_Landscape_HoleCutter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08a40b6bf9353bbb813519fcb4c2ec39e902a19c0f1cf5c1db4e69123ddd1c68 +size 44284 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster.uasset new file mode 100644 index 0000000..69f740f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e73ef5751f5776d993142510a184be5e8580c08f1ed388137a833f1d1308fe21 +size 62571 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster_Inst.uasset new file mode 100644 index 0000000..5ef22f3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df5372da9f67a7d877e0f2a10e485f730710250301ead314ee26f356e2ec7ed3 +size 16687 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeOpacityMask.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeOpacityMask.uasset new file mode 100644 index 0000000..35ab30f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeOpacityMask.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c5defcbf707f4092d44f9ee00a15f28bcfae917f3e614bf2bd01cb964ba7cd6 +size 12095 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_CreateLayerOnLandscape.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_CreateLayerOnLandscape.uasset new file mode 100644 index 0000000..4a7509c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_CreateLayerOnLandscape.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8d999ca8e127e550cdce2bbef88f5ac6f57d568c3bec26da85ffb081791d91c +size 24958 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_LandscapeMaterialHoleMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_LandscapeMaterialHoleMix.uasset new file mode 100644 index 0000000..7363869 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_LandscapeMaterialHoleMix.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1570061b3549a9ce0c44ef525a25ff9206d1db4f7b93fd085de6ceee23332ffc +size 13836 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index da3c0dd..84c3542 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79ea2cb15147467708c959c95b8d61fea566034a005d62846c6cc2fd80f5d8d1 -size 1809889 +oid sha256:2d095db632a6a9b9eb75a3bb9aaa04a89d3e4acfeb0e6e14d45c3f468ec9aa89 +size 1836020 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/M_Locker.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/M_Locker.uasset index fd7235e..bc22426 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/M_Locker.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/M_Locker.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5343abd4bee92aca2405ff3a7dc4199556e6bcca0d9e7451efac46e74b118a4f -size 16701 +oid sha256:746bb79c7a4ce701d92bbb03a489de434f7daab2d315833b1a053b631f46ae2d +size 16333 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset index bd20594..ce6d689 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df12dbad5bbf7f73a1bfcc2f03df1f239b81778801124b77d18a00221b34b66d -size 478805 +oid sha256:fdd1e411fafce371689e52f6772a61968e2851b11b093bd5501f31999286531b +size 479677 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Wall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Wall.uasset index 388247a..d56bab0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Wall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Wall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb72abb04a8207e826d3d686390a81a15166620bdfb7a59740e171e808ada8cc -size 16360 +oid sha256:8f0d8ab330ef1a7f4e6bb1cd0307d2c818c6f676d93b02a7dac3b7cdf11af646 +size 16786 From 0587b8041ec1176d8bb84ec456bb1e097c00f64d Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Thu, 9 Oct 2025 17:56:42 +0200 Subject: [PATCH 46/56] Working Toilet Door, Accessories --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Outside_Default.umap | 4 ++-- .../Content/Maps/Map_Room_Kitchen.umap | 2 +- .../Content/Maps/Map_Stream_MachineRoom.umap | 2 +- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Content/Materials/Landscape/M_LandscapeMaster.uasset | 4 ++-- .../World/Interactibles/Bathroom/BP_ToiletStall.uasset | 4 ++-- .../PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset | 3 +++ .../PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset | 3 +++ .../PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset | 3 +++ .../Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset | 3 +++ .../Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset | 3 +++ .../Bathroom/PaperTowelDispenser/model_1_Baked.uasset | 3 +++ .../Bathroom/SoapDispenser/Cube_002_Baked.uasset | 3 +++ .../Bathroom/SoapDispenser/Cylinder_Baked.uasset | 3 +++ .../SoapDispenser/MergedBake_Bake1_PBR_Diffuse.uasset | 3 +++ .../Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Normal.uasset | 3 +++ .../SoapDispenser/MergedBake_Bake1_PBR_RoughnessAlpha.uasset | 3 +++ .../Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset | 4 ++-- .../Interactibles/Bathroom/ToiletDoor/DoorActor2_Back.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset | 3 +++ .../Interactibles/FreezingChamber/BP_FreezingChamber.uasset | 4 ++-- .../Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset | 4 ++-- .../Content/World/Materials/PostProcess/M_PP_Fog.uasset | 4 ++-- .../Content/World/Materials/PostProcess/M_PP_Fog_Inst.uasset | 4 ++-- 29 files changed, 72 insertions(+), 24 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_Baked.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cube_002_Baked.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cylinder_Baked.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_RoughnessAlpha.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Back.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap new file mode 100644 index 0000000..47ea32c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08f1fc0920bafce6ffa1dca65bcdf3bba87c2eec6002758aff49720201ce8c1c +size 96346 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index ec81455..668a073 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9b2700857799d586fb670c62f0b5a7524837eadcf512d0c2f554c505c1ffb1a -size 1087852 +oid sha256:ea451d7b8f74de2295a29b6e42d9bc6ce732c2c0cbbf7694c659cbc59c60a317 +size 2360267 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index c25b37f..2ec8b0f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c61e50486db91f7fbc83afe5c60a0491eb22bb81a7750cab9381e236c13a963 -size 1380057 +oid sha256:269ecfd9a141be5e244bc51789842ad47c30dc2b018c596635748cf925ce365d +size 49533 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index 3131d43..ccdcd01 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9106117042bbb9ba257f1b4187ad889617e2aadfaf5d3df4bb5bad37d2960626 +oid sha256:f7fded5edc37dcca5380b3feb781663bff1c9c54bb6adc0533e98d28639c8df2 size 157733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap index ae1df10..3a7759f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e5629b4d2c22960d6585cd39272bb75b086dab977348d3113ce56191bf4636e +oid sha256:7103b941779f348f51e70d607a3f4eac190a54b51d1e4722e9d2d51e6fe245d6 size 25303 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index 77dfc15..f8071dd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:427089ee3d061f71dcf26e27fe04c594ed398168bf1a03707b56cde687c78112 -size 67378 +oid sha256:5e6afde349c7099767969504cf882c45704f7d5d5ae16051b315cffa97c2c985 +size 116840 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index e903e9b..1067954 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c73423074c0aee5ca6a873e5e92ffdb0c75f86be843d1ce7e2b7ab3397513f9 -size 153583 +oid sha256:12fc2da1aacb29e6a779c54ea6c4d22c1b19c9f043cd89de6097795ad797876d +size 153270 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster.uasset index 69f740f..64a89e1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e73ef5751f5776d993142510a184be5e8580c08f1ed388137a833f1d1308fe21 -size 62571 +oid sha256:73b807adb3612186038be0130fa75b9ba1814b028de17784300d4c9da40eccee +size 62623 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset index 2037de1..51cb93f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:390c2cc95271f0821bd73275a6b81764ec8ac7224992324cd5516b0d6ec2c1b4 -size 56996 +oid sha256:87d07165b515ed83742cbd48029f3480357c868688a1393e5d9e2a0c1dc6c9c9 +size 62447 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..53e2975 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:079e212c2815357f271573c0c38900ba4bbf180c84dbef7d41ab11b6e2cd6895 +size 1097672 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset new file mode 100644 index 0000000..3c4580f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0847a6c643d9e0109c0f0dbb1d3f97a60bc8be62aea8f1de1b58ced22651d6e9 +size 8332008 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset new file mode 100644 index 0000000..6459b0d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7aa8d1f1ff2ea52ea6e83a3ba733869028980b9cfe7f6f98992c3ac275400da7 +size 337713 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset new file mode 100644 index 0000000..17b55f3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b45f707449aa8ecd33130da2a1c78fa42bcc1969a0e03b8648c7eea5cac777c1 +size 67210 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset new file mode 100644 index 0000000..ef50809 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffe969a0494445923c5c012ab23685c070a33b4ce964b3a6ca63848bfdd97049 +size 92606 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_Baked.uasset new file mode 100644 index 0000000..a99a624 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_Baked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:622df9143d7949998b44453e3de1f9231a69850b718430b7fc08fdbe22f3a404 +size 99112 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cube_002_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cube_002_Baked.uasset new file mode 100644 index 0000000..4687e4f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cube_002_Baked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7cee96c15123414f82d5dad0ce473fde8c9c5236ff107a3f7b8d5c5fb3f1ba5 +size 85732 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cylinder_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cylinder_Baked.uasset new file mode 100644 index 0000000..3f37b53 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cylinder_Baked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9d7c8bc4fbc688f86703609f900ff20aee561f762c22e6ee78ef9b54c765a75 +size 98844 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..438e64e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cf06a4392d347d952408d4f5d9f0e12e1c29c237ef63266b0ad14c225fe7325 +size 2000327 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Normal.uasset new file mode 100644 index 0000000..49a51bd --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33775088d82465a559cdf268306908844d5159a587310ad4e05552800d68b9af +size 1564509 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_RoughnessAlpha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_RoughnessAlpha.uasset new file mode 100644 index 0000000..955a504 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_RoughnessAlpha.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a0544fad49f2ec09c01b172a3168da69d7d9a29e91d4c56227f5b5e7c687284 +size 513531 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset new file mode 100644 index 0000000..57e4dab --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9221339532cc9eb8ae839e4e365e8561ddb0421c7c4a7d7f4b425591b194b287 +size 12539 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset new file mode 100644 index 0000000..d5a2593 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fed2b9977a0dfb444df0328444ec6f6176b4abdd3e2656bb3c58d5dea2412df +size 73733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset index ce6d689..57a4c85 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdd1e411fafce371689e52f6772a61968e2851b11b093bd5501f31999286531b -size 479677 +oid sha256:b3059bfe30a3df1fc9a59d052c6577c033a6a55931aa633be09e4c9a0598490c +size 622041 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Back.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Back.uasset new file mode 100644 index 0000000..23b3499 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Back.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4c90791cf05c7615d2a5fff6398449e47ca6d840ecb448789041747ffbdd1f5 +size 560221 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset new file mode 100644 index 0000000..8c1ec63 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f57e14f33c4064d48fcb0181e5deed8f38d7f7953f4d00290554578155cb7d7 +size 73433 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset index cfa660f..36f5b81 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23538d57a83ac11c0f2fdabea3085f256652a2f7e121848ba6c8559f04b5eae3 -size 68974 +oid sha256:a4f9750441040040acf16f0a0012cc37b79fba1f3d510642f62469976e5c119b +size 70464 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset index 8eeb09f..c59e8d0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3171c5301373268d78c2a5be30b04559981e9398069bc29a02c84df36b3eaa59 -size 24723 +oid sha256:5e5a7dc82132312d38f6b8d3b82da3d98f9977ecaa880bf4120346b0fe6e68a0 +size 25364 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog.uasset index b096767..6a693ac 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11df8c1bdf5ed7ec40cffc9ec5643e731957b05aa06728f4e24d6206466e1ab1 -size 12643 +oid sha256:1986572596dd3dd83aa15fe8b82317814c7715de594976db88827c68317b9125 +size 15277 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog_Inst.uasset index 279db4c..8272ee8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f76164826eebb8d00c281360409f8aabc4778b5220a08adcf3bc7f7ec9e4096b -size 8102 +oid sha256:997d38f83d4e47ba9e136fe712ed82690f5e0b19b968743dd9025a35cca95dad +size 9163 From 0f1e7c46cc454684f7fff579fe214e80d46ac8c0 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 10 Oct 2025 16:11:38 +0200 Subject: [PATCH 47/56] SoapDispenser/Trashcan --- VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini | 1 + VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Outside_Default.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../World/Interactibles/Bathroom/BP_ToiletStall.uasset | 4 ++-- .../Bathroom/SoapDispenser/M_SoapDispenser.uasset | 3 +++ .../Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset | 4 ++-- .../World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset | 3 +++ .../Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset | 3 +++ ..._Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset | 3 +++ .../Bathroom/Trashcan/MergedBake_Baked_003.uasset | 3 +++ .../Bathroom/Trashcan/trash_can_plastic_0_034.uasset | 3 +++ .../Bathroom/Trashcan/trash_can_plastic_0_035.uasset | 3 +++ .../Bathroom/Trashcan/trash_can_plastic_0_036.uasset | 3 +++ .../Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset | 4 ++-- 16 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/M_SoapDispenser.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Baked_003.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_034.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_035.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_036.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini index f2a337e..ea57d2d 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini @@ -174,6 +174,7 @@ bSendAnonymousUsageDataToEpic=False +DefaultChannelResponses=(Channel=ECC_GameTraceChannel5,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="UI") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel6,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="CharacterSphere") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel7,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="CharacterProp") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel8,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="SPUDStreamVolume") +EditProfiles=(Name="PhysicsActor",CustomResponses=((Channel="VRTraceChannel"))) +EditProfiles=(Name="BlockAllDynamic",CustomResponses=((Channel="VRTraceChannel"))) -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap index 47ea32c..0a0d0c8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08f1fc0920bafce6ffa1dca65bcdf3bba87c2eec6002758aff49720201ce8c1c -size 96346 +oid sha256:2d5ab2b68bd4fc3251b71ae554a77de240cc0a52202d9c7774fd65c028d97066 +size 83335 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 668a073..1616489 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea451d7b8f74de2295a29b6e42d9bc6ce732c2c0cbbf7694c659cbc59c60a317 -size 2360267 +oid sha256:4d5831d5a93eef80fc503f5b2cc4ba8f2aafcf44fa6410ae48ec100f94385474 +size 2365647 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index 2ec8b0f..1936031 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:269ecfd9a141be5e244bc51789842ad47c30dc2b018c596635748cf925ce365d -size 49533 +oid sha256:17ea77def7820dd131990b5790c7b9567539e287539923d9f77b6dbc9f635d77 +size 79137 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 1067954..0273de7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12fc2da1aacb29e6a779c54ea6c4d22c1b19c9f043cd89de6097795ad797876d -size 153270 +oid sha256:84d9140e1061d2334e27d572dd66dbe5b89e595ccb5cd84f7078a300e75347d2 +size 152900 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset index 51cb93f..7f8097b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87d07165b515ed83742cbd48029f3480357c868688a1393e5d9e2a0c1dc6c9c9 -size 62447 +oid sha256:9c1146572bd5efab6814af79486a614b97fac74c7dd20046e72cdf2eba9db61b +size 68838 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/M_SoapDispenser.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/M_SoapDispenser.uasset new file mode 100644 index 0000000..c76f182 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/M_SoapDispenser.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fd3693adafdd15bb822c88ca4c6263a07818ea1287d000e2e46859f5e2561b1 +size 22808 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset index 57e4dab..29c70de 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9221339532cc9eb8ae839e4e365e8561ddb0421c7c4a7d7f4b425591b194b287 -size 12539 +oid sha256:9ba83be8420ebff1e78c3b07db8079f19d8394d78b1cad11c00b9dd8f351a721 +size 1449 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset new file mode 100644 index 0000000..5dd4a34 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5eaebff80810a0a9603d3cdfafd9807283a2802af20d2cc72538202d85d21f7c +size 38143 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..3c09379 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e26c5d6d75b9e12d15fb125ec417740c1e0464de8403c9bef5a5d04d6362a4bb +size 63180 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset new file mode 100644 index 0000000..b328fcd --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c56bd6607e623397c291e11c491ab1634ed4e724444ae01415f836436eb3050 +size 74061 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Baked_003.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Baked_003.uasset new file mode 100644 index 0000000..1dbfce7 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Baked_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa732084936bd69e0b5e546045bca53f1eb17e20c207f12dd1140dcba27aa2e3 +size 64427 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_034.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_034.uasset new file mode 100644 index 0000000..69e5d24 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_034.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c27f72edf70b139ed4fcfa1809ffc85c50f927234d2faaa5847020649971e5f +size 130341 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_035.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_035.uasset new file mode 100644 index 0000000..df4bb0a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_035.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85392db890859b5caac6360f86f5637ff95fb9990c44c1cd55b4e8776a4136a5 +size 133828 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_036.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_036.uasset new file mode 100644 index 0000000..89ab00c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_036.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bc0d1fc753d5f1f16faa3f315297440f97dc75f140cf0597b115a5b85ec9eb8 +size 75211 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset index 4f84eb1..b5274b4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88e5511da45f9c767dc8a3862393440768c93ebe8d08de6c0551d4354125450f -size 18078 +oid sha256:dcca3439d50df69b67c26a8b431779f00f8aa74e7ffc6177dfb30265b2ed023c +size 17852 From 51520c49b9640a7de4ab54843fea5dda3d562e8e Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 24 Oct 2025 17:15:28 +0200 Subject: [PATCH 48/56] Worldbuilding, Optimization, Blended Hand Interaction (Rubberduck) --- .../Config/DefaultEngine.ini | 1 + .../Core/Functions/CommonFunctions.uasset | 4 ++-- .../Content/Development/Ivy.uasset | 3 +++ .../Content/Development/M_Ivy.uasset | 3 +++ .../ScifiDoor2/BP_ScifiDoor2.uasset | 3 +++ .../Development/ScifiDoor2/M_ScifiDoor2.uasset | 3 +++ .../ScifiDoor2/SM_DoorLeft_Baked.uasset | 3 +++ .../ScifiDoor2/SM_DoorRight_Baked.uasset | 3 +++ .../ScifiDoor2/SM_Frame_Baked.uasset | 3 +++ .../ScifiDoor2/T_ScifiDoor2_D.uasset | 3 +++ .../T_ScifiDoor2_MetalRoughEmission.uasset | 3 +++ .../ScifiDoor2/T_ScifiDoor2_N.uasset | 3 +++ .../Content/Maps/Map_Bathrooms.umap | 4 ++-- .../Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Outside_Default.umap | 4 ++-- .../Content/Maps/Map_Room_Kitchen.umap | 4 ++-- .../Content/Maps/Map_Stream_MachineRoom.umap | 4 ++-- .../Content/Maps/Map_Workspace.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Materials/MF/AlphaFromStencilValue.uasset | 3 +++ .../Content/UI/MainMenu/M_PP_MainMenu.uasset | 4 ++-- .../Core/Character/BP_Trace_Controller.uasset | 4 ++-- .../VRE2/Core/Character/BP_VRCharacter2.uasset | 4 ++-- .../Core/GraspingHands/GraspAnimBPManny.uasset | 4 ++-- .../Core/GraspingHands/GraspAnimBPManny2.bak | Bin 0 -> 619762 bytes .../GraspingHands/GraspAnimBPManny2.uasset | 3 +++ .../GraspingHands/GraspingHandManny2.uasset | 4 ++-- .../VRE2/Input/Actions/GripAxisRight.uasset | 3 +++ .../Input/Actions/UseHeldObjectRight.uasset | 4 ++-- .../VRE2/Input/VREInputMappingContext.uasset | 4 ++-- .../Bathroom/BP_ToiletStall.uasset | 4 ++-- .../Interactibles/Bathroom/Duck/BP_Duck.uasset | 3 +++ .../Interactibles/Bathroom/Duck/M_Duck.uasset | 3 +++ .../Bathroom/Duck/PHYS_Duck.uasset | 3 +++ .../Bathroom/Duck/SKEL_Duck.uasset | 3 +++ .../Bathroom/Duck/SKM_Duck.uasset | 3 +++ .../Bathroom/Duck/T_rubber_duck_N.uasset | 3 +++ .../Bathroom/Duck/T_rubber_duck_R.uasset | 3 +++ .../Bathroom/Duck/T_rubber_duck_toy_D.uasset | 3 +++ .../M_PaperDispenser.uasset | 3 +++ .../MergedBake_Bake1_PBR_Diffuse.uasset | 4 ++-- .../MergedBake_Bake1_PBR_Normal.uasset | 4 ++-- .../MergedBake_Bake1_PBR_Roughness.uasset | 4 ++-- .../MergedBake_Baked.uasset | 4 ++-- .../SM_PaperDispenser_Body.uasset | 3 +++ .../SM_PaperDispenser_Lid.uasset | 3 +++ .../T_PaperTowelDispenser_D.uasset | 3 +++ .../T_PaperTowelDispenser_N.uasset | 3 +++ .../T_PaperTowelDispenser_Roughness.uasset | 3 +++ .../model_1_001_Baked.uasset | 4 ++-- .../PaperTowelDispenser/model_1_Baked.uasset | 4 ++-- .../Bathroom/Plunger/BP_Plunger.uasset | 3 +++ .../Bathroom/Plunger/M_Plunger.uasset | 3 +++ .../Bathroom/Plunger/PHYS_Plunger.uasset | 3 +++ .../Bathroom/Plunger/SKEL_Plunger.uasset | 3 +++ .../Bathroom/Plunger/SKM_Plunger.uasset | 3 +++ .../Bathroom/Plunger/T_Plunger_D.uasset | 3 +++ .../Bathroom/Plunger/T_Plunger_N.uasset | 3 +++ .../Bathroom/Plunger/T_Plunger_R.uasset | 3 +++ .../Bathroom/Sink/SM_ToiletSink.uasset | 4 ++-- .../Bathroom/Sink/SM_ToiletSinkLever.uasset | 4 ++-- .../SoapDispenser/M_SoapDispenser.uasset | 4 ++-- .../Bathroom/Toilet/MI_Toilet.uasset | 3 +++ .../Bathroom/Toilet/SM_Toilet.uasset | 3 +++ .../Bathroom/Toilet/SM_ToiletLever.uasset | 3 +++ .../Bathroom/Toilet/SM_ToiletLid.uasset | 3 +++ .../Bathroom/Toilet/SM_ToiletSeat.uasset | 3 +++ .../Bathroom/Toilet/T_Toilet_D.uasset | 3 +++ .../Bathroom/Toilet/T_Toilet_M_R.uasset | 3 +++ .../Bathroom/Toilet/T_Toilet_N.uasset | 3 +++ .../Bathroom/Toilet/Toilet.uasset | 4 ++-- .../Bathroom/Toilet/Toilet2.uasset | 4 ++-- .../Bathroom/Toilet/Toilet3.uasset | 4 ++-- .../Bathroom/Toilet/Toilet5.uasset | 4 ++-- .../Bathroom/Toilet/Toilet_BaseColor.uasset | 4 ++-- ...et_Metallic_png-Toilet_Roughness_png.uasset | 4 ++-- .../Bathroom/Toilet/Toilet_NormalOGL8.uasset | 4 ++-- .../Bathroom/ToiletDoor/ClosePin.uasset | 4 ++-- .../Bathroom/ToiletDoor/DeadLockBase.uasset | 4 ++-- .../Bathroom/ToiletDoor/Deadlock.uasset | 4 ++-- .../Bathroom/ToiletDoor/Door.uasset | 4 ++-- .../Bathroom/ToiletDoor/DoorActor2.uasset | 4 ++-- .../Bathroom/ToiletDoor/DoorActor2_Test.uasset | 3 +++ .../Bathroom/ToiletDoor/Frame.uasset | 4 ++-- .../Bathroom/ToiletDoor/Handle.uasset | 4 ++-- .../Bathroom/ToiletDoor/HandleBase.uasset | 4 ++-- .../Bathroom/ToiletDoor/Indicator.uasset | 4 ++-- .../Bathroom/ToiletDoor/IndicatorBase.uasset | 4 ++-- .../Bathroom/ToiletDoor/LockPin.uasset | 4 ++-- .../Bathroom/ToiletDoor/M_ToiletDoor.uasset | 3 +++ .../MergedBake_Bake1_PBR_Diffuse.uasset | 4 ++-- ...lness-MergedBake_Bake1_PBR_Roughness.uasset | 4 ++-- .../MergedBake_Bake1_PBR_Normal.uasset | 4 ++-- .../ToiletDoor/MergedBake_Baked.uasset | 4 ++-- .../Bathroom/ToiletDoor/SM_ClosePin.uasset | 3 +++ .../Bathroom/ToiletDoor/SM_Deadbolt.uasset | 3 +++ .../Bathroom/ToiletDoor/SM_DeadboltBase.uasset | 3 +++ .../Bathroom/ToiletDoor/SM_Frame.uasset | 3 +++ .../Bathroom/ToiletDoor/SM_LockPin.uasset | 3 +++ .../Bathroom/ToiletDoor/SM_ToiletDoor.uasset | 3 +++ .../ToiletDoor/SM_ToiletDoorHandle.uasset | 3 +++ .../ToiletDoor/SM_ToiletDoorIndicator.uasset | 3 +++ .../SM_ToiletDoorIndicatorBase.uasset | 3 +++ .../ToiletDoor/SM_ToilletDoorHandleBase.uasset | 3 +++ .../Bathroom/ToiletDoor/T_ToiletDoor_D.uasset | 3 +++ .../ToiletDoor/T_ToiletDoor_M_R.uasset | 3 +++ .../Bathroom/ToiletDoor/T_ToiletDoor_N.uasset | 3 +++ .../Bathroom/Trashcan/BP_TrashCan.uasset | 4 ++-- .../Bathroom/Trashcan/M_TrashCan.uasset | 3 +++ .../MergedBake_Bake1_PBR_Diffuse.uasset | 4 ++-- ...lness-MergedBake_Bake1_PBR_Roughness.uasset | 4 ++-- .../Trashcan/MergedBake_Baked_003.uasset | 4 ++-- .../Bathroom/Trashcan/SM_TrashCanBody.uasset | 3 +++ .../Bathroom/Trashcan/SM_TrashCanLid.uasset | 3 +++ .../Bathroom/Trashcan/SM_TrashCanPedal.uasset | 3 +++ .../Bathroom/Trashcan/T_TrashCan_D.uasset | 3 +++ .../Bathroom/Trashcan/T_TrashCan_M_R.uasset | 3 +++ .../Trashcan/trash_can_plastic_0_034.uasset | 4 ++-- .../Trashcan/trash_can_plastic_0_035.uasset | 4 ++-- .../Trashcan/trash_can_plastic_0_036.uasset | 4 ++-- .../BP_TrashcanWithBag.uasset | 3 +++ .../M_TrashcanWithBag.uasset | 3 +++ .../SM_TrashcanWithBag.uasset | 3 +++ .../T_TrashcanWithBag_D.uasset | 3 +++ .../T_TrashcanWithBag_M_R.uasset | 3 +++ .../T_TrashcanWithBag_N.uasset | 3 +++ .../Bathroom/VentCover/M_VentCover.uasset | 3 +++ .../Bathroom/VentCover/SM_VentCover.uasset | 3 +++ .../Bathroom/VentCover/T_VenCover_N.uasset | 3 +++ .../Bathroom/VentCover/T_VentCover_D.uasset | 3 +++ .../Bathroom/VentCover/T_VentCover_M_R.uasset | 3 +++ .../Bathroom/VentCover/VentCover.uasset | 4 ++-- ...dular_airduct_rectangular_01_vent_02.uasset | 4 ++-- ...dular_airduct_rectangular_01_vent_02.uasset | 4 ++-- ...ular_airduct_rectangular_01_vent_021.uasset | 4 ++-- ...ctangular_01_vent_02_001_Baked_Baked.uasset | 4 ++-- .../Cabinet_1/BP_LibraryCabinet.uasset | 4 ++-- .../Furniture/Kitchen/BP_Kitchen.uasset | 4 ++-- .../M_RoundCeilingLampBath.uasset | 3 +++ .../SM_RoundCeilingLampBath.uasset | 3 +++ .../T_RoundCeilingLampBath_D.uasset | 3 +++ .../T_RoundCeilingLampBath_M_R_E_A.uasset | 3 +++ .../Content/World/Static/Plants/Ivy/Ivy.uasset | 3 +++ .../World/Static/Plants/Ivy/M_Ivy.uasset | 3 +++ .../World/Static/Plants/Ivy/T_Ivy_D.uasset | 3 +++ .../World/Static/Plants/Ivy/T_Ivy_M_R_A.uasset | 3 +++ .../World/Static/Plants/Ivy/T_Ivy_N.uasset | 3 +++ 148 files changed, 377 insertions(+), 124 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/Ivy.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/M_Ivy.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/BP_ScifiDoor2.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/M_ScifiDoor2.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorLeft_Baked.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorRight_Baked.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_Frame_Baked.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_MetalRoughEmission.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_N.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/MF/AlphaFromStencilValue.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.bak create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/GripAxisRight.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/BP_Duck.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/M_Duck.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/PHYS_Duck.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKEL_Duck.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKM_Duck.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_N.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_R.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_toy_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/M_PaperDispenser.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Body.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Lid.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_N.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_Roughness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/BP_Plunger.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/M_Plunger.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/PHYS_Plunger.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKEL_Plunger.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKM_Plunger.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_N.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_R.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/MI_Toilet.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_Toilet.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLever.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLid.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletSeat.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_M_R.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_N.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Test.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ClosePin.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Deadbolt.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_DeadboltBase.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Frame.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_LockPin.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoor.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorHandle.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicator.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicatorBase.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToilletDoorHandleBase.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_M_R.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_N.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/M_TrashCan.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanBody.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanLid.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanPedal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_M_R.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/M_TrashcanWithBag.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/SM_TrashcanWithBag.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_M_R.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_N.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/M_VentCover.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/SM_VentCover.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VenCover_N.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_M_R.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_M_R_E_A.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/Ivy.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/M_Ivy.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_M_R_A.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_N.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini index ea57d2d..27745ae 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini @@ -101,6 +101,7 @@ r.VirtualTextures=True r.Mobile.ShadingPath=0 r.DefaultFeature.LensFlare=False r.VT.AnisotropicFiltering=True +vr.RoundRobinOcclusion=True [/Script/NavigationSystem.NavigationSystemV1] bAutoCreateNavigationData=True diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset index afef8ff..7b2d789 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:feed9092b5e3fcb2f2f8841e7a96af8ef3b77c14b5b1a7b9ae4d42acc92c7b4c -size 233063 +oid sha256:b55811f013d43991e154158845cd8e0ba8df11bd507e998bcb17bbb925dd340f +size 294223 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Ivy.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Ivy.uasset new file mode 100644 index 0000000..bb09802 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/Ivy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63012ac61955d4a04e5704c2c111ed2600f822506cbae309384cee42c6e11f27 +size 1253 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/M_Ivy.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/M_Ivy.uasset new file mode 100644 index 0000000..7cbcc64 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/M_Ivy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:caf6bfb3cabc50fccc26afb2658ee2fbb5c5c626987e4a2dc8d2fe7adef107f5 +size 1265 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/BP_ScifiDoor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/BP_ScifiDoor2.uasset new file mode 100644 index 0000000..42f20e3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/BP_ScifiDoor2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:033ba4a6176682ccf602958c3d0e50867d125d0e7ee267c586920be661173b57 +size 108665 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/M_ScifiDoor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/M_ScifiDoor2.uasset new file mode 100644 index 0000000..dd53427 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/M_ScifiDoor2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65c96870d20a2ad14545e58f7ab9da67657e6c346e8023ea3ca9f556f6654f9d +size 18619 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorLeft_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorLeft_Baked.uasset new file mode 100644 index 0000000..a779928 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorLeft_Baked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:503bbe6e03538148c933f6babab436117bc510296f5b7a7010786d49d9185aa8 +size 84556 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorRight_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorRight_Baked.uasset new file mode 100644 index 0000000..bed88ac --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorRight_Baked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3fb721653521e583903e6e408db94f551450df044c47f3afdc5ec7e540e715e +size 129853 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_Frame_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_Frame_Baked.uasset new file mode 100644 index 0000000..2fc3837 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_Frame_Baked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d259a8129c362e9168f74347b77774edd466be9ae3772578875152b47beddc91 +size 92203 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_D.uasset new file mode 100644 index 0000000..e5f68fd --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fea751e7ae48715cfbe982b004149e42e18965086b427fce5b5b598a5208d5a9 +size 12591197 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_MetalRoughEmission.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_MetalRoughEmission.uasset new file mode 100644 index 0000000..918befa --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_MetalRoughEmission.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d66f07e5e09c82dd011f7caddeeacdd8868ec0770d0703d1bf31e837e7fb4b8d +size 1408401 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_N.uasset new file mode 100644 index 0000000..da04bd8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0fa2f83d172a5515170de61ebdfbd6b5a0d08a1f7112e3aa851af089b8b0e8d +size 69144684 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap index 0a0d0c8..0d4fbb3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d5ab2b68bd4fc3251b71ae554a77de240cc0a52202d9c7774fd65c028d97066 -size 83335 +oid sha256:4b633da6ff1c803bf6d86fc39ca1fb64901702afe896cf1bee0e4d14baf55b19 +size 125489 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 1616489..3ed4b58 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d5831d5a93eef80fc503f5b2cc4ba8f2aafcf44fa6410ae48ec100f94385474 -size 2365647 +oid sha256:ab655cee8b4b3c15cd8bd6b5e048e6a70c64611cbf5846d6e0e827151f092c17 +size 582439 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index 1936031..e6091cf 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17ea77def7820dd131990b5790c7b9567539e287539923d9f77b6dbc9f635d77 -size 79137 +oid sha256:670741ed3bf3b98620575125de1e864bf944a2b9c01076844c534ada60fd91a9 +size 1417963 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index ccdcd01..a32967b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7fded5edc37dcca5380b3feb781663bff1c9c54bb6adc0533e98d28639c8df2 -size 157733 +oid sha256:ceebdf0446315e8f2b7eef12d3ef8485dfd4ce463ba44785a028fe009982cf73 +size 144122 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap index 3a7759f..7bbc994 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7103b941779f348f51e70d607a3f4eac190a54b51d1e4722e9d2d51e6fe245d6 -size 25303 +oid sha256:c04d52de49086d88bc45afdac76cfa86d28c2042621f4751678e6869ce13d1e4 +size 25224 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index f8071dd..fd58ec4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e6afde349c7099767969504cf882c45704f7d5d5ae16051b315cffa97c2c985 -size 116840 +oid sha256:fc86f8a4756501c3907b5779fc797b66727025717c1db625649b82fbedccf95a +size 127576 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 9b75457..d1c994a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecd1700b5df5723c7c87ac11acb92e3c897b0f8e759fcfaa4c242e531c37eab1 -size 1758840 +oid sha256:0a36a7818f485b94981cabe5474999e79d7cec0b5a7d5fbbec95f8d5684c3158 +size 1771538 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 0273de7..7e95f38 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84d9140e1061d2334e27d572dd66dbe5b89e595ccb5cd84f7078a300e75347d2 -size 152900 +oid sha256:6d9f286e9c359eab18ef373981bcbb8f89a7609a9c068a954243cf343de17ff5 +size 224824 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/AlphaFromStencilValue.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/AlphaFromStencilValue.uasset new file mode 100644 index 0000000..c1def74 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/AlphaFromStencilValue.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21777d2444e323b50443133c31153592a37c9cb631adc531792d31df0cedf8ae +size 11434 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/M_PP_MainMenu.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/M_PP_MainMenu.uasset index 254c4ce..c2500b7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/M_PP_MainMenu.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/M_PP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08b71e9ec112dc479b18230bb960ea1bd17f83f0b49f27bd3917dda852701263 -size 13298 +oid sha256:19520f44d982f4c267077dff6f5b96d4111c94f08df1bddbe8654e97943098d9 +size 16022 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index 84c3542..0aa2b84 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d095db632a6a9b9eb75a3bb9aaa04a89d3e4acfeb0e6e14d45c3f468ec9aa89 -size 1836020 +oid sha256:22df7912e9b0d70dd403408ed8ed9a82db9fec5ba27ede7be50a2312ee55405d +size 1834788 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index 3f084dd..d838b88 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dd070606a67bf08f31579b53ac28d72ab4b5ae05c3069eed6c10b551bc8d81f -size 5784333 +oid sha256:82682e321d37caa568fc83a4f43293abb54c486ee7aaa5f43d3973502cc923e8 +size 5774661 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny.uasset index f153df6..4592c67 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08b0179a5091be2a981ea1eea0bd433ed4b56e50754d208a843a0239c2bde350 -size 556583 +oid sha256:65bf3075732bf5a60bc54654a6e3e8194971f0939352043e6cf4eb0f7279677a +size 2538 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.bak b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.bak new file mode 100644 index 0000000000000000000000000000000000000000..aa770804772ee5b4e66d1f48d7012e3fbda6db89 GIT binary patch literal 619762 zcmd2^2V9fK`@gtwuVUQ_PH?i9ixm(RLBL&$0RluJ!6c~I)>&uk#tyaaJ?q{-TdTFx z-MXuFkJ{GVI{(l2-uIFK0bh%JKL6lBa`)Wx+&%Z)v+myb^_XV!9>09~vVU>L$`)hn zU;2wz_r<>qXe_z&uJ6;1S4#c;A=@&1P_rf_sBT=1y8SKf-J{U^}^RvSvL%$5U;5dDz$*FGj##9&l?wnI$k$W1gSX1@G ztm;V@{HX3u>X%n;24_DgcgB5D(5|pnE>!15rFFO_UE8`xj2gwGb%?>JZ5?jZm@;(w zl#UvGl1cg$q}QbfM@MS(`YaFXRf6>-Ua6^+rcWb77;~n-p21;$!D_XqSE!e}pP#p% zkJ>%dKgiEB$j9B+%_Gc>K&00k`qQg7V?*fgS7B0}%NN$anW2o~vkL9Y8T*dP&7F+- zTpnzARC`Ux%y*pkRR~Egg?8Y=U`n!51ph#{v{+TDY2LiM+Pis-HchKBXsy#)>^6)*Bt3vfg=gYG!E8=r5Q9d(FbAK z60BOEnQnnS;obkNG!PDEsh{gJNk-k3B;Qi)Q2F6e?Bn?OShF!R(QIk(ygTV%T5cA^ zzDf_hSRU^Z6SXE&gg!|-ls$iX#T`_F63x27S`46vhIqni%)XQ$!J0EQX+dcjsT$_| z{7W5}8kCfzGZU}ljKuR~gE5_DYX&}hi?yo&Xkd+$zsE+|K(5$O&mph zvx*POiBFu7?9YsDO)z~95KK&zsz*O-`mLp!a|_dD>O*nbls~M~f(Ilpl;DS+qCVx1?4v=8)B2VggJ4#(^QtKDD?!rylGYD+{$dO!pAeLmW*8Exg>ol9DpG4oWv(gvpFzcn zwlpnQYcKCsybYs3)np@}LezR#(j?|Nw9HPpAJC+HU#*KyUgQK&zLOyokp|!ZKvI+* z71-zOtuOCIRs&p!MjvNLNlDZ8(3x}zx-=cx;i&bl#rU|n7LU=IGSke=yx{G%QV&CV zIw_Xm%mf+&Ss^`*V^FKcUBKD|l6Gq&M@a^}TcfsZ;d9z;jgQcWYRwv5nkibN*QT*5 z=72$*Kg1dh5jMpcqBD(J$OyZCvtCokXRtQWkgkR2Mz+u_#D~4}SN31n#R(F7x~sjg zFfrN;+6Kg86Z@p`%O5%Jjv5p8C3zP{V!TO{qGe6HE-4Nxoj`3-v~i8PB+QOg?0d2T zgaGxlg1RIwi~ks>Eh&kSzyuEZUoj0NA|WD0PySDs!6*+cF)L1MGP6O`zG?~|I9R7o zqH(a(b*p{L`5U1pBTqPo5eu(}?H2)MS1!X?5L(i6M$)>l zlbC(1*2qT<8Du@mrQC%G5*TL>3#wP=5UfW+7j23rF{`Uqo5YteMH@R%n?`%w#HOx& zrwwF@3u#EE$!ti6PLchWDI*7CBl5;jZH76O{o))jk*_=4LT!?@hlcNujxqJd!ja-V zBJ^?aioKeBTgieYQezruV$%*UC8s8*br#xNxFwSuW!vCnP8c!TuEyfrb#0!*rVYvjRlEh zq7%jrZDOIsY0rBxv4yn;p4cDnOucFuc2BJ?CDqJE{?yZ8AuiRK*t5S4yWkimbTJq* z*!S`<#awwYyIH=nv58Yp0@DhfNQ6?JV$DcDcVS#$wa#i>dr)}fbCtg{utk-P_>-dF$Obd z0bgqNApTJ~uHY=~k~a&PW5xc_dcgHhh}0R424fd(vN?wH{f{0=Ca!^r4ELUYIap>t zUoN@A#O73MQcu)GYjj2vi#+N2oGU7@hx?H|jpQC$o&AbcTK&yu0sv{^JyW%M$&Rqf zbCv}``6R%ZY*jAl7GHS!APgR>T;j_~63I+`5_e!&uj(5(lMPg3(U=>mEZfN~i%=Yv zmdcN&^=$5Xfy#L8fg_X2q%ZRH|WMDzG-AM0tVb;QG<^Uf%GRtBgln+o5CiJ z8#Rg>PPvX^Wvy1v5;`^P&)Fy#6Je5c2iLf%*UzZX8XVn2LkcY+O&h8;@gN&gIigyV z@(>qmYb4D9!&B?c#w>R1lZ=s^?-ZdWriSU#D1KmL55^qjT(+q+vALlGoVetXQrDV8 zQgvx$iuqbfJFxTifd;tn3A`Q7FE&0H%_Wn|YDg+X+{DcD%Qcs9ktw$$#p@n@+?;Ru zSWU8)4SM_HUl?RUtTru~98$A(sF@}F{{9B8v13yWLtx@IpL@^_qfUq&sLQap2rsG~ z?T%fW5Np;L&0$7EdZfmjm`ZEJ72rGVTTGF#Wb#;-ja}H$m75_rja;W&qJ@~`NllUb zNuZ`!Ed~3uk@?heE5xZjtp{_nN)bJ~b?M$NF6PpQsb6t++s69Wy0-iZ;%f~o$Z^wA zxDLH6UrwPx%W4AEeu;Tpq?I#K{> zSpbiZ(V8=jddZQyHRsx6L~$V+YuBhD6l>;yda|ki*T|#gf+8+L&61ALn{&ViHoF>^ z11s%|_%L!DazJ%HF!6gxfd#7tN*ddd=BeIIZQHvV%<4guWrz%wl z9JY8#lFrz3x4#oqq}3N9H;tlm+S6t>c)~vh2^(B1j*cUyh$O8nC(W@*bzMgs*vQ9i z*|QwS@zpQ-fz!}dr*ebVDt!O+DBtLL$Q!{ zHcM$BwLVFT(9*(<$>4&ui7P9q(W}LwHhjd?FIrMRo}L8ta;5$V?yy_w3xGFTkHr{!v&G*2>)L4@@jHlT-x^#_@~KT65%CdQG}6 zkqhGNKNpUNf>KM78(ax_T}!_AWdafad0GMjNJh09Bm1aV?{^Wbs4cFsH5XU^a`XAH zvv%470;H7Z+5?k5#;`dEx6&~Nn$1t87Hx<5%~>4~KyhHOR<`2iPB;FA%yAePd9r+| zh9tIg*@cT1s@D2|fKc!b6)dCT7ajSuxX>ZzC98lWp#wV1um2(3O?7?{giaQyQlZV8 z!%eb+at}#LjKUFC#Vj2H<(eNrKmdt@K1pLt;>6hU2mdbN%aLcB={}gdn6o8!OF)2d zfLM)>r$6BwP2$NYvYgyey)a~&8sZ7r(I$l&63Ke#%@O)!1KSl}`6>3H)FdU{A&Klz z(EO2bJ=D3=K3q-496i?s{(#-qfPi2d=YqAbu(~Fv-bI&8*@AS+zzY?&yF}7=u%B9l z8n>HPT8+&qM~1`~+KXQ|?s^`QF6aHXsY0)D_8{>hqD-2miD^fbcjn8QyCoo?qb@0l zT&naBdj?4D`-HBG1; z2IHPjJ1s3d`v0~5BiyMVDEaheWVwUO5TNIajXX&*sY4na=}{m$DaFPHX}(oKp{Wtz zM4D3A7w`U+0nNxO`1s9r-JWoHws9x9pdb36<~cZc>Rb)ri`k}*d6qEGeTnXPTKk>xu0t2I8kRcSb=4W@Gxl4HId<-8-;k*0X{P;FwSS=&8< zB0(IM#q(SpG^seDL{~e}8{BFE0--Pfu_5z-9QM9V z9i;Z~@bL2{Zg>ZIdAWzVt7(zgg{6UC75ON9+|;4&-hOUgA;H1!KK`M8?!F#Ap}{mL z&!AvmZ!hM)dP&(LABAs-w^y)Nn7fyIuvsNLDyt$MF-UIDlSw@<_(KWXYbCF# zS4_Mud_3K?ko~%NDRVaC`?qewcP9iQzk_tWWQE(^e9)(5K8*nZYALT|0hci{_TY2w z@R0In@85b>3%-O_vII=`>6KO74SA(yU^}-SYKC~k_9zQBTng4$cH2X3xrZSRvQ2E_ zs(Rk=e!_Ixv?O?V!U166wMWzfzbS-I(HhCSOf#|3-rbH!(3ZM*DO&38lkgi*OVD9y zbbH|0AJ4Ujh{Mt}bb=A|a_ew>O6J!Z9J9Xo3DIxP+Y3*Z|Mnd2j&0_G6+iGpIaqf~ zg3oww$3!f;sNkYtVxg`s?RaPTOr6I_l`8+UnGaa5w93fRKF_KFizQbq1@7ZY_lg5G z%BJv?2rJjP-P`c0qzc>Y2isTSli%Tb^8o~zC_^S4|H82_$~o#4Z?*dkt_X+WN#{kQ ze;kYUGht&VV#mLhVAHp^-)@Fl!JRYKpT!{z4ZT?A;yTJEXI!J^lt;y#; z;Bw${OAQa9DtLbKxusidqJaXDvIlPTf#mU_g+xC|g;z}(yQFv{JDc5NE*1&Wih)Y5 z_rntFF4fCjOYV|(h&BD>#*S^O81gD8ccxu8u+giaJlO6DV?TNolqV}U>*60+P;%?( zn4RZ-;EBK8`Nmh6vko^};@#Y7Ue(X(d~B*bsA}+ApI@=5@}#P$tB+PdiO5G?QZ8G_ z92>s)+B;Y)?zLG?H>F^0@A^_(F%sU!t9VGg=I3MkL4#LIdH*TP?o75oTCSk58nJ(! zv>>-s^D|9$<(uVMI56f|a<)+bWumCjY+}DPb;*LiZwE+P#Ir3;q0liAdTAg_|LoQQ zVjrO=pBj0vstp%BgOu_U5!^1Z=mpcFQJx4D#90Y4ArviSrf1SMDua;?((mgo@s0Az z8L=63iWaJ+thNSc8f@4k{Xe-{BlMQm?9Qk8#UjFOp||w7PbXKR*V%)+yP;B&0tvtP zAj?5^JY+PUA7r!MqxWQDTiWT65G$vAhg1!}jY-HbYS@o>o5ar8YOBZiSlgvQBT}1A zUO62&#>dC!P+akD@e%16X}Uz68RKGZb4GS}jo$7#du!u*ws?)+9yxnYf2&oE*XZq; zv-kdU|CW1=-d;I-C(b&T@fy9obN2S>Q!eo}di&(;y|1pZ=WF!#&Ds0YV@pF{qqkqq z-cvsETj-@+T5`yWqjqd(>}OdLV~6M{0SiqUACjIS#5Fsp>iiM_qIBlwcD=Hp9J-LC z<;>ieSowOzjzGomU)uNhu_QS5)~SkYNS(4Ls}9$-F@y<=p1nZz(!4-eGmw7peEhwk`5g;HHQVj6QO#G zR`AXqH3}R-F22r)roBK=+MnE#J&GCRV6Ecj@ZC31 zdI!U|?%?Oe;^a)qh{q&XJqbq1S;eYf4C7ZO(J~sq?>IW ztV@O64c_PDr>wxkQAaz&2J;l!CwE>hg}*@`GShHVgmSclwLJHh(cmKu40^QpWVjFMb$Ou4QXel@k&i<=M4Vrm*pg*; zH}R=Jw6dmFr~-~b&cuO9|3>lmAug!nYkYJ~iPczRRCJW?60C_`{|FpHmE;zs^)P=f zdXXshVh8$8C}va9n;FCIa5oiwOl-%CIcb72GDqM=-Gd)p6Igrdk|+zBrq^AU21|?Z zp!k6b*dcjNs#tCRh8^KRb+u&g;E@z-bZr)-NKS@nJKs^^qd~gatnK{iOYlt2xr!Uc zL1#DJ;+>?s9+$ogeG2;}<>WPKlw86&r)5=LD>;^c10dRC$uet`q~L?+y;gf2`WG4T zC?lPIYm;!@j&D`s8jc|`?G>J%_Jq)}xJ6koI^aUfk|;#x#EjGstA7EQP*%Bq^PCSWXi(DS|M65OiIoJ@o8$d^D6}L@=T-h|3*tjx%dcK{rl3XAorMYp#x#w?FCu6ro zYmJs$r1HI#`*$`qf}YLWWMY@k%s$75MK^EZ>Lcjf-+D5GYYWm*aFM_I&sFLx}oB zZBDO{Rh;nA&rbO^Tb;(Poo5`ydfP`M`Hh_?&Kdx@<0);eG0uQIC68^wjI?MhZc*FW z*ce>vKX_91cRqY^eAzBMq%B_{st`x=%&V$;y{HtqQWiflGl26XPbxd;ty+)xiW#+o zb%sn6_pf>SlO@cnu!^q=u2;x@?3tr42k|k8jTGn+(@5%1;Sb&2wodj&@;1y;t?Tkry#n+%Eh7>YTTuEW6C%_JTuvQDwAJynNPBZzGZn zVoT?UiEoS>w{jD;>Fl9S7~sP(YMuy_2&7z;I$2Gk{IAx2^j zb56{FzLIYP&N0n8f~B#&hOpS&fM4}NydmwElP*JNg0fVD?Xvaygdl4TcFWW%*DGK_ z#T6(PJZ~{&#}4S(+dAN)=|@NTAF~)Yw(vzI^G0 z?%>I5$&JaPosXdCV>_$6*f}Z)VF~T8cjD;et4!>Y`<6{mpCWaIOJiJ8ver(Vz!@h) z+PHL;hi`R&WQn{Ox4+w~m)>Pt$q!oIQ;l@zbeXGXZnvOTh!qlZ)lliMI*2lu+9 z8o_P$UiEhTG*POS4zxUW^V8EfZF)w00gfg!7wU~&JU3yhK-t8Rve|OW;eUKcbO0 zOxYgQ-%V6|dRVG|YvIS8ckUYKzVN*Pog-7=uL(*0(->eN$X#3e=AnEZbCKO65KfEJPxt&7~; zSAey&+W-gZB8pGWGD71nM$v54L_e;6UpZPGun|3J+v6il@uw`{h@Nlk& z&WNYF;0|#DyPmb|2elyIy|z8Eu2CbQ1DbjojA=<^5pYRQ_G&lBY*Ja8xW=^HMrgA) z@H;$a(2MO2>-G=c^=75}dd+W6@2n4O+IdzpXC5-J)3WQY>=I|xrBL>oYYn%j(g?o}>M5#=5+yc;QHt%*M}$pwSn^6VBF z3A)ulClnEgIHlu=m7b@MhrK>-=zSs)+c^hfHu?MXc*v7@I1-6p?%=U5PvdzSRA$4F9NE&9!`ZiiM1&4X=(o8P!4*w6ZyH_h?@{}3R4JC%fk(O zV;AvHmiusQ!&~c?@oI4mTpHZk(V3saNMg90W4u~6&AY!bmVlDt*>>?XAKO}agAX4N zb+Oz47w#}Fi!ryCpQ**;a~24-I6R3DGLs2Opu>8~GXI?RaRHD#{+3c9Qi`s%hl;*(Dz-}CMGwlglBa~wfFdP&B!``>@7h$%I5&XBbL5cUUwCQZK8NJBi7g|a zA!q?rsTOz4__KyU|82syN67i-Y__@Pz>&oLob4@`$&m;z%4VQZJ6ALDgp~v%`!`Tn zMtY(YN~4)(%j^-72`#vm#=bd5$k76IBCd$@(88GI2t99Yw)It(kn!zJB}F}h z!?0#bm0=vLP6cysP?TG34ky?J$Kw2?Lv8|igr4*_8GCwCZTY+R$3cWdD-Ix-X>6a` zxJM*c=9nx@c#uhsYBw%z6AmRU14bmrkrSuJZMn+fs&8#ttm$MHQ~%^co1qGS0Vx|F z;|$I>8J%dNY%wz)suIlc<&l}RFDsRRyi1~jmF=iaqmWvNOS5-pxN@fQo;gKnTT(S4uc{4q2+Rm4o;6RH6;Hj$o?&gpqJxLIm5_$qzpfOKxd zI#>H}0*}3N*}8K7p8OnZYa0q#EzKU^7#?X_-0&wc<#pWG&EZrm3z|0+$RUliHE2fC zb1PSy-Rnx#{MB3~{e}C7{UQmqRL4Xk9Aq1jms?xNUFDDbkEqL`ZgM|ml&im8(kJX7 z7j;UI3)mdUVZwnIo*haS6})(`VWh7Q@Rz9yvm}g;Qw~*9oVuWFL0@{cqSCrqGbj0i zT$0lel6fbJUU)Zd^PO}ir%dj2Cpk51&CD_#XX?pQhqfLS_pJowR;lcv4BV7}m64$D z36Ul^g#O}XnV=K@Xj6ffLa+iH{r}Ah#1WX_t6A}x&7!>WD^reokhupTF;Joa>VNvkfB>iEV2(FGoxVj4AoD{;r zJmO``7klG#R)`OgDPFI_*H{93C0rAQaM*x&y^5}j1olceSA}rR6v83q#Oqb#YaxNX z60W5}IOspTUPYHb!v6}m4J4;+6vzSK0u{mqDTE7F2p6IdE>s~LzRwA-g7}B|hAD&# zR|wZpAzXw4xG!mZ4P?Dn&^!P)Ss`3E1$3eRYAJ-Ptq`uBLbwJB;hHFf6Skxv{$akY z72->i#Hv8K0zP3&UPaeaAzgokaGeywbyf)1MIl_Q0=RX=mqrTsx0c|#D!{jf-~trF zMHc{fUmnv&!uMMNrs>*iwzpMVp40&u=|;Nbt` zC1e=u;b#X<_-j#e8~Whu`0%o)H*DdmD1@u35biC7aE=P$swsqfTOpjhY_H^tjP8|i zg7>fDvsm+2!Btl{41+a@!7q^RhF(+;H0ouDcz4PpMuW4o`bElt18jeT$42U!|+$ zMW`&ea>H+sah=HpBT~jVB?-ha9ldT3w9-R2xhrqOFY&n`dTnJ~|Ju+4R^*^We`MG3 zYChIVPpYy1yC8bV8{_p)E_%pi<)-KN2I=8Du{mM-g;^jcmYbgX4bpp*i(Y-3`K96D zjb1TtfL^MM>on2($%dvlFaW==wd3U2{}vUzeu5u_#=4Uq)y-^vM5J5WP7#pQM*PdYBF7 zC+L-F_~z(6$TdIYP6a*x2K0emrP>vq-f@o@;))|1LZ| zv3`H&(q}lU7W(W{Ifx3YjB6sVeigL;_;)T73VZZ~J`?oL*L-vI{>n8!oUx1f-Iv`K zbHl>Z+ki>X>(5;Da8@toH(#cg(zNjOG%~$Ax#;1{U(D}4S)Y~S-+qhH75pk_{d&mp zpFMhzM(l@avJXD0Q{m^grT}`t4tipKRdj`?SJ3>#ei!rmctYXn6*NE0&6b~amcKcA zf8>%E-2H%9g5C`X4!zd!heD+H1^q5aUP{QgZrjiUjm9LmauXBzp6r8#pP$J0*wRCt zJ$eg^h#sz4+M~Cwi0C0lXOG^lBBBRB&>p?-iijTM!ydg~iijTKXnXW76%jqe(e~*5 zRYddy4Z+=NdL=SPFJ$i$Rh#pet_UH{SB6@iA$R53qiijSb z2eU`-vm&Ag7uX)XrA0&!?z=sD8;gh@!V`P+_7)L6r+n!BR7CWg^PzXTi0C!Qhu*a! zqSr7VdiRTnUZZ^IG5%E=)cA^5LGg;c_@Oc3vnQVwiilp5eCX9GB6>KBvp2t{MMTfV zh8|);5&wA=5j|HMdi2&pFQ|yg^P8n7qh+91Ql2;dbdVb^6(K$T zf148>TYAoiif(=mcIMZ=20lO_d{p_Np2VcsT-b4N! z*Hrn6*MHrAI7hOj_x{qNnO`)~fqsE10ELPmOt0dr3r{c0j(!pJ#C;;Oe2u8emcr9} zEDfF6>N7!4?1#Iu?jF0N@bv8IPeBjZQGSu>4c=XNdX;5<-muZ>poeGUE6enT$@Dt! zEj+!QgcGmpx#-~@9LRuzhivu^d|h~Y3qg!t*K*Orv-(0lyTDM;>oNaUR_T2~zYE%b zg5K3!^zh8Tp!cIpFXYF<&#xtr((6htdTJYb;`;_F9xgn+4<&N!axQxK4gxX10D1q# z94%UU!rlscAOG^^=v~S+KYVwBm|v<)=G)VSrzhe(d-RAT-w(%SXR+0#!qdAYuix)B z^TWLGoeyGuEoAvr-6}jiKOm)-J$hn(;<1O8cZ!ytun%H>K7SW2J>(%lLC{OMU$peZ zeSJZ1%A=yCC+_PDdOQCuT6)4B33}I_6)in+Us%wq%0%`H5}p5xwpPCJQ9=7b+}9WM z+7~Zcdg8vmpf{jY(b5y~n4tGbnWCj9?89>?8hY(3U$pc@JSOPvtyHx1g#TGy*4MkM z7A-vyj|qMKUA3a6huw`L_<6KO(b5BUTY86T7cD&zkCl|y@5g#YLl6Eu?7OhHF*3a) z&V{F!X~(_`dLrNRu1v2%NE$j!4Jilh1MN2QY{`|656uM@38JeJaUR zKA@69WjK{oDkG@qsEnjCfXXN;2~eFJy}#5Q|U$p_f48m`H%|uIgZMBDh;SWK5&26l}a-zO{q+v;z9-YUMEt? z{VGNkSo1k@1N2f0Dgqb8yCoIS0u9gxP2fXYD=HYHpo_6${HU8mi_=>EjPalj4VBP31_yC?^4MaW8`M|?ODp)^J??LauSF91%RMdOYd+=II1?w#8z34so zpG*a7FY58^BGv?J>O@7<`_Ox=Qz{k6h^Y6a_gFg}708XK_oMe%&jC~*OQPPN-eZju zs6f6-Pzj&{o`KKc3t-z&!Thjpm@no89=D|eeqjx;mRLvd7=7AN0UY{)7h=Bc<@aa< zFT{L1(0hy-^T8a%I0NZDV9*~ta-stKK~wO5cxgYFlT2f zs1K#$Ld8BAp+m24_zDxXmKlu8DbNmQm&`H0HL zR3=lILS-tIAyf=h22wFmDeMdKqM`DP_&<@#XnGIXKt1-5s2@e|A!Dddw5cCT@3DVS zpJY=%jNW69pk8ZJ{~o=^9zi{HgTVhjy~kcaeTq%}2lO5?jQUiY`r-5*dj$15oB9#- z9(xV-18nL?(tGS3$Q5{pHP}V-1rJe&b;25<9_s~p$NFI%u_ndj_oxFr^exswtOwcEP9VVz$4})l4AvSjNj7y@XVhtJ z>afPB!@2_(`eJ=ihcy>00IE+o;hCG3msK=ZjlNb-?i271gFn++I9`nJxL?6%+eL!2(gBR$7 zHt+`Z<*5J%@L}Ab2iXM!YzR&`dlYT8Qu+OL;iu_|-}QpJj^ z8n9wjRK=^PUhaqeR+UuomzbieSn(1iOF5J-Q??udY^ltOsfrgbR-$;xk|jv;R3A_~ zD^aCnRcH60Qg3zBI5ZgK=rL;g!qN?cH+)?!=IGyzJQIwg%anb)dX1X38aHX`;@Zs1 z+sD_>KOiJj9Twg(qEl>K_Z~fa_3o3Hq)kpq)eSJ2GY1bDnl)_9hhxW$pD=OKjG5W9 zKKb;s&u1@MykzOJe8%`Dfvs?fZOl_*iXgahWKDmH{l@hT-sI=h#u z8r01}Gw7`b9-~S-22WqO;p;LDJ!Af^mS8+u_U%Sqzc;>%sqvX9o7m|8G&9S@tn)fU zc@-5cUhyh)A^6@ZmqjDXCT4m)p~AAeshR(<*p(}feGypFduQy*wZ}%*Ry#%)TmReg zxXOg-Fp9*f!5rxSDSxwdh$hYK8zsvX(n$GYrC zH@hq-MjgtyEYr8&O#c`WSv+Vdt1>gN!lL<`hjrT=U95GdOt)vtC;8Uz!#?od8ADK& z=B#Cn9iK0nyl7;tJ-P?SSWU+{lUe&o$(L`3T@Eax?vVOmaq5Cnu_u?-R(s8;SduqU zOYzJl%T?27cHTTJx;PD`P3nUs4U0DzSy$~jXz?H#mTxDmi@%@Ookb&S3LM>Nq=d&~ z-X0fKD$Ob}bIDTu=4=+TzE7v_w*xCJn&hIYy>MCV**|A%nIla#f|#M|qF*+j%E+oT zHwPNO_psO%Y}qz?vopFl&~(2YwXAiY4|osX)WxaGy9HJ_ zZh;kx4{0)a(b$_^7nHi=m}qG5MWjBP&6!+#a$`rf;QE-(n`3}N?q2>}>N%auf|BQS zfrq`$410ctMG}9$P&3~)Ly0>Tew{J0`kRL`tu7) zg3ptGoiS_Yv1nDNJvv%FTGVC-wv0V+(tY`l&mUbJZdUc)8QXk7yK+u7mtA}mH2>Ev z=?~5h>|e{}s}2{^s&;5Ut5wK`!+la8fBOEK_o_cVmeIUNhw}RuKR#J8Y7uK5H|@f` zd*7U`R_E-c{^jb_8^5;m%(|00oO*k~OSb0IdjBlA(c>lCXL^{>>_u0P#<91zCye|l zU|smCxhKw#oj$A8=-q!z&wljXnzL)0UAxe7+puBF{noAR*EQ~i)3MJsdhC9h^5hp+ z_g=pb>(;N`wOJ((U2^!esnOwnwZrFo|D60(`)(Vz8v~ASpYZ9@mJJ>(k5#$WUK%j_ zJaLz#so6v9s`ewx(jKh2`RL~3Hx`si_gXO0O?TqkTdAtEV{4D~n8acack-FvsXGKE z-Mdlc@4e)`t3dklU1th!ci#KVCvHin#-fB#5~{+o^;bviob zuYljX-+dgrzWu}19#=F|e~(!cS=DPmvE7Mn=Pf?bz4nh|)yXl#4Z~;6yL`&Har1)y z{Y|6p^lY$s#`Qnb&z`$pt?RMV+rl&YPWdqL&+8l3em1+;m_^xDRkNIjYVHJ9snD*Q z$CZ-LBYSKgbZzurm*Qo&*NMHl!+4?X$KPd@c+~DdwCnajpvZzql% zJgL`}*&*Mb|0CS7_ljxRa~-w*HS4zDvaQbGMNSU0t_@p#bbHMvZsE1S+7M|SE}q^`o+$&eVg}g-K6qv&&(WL zt7n4^$HwlAsI~RxZ*D`Tj2u?!{+Z1e$N436uX%52jf4?hc&W#vb zy?%q8P2GR+bvhVw^Lg`@Kb)G9Rd!nGZeDFo&jLrx?ClY3FdS|8bnl3n-?riicAq8l1^KU@6dY3!+T87sQq_jxw{>a2F{ZXVnE-9CMzQ9GO7 zJXk08@$c`S-|O*gPH<6iM%nf@9b%qmw zTic87*B0*D8Ta|We~s#OY(V?8C9W5TtlH4zV(B~Et5({u^5C3N8)i-2zUHI%=9Zt? z=SbH2%GqI|Ntd(g)MD2&|5@@hxXbO$)y|F#sM5RIg@|I2^-jkH%v&(&vUi(?nhzS) z{9#JmlQG9uwNR5XkLa{#z{n41DNCQP;4$yKYc_-Ow-|uEgUPlv8`#;DX`G(I=7092 zEIW0~$*qsq*%3oK4tnv|zt^@T1pd^`G_h1{yPyXzW|ghfqSd+NhF`9@xpnO~)q8C^ zeBtAlZ2Z4>dVBo%$%=bBJzQEoPO5RI_s%hEDm4qc;PUU0>+|oQytnpLtu}qj7|zyS z_WW1(3p>_@#BO)_xXkxGv<_#!`0(xZ*ZXZsKku0S?Dm4us?DK&*Z*8QWzyG28{WIv zyW_ca8JBPOYd_!NbH8n->0cb()+uVx+6k>goO&KQJ9+nmf5)#i&0c#XwAtPvD;&OT zduiLlIfs4jMGV?nV423;oOeY zzT>;ze&^a4eZL_MHTS1g8g^^#lYb|EQ?c>Kcc&kJ_9W)L$!{&uvike?dPUu8*WvK7 z74coC?e9G_#zXa>!}CFXswTMXTkllKqrnF|r{2H$&ZiSvPnh%l$A23S&b>QxRD@I7 zf!*_T{WeWoGFSE6s)mmK)v~lbYxk`Pp-sQ~VP?(t=hXvF z&p&r?d%di3x7tm8u;wqv&KpaPfBHv_O3O^oU0Z(p>-g4WRc{S6uPr0FF?~L8A9nl( zBYRUU!1ZZ3c@WHF-rm8J7tQVpM`A1er{ojQU9360d(*A%&j(f-^l;sbeI8pkgmv|8 z6?Ajl%1^#gKlu98u~r^F?i~(oZmG$t5xV;G%l#d;{~SHO#nnbPzR^b|KlI+SVB^{g z^P5&k8$bB+$>YzSHw(z_dDrplI;WdH*?#%P9^Z;l57$+Xo`0vhs%KNbwLd4^{BA~g zhk#wh=k0#UX1??Mi-^uJQy zHDcnXX{O#j3%g}Mn4}q3_r$N~pEWriJg$1fL!WOP-!AY*`+2im7SB4dtbJ_t!=D+a zo_aFrO26IT*WA0?H0ifrQ=Xrydx~9nH~ik3fvMk|b86=~Gj3u^)Y7x7_D%OYb?V>v z1sx_E_BA?}q}_k?`PD1>ckaLVpt;Y_#inlhAuz^civPivtj|ub<5weHe%m z@r$`umjU;8Z8S~We*5@K_G_~mM|ag}Q+ecErym#G`Lnshfz+~nx7Rn%I=szrwO`eY z>enw1{^nqU--|6j51swanXfz#{r-|IIC0Q8?_e7ehdEQ%7N56eWwCBiXI##>s8;_v zKhjA>p3;%xH!OZCoMO!_-2<56Bg;ScXu9(H&3O1D{y?zHrOfYrJ9ap$+VJe=>;@Zu zxZkS%I~51~Z`tWx+Cziy_S~#?nK$5`=eT+YCoSL5+_Yk&y6T4=ZZ*9*{c+Sw*6VJc z|23Q5>p+RbIlabrHQj!2u-X?(56t=OVoVof2fUW^D+swC2bE-5)Uj)4wt=&rY5_YF$`-|C{sI_SljBxNFw!-!?z!)g%0y_m@to zwx>ehqgA&ByjS}3y+`M=^NEe_&exyv{`J^r?H(I<2~T-f(!ZCSdQH&ev|W zK73v^U~HdLpEy3e3Ab=rgZF|fezCOa7`a3CVxuKJ6!!F4e-!<8#=CwJ9 zb>^s}QhPLCaeha1)`}GiDsKJtQ3sdGUH>`!L(lCmS%*WPM*lMAbo=M4H;;>}leli^ zx=6it!n4Vfl4eG@{(H9lFJ&8UZ@Vl!x!up^VICiD4cF|be>HPm^3KR+LyuMKX_)?P z?c%c@FLw&pE(~pd!O_Fbx$8e?&#qrTe9NboKANU)b$WcoAlr_|6;tEth3i*gc!=eZIQG zCvk(OPuUWAeu?oXW29%s;*6yO+1ew=T~B{^pvmzrB^G_ETdbq-R0>JR#nufe+a+bX z2uTnG9ld881eq6Fh=C`cIDT{Ti6h0}MO?kvb=mq( znauH5db6z)OD9*OEOk3@JBkOvilXN66lb>E8S4TArFuGkZSC=EDF7J$d!*CM=@AgY z^UEeLo3CbG8U9Ppxvr(Cum1L7$LfVUk`xD)qDU@k(a0L5Dn_=+Sops?9%wweJ(j}8 zGpT1ja3$~7XLfW31sC6(I8uBYcW&A8dD-b+t0~+seq(%O;jC$T9M@)n!7$2I%m&A@UIo%4zPDK%i&CCC1*uBi)(eRe*w zJrxS;DeiqY`__O5%cE72WhNFA_ecqMd3W;@)~S!nf=Vw>i!2iUBKcgA3jPOK%YT&3 zQ|vkkud3w_S6n%at9m>i7u>)vUwFk$Ku3Ag~ z195A$K85~E;8r<^@mxQ0g9#C)IBj}Hn#Qc z)|6<}W$^!{I&Y)SL};_{zee+(lr*&BM6D@9lPEQTZx*D{^uL1VGpihMaakE!&hg;r zxZcs~_^t+Hx+aYuc=7*gH!Mw)V&ZvccMm@=Uw3y8evlca3+DfA{p#jO)FVfzV!zPQ z8vcGjt0>h-zsp!Y)sWwX)8UAL4rV&h?+`ku7)*yTgD7!|+Dz7!j(!YOQmNKNJ<7|y zy3wZ$fsNxV#@(V6HNM@2_@64w0M9prW~Li-#RqfI27z^@{SmGHi)@ki4kS{)28T z%{YY$xMiS~f*ic6U1*wu*GFK9q_s$*R0_r-WYSDBWTM>_l}d`Jh_R>%TMA(q z%ymdldM9aY6&;x?8LgO0I_DR9Lp~v`X2J`3*3&x`6L8|M{oO5OC6Rh!o&+M=cMwyEfXjuNg3*%eg!TV^X+6D?s8)=6-t zU`gshtDa1}vbDiA6^%u#JY*3TRz;Vpl*~a$ASh!0XYjQWJi$B$a9L8(r7I=)gf7Xj zu}dntfTg6bGF>9Z7Dt>i(x|OERrD{I*Y;;DG!x`h=%#v#MlE)R?b=y6Dezh~UVTMa z#p=N)#SCFJq1#`*PELyO3#qc=&kr~Da60L19cd;NjX=pt3TcGJgO*j%^$@9_u)Efs z@!$NmI9mBc;zoXcTYl{g6^&nbcPTXX3{FEu7yjPN3DjMZgF*lL(f-6NWbKbVZGEGb`Z@0K9A7l{mC{DpRe@dl9a(tSoew;VHf7f#|S+3R;<5el~r`nSHfgnPiMMJ9!~oPKB&;^LMnz6 zw1^RftmOx*q6<)Blq$LmDZTH(Y-0`kvWK~g6%=|LF#+^t0v}g0T}aNml08WOX!$-& z&S7JP)Cl{Mx2H3+?Q8W%Y%LpB8$VWl|F@MEl4y;?1b0=G#gJ&&YilmI6>PV}s@Tea z?Os;V75XCL?8y*vF5X1?^> zhkpCeb#-6*@uzowR2RbEh0!}-qSfjR%~ix%h+c#)wXRyht*sT!S@;`a#6hbLvZdFb zvQ?gh%k2%#Nobdjr1^(&%Wc&-wsr1`#xHzf>)0`q0kmTgFSWL@CjFTQtxXnT^>{-w z5gxX6)bQYk(Y%t$`XO3U(Isk0>I;Gackxs34imP=c79fRDw4c6v%iE?Sx1aq3Oo(l z9HaeKZ$&c^lIcphhxW7@t!Zyre_E0p+N%w*TN`Yr78=v%4RJ$gUGPB9JsWr?R&AWS z9=jhuqThe@B*iLVx5FC3C$jE*Aq%#x&Nl6S@+b5T5wiK%saOSpdugO&8)HTtfee2ypOy! zZDm>_XHGY10`agr$sf)xoLO(`7nE;b;b*#Y z4W=URK;pDm8T+#nt&)XsCjSD`E@hx?Gb2c8f>`=HolDv{9a>7wG_MtRl1MOf)9WuU>_u@`{JLcP8L|xrEFCag# zOA#`>kTUx+D4^_}oJc1qp5*Vrw!QicMe@9Gz9KYc2xZizvq=N3iYM{v)iC{unu=CX z$qo|P=G;S|yOiz$vWN>NlW_l7Pe>=%Q#|4P~gj zaUygDBpy+K*wYa-5-t58R}w~=4w;kz1OeYy#Ud3^6xt8-(aRa1Zk&>ofl<*+m8^*H zM{MyRhLBF7Rpgl{!6JMfTP#+eCt48>F_QeWYBxn#?2W`4XT~VPA$B~hLhNhxfaZ^T ztsdAr-CwH*q_T&i9zsSEc}$Z|wjX){UNGz{WUZ$nJYokWvR))%X6~urE(0tyG#)a@ zDr%D?#rnINT%$CD<1E7qZIs)8YeU)yyEmG&E>3@7dod$D?I0}KZ=eRr{^V6igE?wd#oow-*dPK@IfjYoJ+ z1xGS*`JCU{li~g{-T%J-YRVXbXsnAaam7_nXwFQN#_g2SQ1ny-Bi> ztwV+mdm)&90!R+Lc!mx>tvCIIQ)>W8J+gZ41Oaajx->x%J&}pDl?G|NiHiD*v$ld) zuOL3Eh{sBFj?iUFDXF+Fw#oqB3B9FM4~rAo{Pl3|(?@X+!XrmCHIAPhR~bBs+Is71>KAw1uq~d)f8|kd^*G zMYx2{&1o-l`~DIo6=^yp;}cQ=tLIKD?m>SMv10vUAyE+BLSFo6{d{?y57!+&^d2V! zUR19li>-v->sZU&GqYMty&_t9B~VyD{Iyz3NVWK}Mzz*Rx1gxjplBq*i?+Y|88QxQ zWF{h7+m*K7Nem$?nLu_DF;ITBgA|QR#E-Ug`cv$gLOwK3SrAX*hAA|RQ4vNVPwre> zKx+h$M)4!*@g!M+mI~!GzzFY9MW}M>sX2+w1gKMRQalPvQhHzf%ueURlpQ z%rfr0`(4;xSZdtnKny8PFX7?iCvUG(a*K2?58N6o*W?e28*Runt0<$LA6{`n6wZBO zX&r{j&{k;?CqFq?QRGqJ^-DK!;8$Zl!w7@Wi8vw5B!1(D4%$U8>&-X`!r2DKnZEQ$ zz%?UWS@MVq*24c~lo%;~3dSsCPO>DhZIB`lk}7|0YdlEu0{9QS9_TmtLjDASH~`uX zdmU$C?=q4XCLB}I_o#3>bhk)IM?2w91v7#n*J zI@_7+7Uu$QHjY+=UGOL8&bOr{_Nj`#KuF1W1%IHI!?}j`BzZyB8+`DicV6@!5(Ev7 z%r7$D(AYTr$2-Igo zIq#oH`Izzf_7=KSNGHyohLP6AO?>1bRrJMi`B4^GI&0r>vI`lciINF}ioVV-zn;QJ zu)S%hqOUSivdUt_VqZyjB5luHK2n57NDK4{ax91}LrDT8o#9QNv4e1Gg3OB)OCUFa zSOTXcDBjefqOXlpGVazglyqK>Ob2w9__2C)q6UAh9$n7b{PG`@Wg2;LIQRpb|>l#7e;%!|ul3#&6^V;P=B% z#u_7j1QfhE#BM73@;@c3C-%DaBujYo$d^g?&oRTCw}odY!kt$#a;~<>jOEOii4!c$ zUcl#nf;CgoNQAHQsx``1giWjww5rHeh7^NUq70e=lT2O;CIl$r6 zPDNitreuvAWhi@+CSqXg&FfDT;S_U#Pk|9h78hDV(i!el3)_pl6Qt0G{=zQ9Bavhh z=cpk>>r+MaM9giw0(r;&nIc?5W(7YI>8!v^GHMUE_3rrRif{|Qz`sHajjRi9(BU`y zQrKFFXYf^#BSAcl-3SjBUI_fMV4^i!5k0ZC%H}Xf5l(TV6IpxQ4#k~;4Ek+7=akMB zgnhF;4OP*9sQfxInbXV3X=4R_75hRFPQiQRJRoU)d@sSB zPH_)XI@|XrTJsdq6M4t{Vg@mOtB*5Z#+%m;37fmrF>nNvi{IJ?T34Q-v{ma&R0%6Ck)Rp21B|H0tvVJ4=!{! zBkvQh|NY)Z{_CZDRb6PF%N21%=wo~9n%7>fP=r&gDr|^!V;fpb^6B8MAqN*u8V|lW zygXz;u)^@;q&wTth1gvy710yB*WMh2Y~tD4yz^P52)~#Q?3^Es7qaL>Kk#>uKMW=* zgr9?1;+{J6GU9dQc_6!xY521$wpyl_SD%VG*zPN91n5lpP-rGG1KTIh)+m~T(EYaf z3+ByQMR1-ajlLP6m+?f%gI544)9gNwENO zNNQ?>9fgm!UZ$6q&%$omjuW;Eb_*l@Qqf37F5MQ36~_ieIK*s`uYlhPDS>9ge6eeg z4}_jW#tgo62+5W|eTMHUX+ivkRBcp5PsH0|rK~=r_y&hfitvbW<31w%MGww%>~3gq zXlvwNu&@E4_f57_%yrOmHJ5Bvc&=_Ckp0S;mJVYgxT`Oy!~3lTF)8Cbjn zJfuX$w!9WSNSWmSdJ+yqJHUl?2;g)uCn;jUU#t^OGLgrVG@OcURYXttG$E9)!Mz)2 z`VH?@WX-JJhuE*S+1G7~XxPtt3*SvphSw~ps@Qf#n1wVzMlo}&2i6EaEMi1xcFDR! zJ3_-l(<6Qd*N_KB^oZ=s4n_2Y9?Q>%72~)1usdbEd38Z4xkb!h#dgUxQbd5?!tcrH zS?2%5nzM|-_9jjott{da-0F)YA32fx5%}(qHgq==H-mA<39Bl-PbC~;w_4kw^KBt^ z%alZ{Z~tzoSRZIpX$7#45cfi2aTf=l!f2(W91B(qQjJ_1qCLbUzI=W5D559yt99Ht zNBut;OWxIJDYq2to8>;&!1GYnd&>E9TE+G%8h;~2qfkoot9)lGa>Siz?Q^f}*ZKAm z*}n*qCEQQTAjo|(bir~UqAtjxRm#4}my*C{T}PppaFZ0V7Cd4V+n+B6dlD>ZHk?31 z#t-D%SJ>C?LjFFg2f^X;cJ1BbgN)?C}`-S;>sQx_bvzwd+|$SuwJMXJyX zh%j)k7%*b4-{m`3kQ}KJ<IPccx;8WqNt_t=MDs#;;;WLR2^3|2N8kiPrX0g zSeNLl*a<~Ag}lPbBbtIwEZuQ|*AA;MVpsTSIAw;P27f(_pe6qm8FG9(9=xDe-F^^W znV5rB8(CMx_9*bR6P%@ERv6IM0$Y3wVkWT2ngr!n#QJlcbmkc@7o3 z{95#|ic)WATf|%SL#FVQ3dVuasMyulqKAwRyhucj0er5|Fv!S3dSPFrzwlQOZAvGJ zxVMWlEq|hQ?X~D($KY;|JIznTvRE->&M*^Xmcc>H9CMX&%g}Lv@FQB+UyB}2BBZ%U zPt^j4l=s3aVRo>UkRE7LSo0p~C$$OqnGHDQII??e^}PenmmLWtIFnV#gE;CD5-Mrod=o(!M&tOuvVgYx8Q zq}u*88pLT@>Rn34V6FK>t`VBfeq?CXLfGjzCy;WBQr;Iclycm#)xOjUSp$?Lb7;pi z-{8U>Mf8N$%sYcW<^Fj!?SIY1DC4Gz{iSH+%5pJEY5tw>Y(*qw`|P%K(mROy+|9RN zWw|Aatk_UmmAuc4Lzmvmx4+2d;28t)q}hELx?mX+ezBH&w25-W`#@1&A%D=2h#0Zk zaoPag30($_3VkP?%Rv)JHw~owJ*bDRgw}reTJ)qRz;OPDJq<4gIsp0;dI0s%-H2`B zsUn{b-2>{9U#en{WO{k!_0=okMSUN?)_9@ekqyN@1gEe+VY#JyX_8HoZZkti<43Z! z*qzW|D)!H7(Ub1efCJFSpa=T~jSnA0(!8+Z@EG7FNPY>p2kU_K_*bU)U-$zL|H*5O z7uFOy8~Pff!6)P=kY|Qff)|4uxzdRUqzBxD#|xgqNk5j;3) z3|J|=!zxKqB}uW6pJy_?|H2BBptrxFF4}67n{6F@-1VE0W+TVs?Qo}&#?nOhpub^G;8|En(B!~bS-ysAPf{r6 z4>Sp20s52FLS)1WvkPV5KhS6~@1!>kG8(PzBw7vEp7g6o-T+M(TokS08~q1{peN%a z94vlutIv1+8KQ09J$`eg*i*)mo4a(7;N85BQSI5CFvkO3;>} zse{hI;Sm{wZ2{=ZSpuFTSdF`u)L)LPL#}|2puey)I15v*p#gN@`;~b! z(BY-;23F&4CA9~R1o{AEFvl<-!Ii*IPznwXoG=ArHIB4=q~ya+QRUN53-x#RlKLyH zXv|df5A+V|z-$7>Fb|MP4vSZE4w=siyG+gs?1@?m{Qw@2E0{&#s}d^Gdn0$D1T>`Q z9nVQG8mJr84EeF=2;c+xzL$ERtsd{Luk6J-kwz!8*iBwHL`;x5JWPHdxzjIvX6zl( z>+Q_Xd7~?bP=D~>In*B4iP&t0ysIB3ztGg2I~=k3u-GY=`3rle@@oJu(SF8Bs;$Cf zgB>7!hbzf`>lI#J?selphHhoMo%ej(iJ`h(y@2Vjf774H9J)qhx`h#P==f-hh`LJtM+l$JeoSMU_f z1sR!wbd~x%^i4XLIz)R1sP=TmrCzaN8WX5EOucNs0}t|qnRlu8m_GFmA#6iqwGYP1 z|KZGpFl{l+q<>BFQSfn@!3F6CX$b8NnzQunK>vZn!b%s|2H^kjbCl8^T7V7%4FlSS z)WNk3mHL46|48o`d@kq>v_t4v2b9zvdx*dv;iW>$s2v;=dKKh|^s~Z)0Sf`P67(+c zPPF&#lG+2kfuCbsQuBwt2rUwl5MC>AU+`#XK#2NF`$J|If~Ou>QhU+^2TVY_hD3z_ z9@ZN01Unjik#rB5hb|#?d|15DSq>_xJ$Txnw@ck##&!WWXhWE1z!CHpw1Gas!oujG z-^n<^!6mgPz0bfHFo%CJe^HzCMM;er5Qatq$jbPI)Y+lq98ywys2%h!u?0$nBt?t( z#te~bqoIXBTLTs`Ud$ly8=MwV%6tF~LW6-`hg@DcGoUX>FDj%r>@R5kfUjIhC}ZjH zpV!dYYNfO%y|=Khq~M^JqM4W zG4Wc^>D0@~p=NnY&KSTjSJFHSU{Nqj!b4x4vni>f_8A?`i~ZEz?8Q!m#t> zKvR_7J-8-vl&Uj-ZhN&m@PGafrzC`-y@T_h!}P9kXztU@Q1u^_SHB;h=Gte4s{O#c z+H-MhuKVavbu%UA;@MndT}d^{ec0qq?A}~?Z!D!=)tHZQE~%%nH-u`JWelXUj85Pi z@&(!%{3Xz0rTqgx0VF;&GVDwRxr8;d@F~^MZ%I=u$Mx<>-t0oXQ$4al^#GG`-dYZNuI7aN$g~WT&Efuoge>hT+8CA$4hF&LsVGpUZ zs7A)Ieou2=?_Sj1WZ4Y~8X=v3%J`kz~jxTFH&0ELZP<60RM)$&tKX8DA zpsr(7ZOq}!J`7kv{9jGv*ib!S9l$#Zb03ZiRUd0mxt!d~zuQCA!}I_R4i-3k;o!HD zGlN5elSs`Ub~7wH_*6hS($<50&`C3+BUF3rYgSaEqM3f zVLJ!&x-(Q;oTbA0go!6}Kd_pMd%-Q$5Z^0hP9Yj1BZ7b>Y;1TS;Kc*y2J~b^1oI0p zghd5N;v4of&KL;O9{b*OKYK#G$GAqU2KF4JELw(@2RVzJFDYx`6Tw`Elm@539ms3= z;t|W47pgs`d1QDaw=@@@-dQ|f)hBIm#0r_K2j|HiLH)pgg|N%3H1lzrYq4`(^7%qE zc@DvfYh(DcjVb-}5`%i**Wl-id%IcF&xIVfixU#U&otO8$6caBd{GIN1)k(zTmBbClH=0&NNu4+S4?^^0BZi#||&voriLx4lGB!r8<7W z62e~xsMH&~SQH8t;W$sB-YyQ+4#ONUgbx*7JsER^PY%2Yo*GDY_&_nMc}~l$9O>DG zXKqQT_Sn|*LkXuMgrSj1YR(qU{bxG$x1u9$%R;rLp#%9PJ?b*|1sPlLW`pj)vk~hD zbs}2`TpQkJ_&DHeglzj@N$ttJ1mp@xy9N9e5qVHM<^g=RoNXg>8DyrCYz=dSrM~oQ$L3o5#me?Mm z1ZWfT2!3419(cMDqesL?W)#4SEqzb;S9sUjy3?7*45ybjAUS(1fIXzT=5e>k9 zei(acPoDGBOYLW|LD2jHIXwy^@^zo^}w2+lwBD(iRQVa zsT#8R!^~%n%q*jROK*mrVUy_O7evM3jR%JOagLfuG*la`w*dz5KcI(*Rmc_Za?dW< zOl$+AupEc%%IO1Y`q2>j$J4ec0aITw|w|ME@ z%V$8%+*_PbB6)+hO!$}I`*@VhP??}1h@l)Wu^-3Mc8PAq1s~`t+cTuLe)K)dV&8WJ;9cR z#{qZ;UN8pmHvEm=!%K#B4xl<@J<7G!uvKelK9mAG~2ULHpFF zL-m9+cr{fPgJ?$8%eskUl457svr*AZ!TL65CScwS*IX!pu6q78Pzh9R%HBf;jfJ!^!8cd*s+Q zg=&@U`_jf{Y858|g&F5Gf;;{ztwrpHHbnCt)P*yQpmSq48LWVi<2^f6>+Hc9z1DGV zP?&L-hhH55a>?qDz9Tu_b3(OR9)3-&Vw{u7D>Iom*{R}pz4$$uxY}gO*P2ZH4fiG! zuakc_tG{QfzgyJbt?KVK@%LKtXv7JtuBfA4wNOW=8_mdR1$?n^JJ`EGKEW-)qbN%X zw}sw=N2C83CE~AgoU2u@Fb0g9|JE(=XyCDz<40!wWa__v1Px+rr9cYNg;M(ud;kvl zturiw@B~{aOl$cy16qZ~1#Lh+!El2l4AYhuGr)_4Y%XOWucUDM)lV6qox%_-4>vf! zzF5tb#0|1K3%3ugh@W7}L_|QAg`c^!sZxF$0U4%L-v1@nU|i5cUz}lFym2Z^9}=V)P+jxtf_0be~&1GeKgM zVa@Z0;a3{< zr$EnmLh^>(r=@m+yArnkyYfwjJKEsdB>kD6m-kRBMk3#6ReZ+u1|t5t_dF7QPu_zp zfZT`n1m8nrwq8KZ4+VZ#-jl1!%9JLnIfF5x(tdawDEF5@|+r5QYy z%%_-Yk?+T4OciYcv!Im1(hQj^@?8@@laQQDZSpKIORn{6e8c%(gqaAWh`y5a+u4;5<3jX(Zmk+!3hVi(ZLSWb#XrHpF6NiS(7e| zA3VwQURWCpJAY84o*PUDOlevl#B)rwW-ReL!88pHSq?@jSM%7;d%&>xSjx30rHx{u zt^B!uB9bYER~R8XnxOn70Q^CYRw9z%%O|T zUg?i4u3Z6dl4FORyT$oixl#b*V@{^|0!o>aNgTjO$-O8hi*qGE>SF$+J)xz+W%XOTBOgn64Vk-6J`vQhD~Yzq1T0=EvXw=hqp?@ zq|~-}p6IrU`vJnYX2LaAQOMqVac!3CdPWq(by&Gxx*thXVP#;HJD06gmlTcJ56;Ch zY-Cb>Ce;P64kRq>N9c=Ovy|Ot=_v1kKS3sfOF_EBL(XqYzGQw|-hoUHwU3=^F3^w_IfkT!{<2Qeq3+vg-B_oxLT+is&JhnV1 ze;lJJ11x{T{FeLzxrvs)G4BN3&7mwW@a5{_Z>;ZX{svyAbyTg5>R56y4yU8Og*^|| zWxMG3q2_Xx;|{O{Sv%D2F@G8!94tX_`s@%$Qpo4s;WqOBi|Md*iY=`xLL%cnFt$?y4S)^4p6mflh_up}Fq zbpp!*(F{-oK8T2diy*!mY#p#|0&5(3?TE{=bs*mkYn$Lbcr0Nf!RN`XgO&>0Ch$AK zCc*4Q77b`^d~FkNCKCG{%{)wcAOWdjJPa$VnJ>!OIGIMPXDqja(X#}Y*gT9!sd*Sf zNb@h2R@z6!(q*I^t#WNy{-*gG@W-5BWc&@DZpb~vUm@3!pTjkW;c(z@$P_^x&^&Zp zBn*dx-$m|}0R0Aaaob_|n~VX0uflf({y4t;4ZbMmMVjvbHe9N06PaTfhQon#@%x21 zTy@zdHm)KgpL0kSnQ}FO)qG1fNE!m~VQ3}1MqhdaovAQbu9O?as$9)F(>}P@dVaDr zgvKP{J=)T6^xCr0kfov2_E>I=Od28{Afpk0FZ5OH2hVkfk%y3i(7T~+%1lgtJB&P( z>zJXrqZV)je!I9loJmhhEg$k276bAl_m|mn#*vB#0xTF*v=_UYXa@FCR~}?^Esry?>cI(bwJq{NUu`I z1D~O!kKpl`TMP@q)nZmanzLMm9S>T}mA0@!G*xO^)oam;(P}0AYch)jJuU@KI&Yyg zyp*RgOaDkXYhbm2{^+cB0#sNM0n2i2pX7y=Spx-`F`9lQNDsN+kCa8s$HPe=#GSzz zq<2cMp(-wcpu;042>6C9^7`yC@BMlJ_eGMY9rd>AsWB{SNk-&N9jn7J+A!u$jU!t2a4 zFznn0b-`i;cYrR%?-!rlGeytA=b(9kzd)LlqGMKOezX4L)iQ(TH)}JaH@{1_l;NRZ z3scMP(X>15oGvz}C4`vvM`kffnF(tTGYV1@**IKxm|2ZCU{6DSLS~neg$tWeMxP+9 zF$YSS(}+Atn-g(*jA6XzvtGwld_GHU5!|!ze6HMH41hM^X3wOj zVG$zI1$ht2&utf<*`RnCVUzpzV#bcYyw)~zG5cC_@#6A2{LGdy;>kgyVwgh9| zWciQ&UTV5O6MHW;z?d~QhOjA{LPNNiXCarmki7&P=Ta_8*;B!-qKs!+>22`L)3XCw zJku?=QEuKI`i46EqZr*5xVPRh!2Xc!@)%56&*ko%615ijX;&}*(`EY-jJ zAl_oC^fepXVPdHrMQ5?rnvm33=)qck7p+%tv; zo?_}OXC7!SrJ)5_F(u_f3$04oTo_uFi=pxOHJqv|ex@Um#jycMj!q7n^Z{`!%oMNT zd!@(8?2g^=EWr1M_#FO~-n;SLu^aQAxuc%BDAnAL?G(APJ>1N#ET2RFD$nO~Wf?}F z&o$7K(dDlBt+Ixpc@=u%Z*?@aC$3w!$R*6LwQL(b2~r9jvaHgY6fnW~87p~f>2OD< zL#^NN%&>Ggy1c^j!!U9=tVV6+vecHP6^OaYlBAfPZRs!!9cmeF`62HmZTTTXBJ5l< zdD=>|Q?&JB>5!ps>5w5YR&;3E&(!LNmJY|B4%uH~?Paa`SvnkhI@BH-E0-DimJS&b zV<(r{r)v43<%cqoFj{_Wow1^F1f zk!dY2Rxq%aN%L;@e`@II$a<+B6}_ri#~nr|Dl1pf`7<|IC(^CSm1`0wJVyTr*~3w2 zbf)$sHNg9%+w*gNQw#@vVyRiE&HOA!Q})Hk)|{B_a)ywm_n^qXq<$Ou*Evu5d2lxJ zZ^}E6*|c*+J{UYf$j?ERm|n?-ITEx}jJ$`eU*xHP8~azd${4q~WqEI+oz)F~&iqHu zT(hL|?kUB5(d@^tl1k5Q=8G&F%at6aOh!lr)*cumqt%|3RDdo+vzUcobJWImCAiH| z3zlKJ>QiY1?wRIbQ-mRaOMCk=pJwe*3N3adTXrV1PDw35n7Dk(dp z47E1ZXz!q3icKYVcnsqUu{PCM*;M-c11qUUUsCB6P1dH8GTnOr;IYe5e(ao$)Wo;^JQ(>m?POjr?Q)#~m^F{0Z z8&B_F<$R4cN`>7UIU~nfRMw)ByTV(GO3Na%Eh#0#_{u4ch!mT*)}k6ai;CkYtU0hQ zG1B}EE2-e;()%Vce9fAfwWzE`Wi6^|v8eRPm{w9vrmWLy$Whn((lRHtl1lCeh#dHl z=BRs5Wo7tUNtL@s#^$J-Eeji^N=1evqqlo}DN!oZ3CZSpYi+8rvZ>^`F3@F|lUhkN znv#m4Sxh&xHkGxhtW8xtHdR=!y_Hm>FFDMssWgYQk}6z2g+4P&`ZwjuavksUu5{Py z$%{!UobJu5oeQsZ*V%-oweIk*=kMvR&+gT0u+gGFm&UXXTd$TZZ51}xty|<0rZl~8 zEqj`wx8g21R&xGX#VQcvqsym2P$Hpnx0YU9diukE%}nD+&P@z z9+w2S1<2rTxn4beimn$k-WY+#jNS>fn3V;XRLeP?&fHA@jiiyyK z_?LKAd#V$184Z)RC;K&Vt1|;=ZP*yQ$jZ_2D{`bNf5MoABnrIFUXtLDtYCy1Y z`B|13fU(wfSkpk6E*)K5=i`}6xKFxA+#mE3cL90Xn_#=xgkxZXM=tpdXdjvgm+Bdz zb&+B?#!TnFkG`IW{>k3y8NsbFq%@T0*miOSlKzt7#44i0&y0~r3!D8Bmj4eVE!2<$qWqh@bQfzR2 z?ptx*S~&@1ZE$cS=Jza1wA_=D2cElfWeFh68i?kSW6>(OE3^dN>h^7e0~h%kUa*X0 zs287Km9@c5c(69OnYT+X3+5Zh;7#xX@Y}_uA|xSnNl10XbI@;oTk4moHe86M}uC#b5_q{^qJ?jgrkhf%095?pxl|9-yW9) zw>46Kj^wJjn1QaU;p)WMZhukBy&lD_qfV5IH?;CADIm1Nbg-f_kx<|}q#u7@h zU*V+BjtnK{ti^4hi3KISmu7KG(Hkvc>K^HgD<=Y?qiMmj&PG6jd^gO6z^9~j6VBHI z?}mOyu9P;n!RKn4eI8QY!cycIMvIWV-b_aD@SwWoJ!n?&wX~9Mf^{L#KG;^1y0^J? zd2c4Y1y2vGO=yL%J@{>mF{o{MPg=Hk4<0Jn{&-r77=^a}v_4~&n|e>e@#J;rGi#Nl z%wmZ#DfcU{XO2u#<89W>HFrg+)?6e#!h-ku?22*M%31KJnPs8I3(7$I&?C5SBhzbg zWB+KC^|rBXHJ=926aQF8(>mq4^*Fg?bRcW8cfhAuS7!bY6vNRw!4>BZVPiO;Zl?LL z{$S0$G^8rK9?0f8$fyo{r=#f;2F8JZtT=$w)Uq~=oX6aQ<|#S9H(NpS&O&k?Q60Pu zk1#SVP)B$<4;=;X!w-v9rm!gSKGz`UtGRu7Z{(4k)q>|rul%WEZ+BTDGdF;*Q|Sa* z_)|6Rn3HOmgQo#4^xXe6bD!L&(SOs^+C$=P5!}V}biVXMPrwP}KJ}5vJ0p?EJU8K{ zq8YcpGagN+BN-|>dPQFtyu5I-ApvT*i8@U2S5)iqp5XnM&3^*B1tM@kSKcK zdm)g2;&KoH8gbJ{tFILc&j2B~XAQ>^=~c^T`Tm|Fx@n-1$Wi%S5maO*&B(6w_+IqM z0%GOnAy<|xTY2)b?lYDoQ-jgCpdNwxo_KU!I=jgcDq8y|6fSN*y& zTM~)94R_w!wr$%-RbhvGR=nkXa1Y$a%_Hfvi9YY9&q4IT>^qb`4t)-z&mr`A4}A`& z&m{Wv(dTUX^wZ}<^l|BP4t>_r=Un=%qtA!w1Clw9J~8@iq0gE0`3QY_>2p4PqV(C5 zJ|Jogb8q_WLmzNCFi1@A{pka4a{+yhpbuE%Mf6!tpIZ8Crq6rn^FjJxKE01V7t#k* ze=&VNN}tK}!Q=r;o<^VP^qE4RkI`o;eZcRw(q|rhaN)h2YkH0R^VjMdUk#q$VB36Q z5W60G%3-hVv+%!r9&CH@&kd(PaNi~BVe!!K)gNA5ybX6QC8S*+bn{ud2_)fK=&4S; zxf2!sLlt(2Mt6=gu=c>;=WgQ8Qh5Oms*56^T3#z64 ztSZ89(Vat7!Q0gX-dYO+_`a{7vETH=KfL6|=O6j?Eg!w(+FcD5{0hy`eFN@bRFrnPYoo*QOwR8wtJk-Asu4B3T|glcc}m^L!vqiKN%g?3 zXq+zm`9I>9{Ou)mQS&3}=Ae49!}G8gouBZOdx>Nz%JJ?q>Vdqj4Xc{JsUGk`6VxTd zeI_;RW|8@A!;{%Id8C0v*{9konJ7;?aJM~L-!Z-G{GFe8X5UZFYb=E*yQ#~&zM@*@ zE?z-IsfHrI_(o2l?++8vfhh?#x+vMV-tBjmB}tjIG*>+|*HkXeo&3sWKmGN~5B7Xz z_p|Qadf!dYmrQfFDDq*_x@5Fy4$@nQbZE>D6kBIShO7xocU8pec2aV)WM21?|98fb z$^U$K{yp!Td(ZFg_)M&1x`Psji|J1O<@q=8hUXa*uY)!zRKpX}u9dC;26#)=NY}5T zM|71;akamBdd*{#KQM3WzQ_OUv=4o#w`7XDLh)E8tp6M>P6stt=yjdL=}dA^@H*kL zu&l0%2=8fNiLR0f@0x$Uc}vZjuPlA+_=|tIX2G}rU&(}5F}2Q5cqllr<6jG=doZ7 zW6Yf?StrNHJRrU0QqA1-zkc@nxqB^rbeE?$ZG7YYua!(S?14L6fmU@ye=%rvN&YXB zRRDjsaP$hQ@zRXb9v>Qrj)BCK9o^oE<_ikmUO%6A0ti6EOURgdr$Xho)QhL8zr7WB z9fhx`=kQpTp6T~=6u?~lHGOb-U;3%46klE!B`OeZ%5SR&ye~bATIj;9UBoZ>4_?^y z_6tAPdBei%I{!nx=%{ZzqPn%^SRP}^T|#9gcj-UAf92OE|N8G=5A4!+pPiBI(m|@f zUNC#Z0m40lf#3s>0RnHQ&l~DR@55ri*VE1S1>JlH-Hg%)*TwQn|GPo`^a8)2d;hKP zr-#1#n@idsf4t|dd3&Aw8-}x}C*&W$QC;;mdaUXQZYd;+l35TcryE{)NR|0tcoSrP zgSzPjvA4B{177Y&fD0nggvnnP!b1pJf`o$36gY-ZG7dFVXbd4}i6vCv7^ruJX^CqXKN;7HKGIeG7`TQC z;UNSqO_M_i9>Zsg$vCc|LSqO)OQ~XG!2N=}m21FY%i~LEB2aJLrMS+=A<^<_iEF43 z9zxI(TE-PPhV4YgA=@u-3>aWRT7ry24dW-{IIW}nF>no*mICK=2)+a=05z142d-iK zXo=I(${z#QFn+W&op1pELEsod*>R|$LSqO)OKgP&j)8htm@jb+6}RJFRwic$xkiuw5QZb_M)g3RbBOLmJ{5Em?3Xl_7NgtM1A~w*gm4Az&_$;U>||U5%n=NuF+CpA8|9Vk0A9C_3@un0j{F- zh?WBTh?{|ZgfJgbA4B6BEd}-wHv{_!`7okBhK3_r3hX0p2KEvBV?=%Q&uhkc&^NUg ziTqx1ySz9hmb6{1Zmv_`nDd*}Z@lc)NN+;{UAXOKk=>$H-8e%1agC~^L;a0Ey=+|Y zQWU~?j#yOG3v(p3{ z59ZiJ!Vl)jL>dqDf{8R9=nxZWJYe(_X*`g(6KOo~Vojv+Ku}kHJS(Xcv4o+RegJ(2 zY8lisR@3O`7P$WQq7RfyeDF7Pi$FaA4^{cNNR=slTo`zjkBd~A(#N%D^^c2Go6^Sx zqOEd#k&09LxG*`Zd|agJls+yno+=*~sXV2R3rw}j$3?17>EnXHsPb`<3RL>I5EiKN zagi!i`na$XqVnT{<3+5o2+}tK^#(-eD&N0W^baD>-#@rFU;@CbfqnyX4JIhmPPhu_ z`7MEchwrNLeg6QpB6Kl--(mU(^&R~OYbCWTxc~6GRlfgXIW6Go?|(sk5^q($Z)4|2 z!`5?^A5VF(K6p&}wu)L2JKmY-0JOlD$tJ-)sCM{Z9^-GQ<}f=z=Yezd5V~1;xChQr znB&FfD2*d{j)JpRzW?R(@59EVf6J&9v1?*6+5ugJy#i_GJ!3Ma>>5S?m;(EC_?Yx- zeCDY$fyXv!0*?)0tjhDJ@uA5h!jA1@P$TK`hF!hUVsG$ru6#5v2z)z7Pa*!W*yL>mC63@U9s%%I zi4g?$8Vz!;)>|Uffg_z4&yAy=Y}vV3vk~#lz|a3_TDosEpxq zd5JyxgK9v`!BTtFujVN_AQU0`2G4=Ijte|zzW62eXPBzEFbRaRO5fl)FspEZ=fI4? z1)c-76c>2T&Wi7W=e(ra1<$#GKDfYhE)c(@E%6EU40z63^&31V5Q<_8@*enexoyM)o)PaYBd^AV@j2S8gEkNpvD)~Z%|{c z;K^N z5_@;M8ouy%g~4m3=hpwJ4gs$adANYrK->V)jGH@49Q|KWJ1%GkVMbr7Me_v@Rgc7? z*~_C{yi@%KReLR(GzLN!sQQ!Qm(05GS~Lk&4#);V6u@AJey&7_4yXnyX2p0R8aM(l z4j#dcC61tEE9R@7`N~^4fzzF)%E9Sos^8#rfxY%xF=x<&xGt7o*?;%`yQ=9*^^H4d zErK^5RfS#`f!CV%x(I@H4||#F0sMsK+lwD``FADkm&FnP9+x+%a{s=oPpfkOM!;WH z<^G+icTzO&-y@yZa{Kq}=XJUM^CJ#X0P!Do!o-2*aV!j&$O`(LLZ6fAb1HpS)8|C` zoK7DQ1>8d?&*>QleM_}f6LF|iCa7aBMjQwK(v@xXDr%Bn1J-fjHPnF5 zFbe1b>4;-FP*{hO?3Jwx1_sx4xVr7_g1}||Ygc=^09Q1w5??z?zLoRZw^W(@%61Zy zkUKez?t!~|TN}Utvsd;tXer*;Ao$C84Z1@auK{vpyat4p@fuh|8Lxpv%6JVdqm0*} z&6V*QW^;+JO`%u(=swU)C6M||C3ww`?vStf(H-(NKe|J{=0|tP*Zk-X`I;ZyAz$;O zJLGGAbccM6P?tj`AzqtKulQS=YNir+3YbdXhoj#)&gFGalx;FPvY{v7J^UCl5gd_cE2ilAB1Bc`@)A&d+&`efE zSw?^GIcXlC-b%%|bffZbG@L_X8V@*3?uYWJ$f4>PeiYy6ioUYwW7M%eXc``@Nz)-- zMMrlWy=WL6ju_(+vVLl6cW-(<=pd(}ZDY)awsF)Hn+U8ko7#pX%|Fbi+*WHMHQQ=x z*aG<~)s4&4F1#v%o68q%9uF7>jZE*#*d>~4UGfa3~{!0OpU{c zE_Ad*(e?u{o(ubaY6Tbf01SkuF`^blH~9Bsy_ zcz=^%v4$p9D}o!nTQv=n>uhxcCfGYvIZU#*tKTruc2&P&vhAUM!-U&Q{f0@mi~0={ zZ%_3bCg1MrH%!3Y)Nh!Cwdyxa#3Sf~3nt^PbXe+h1fD;L5~(1lpPHRf!5S3)P*u`_ zKj^}rOv?EEadjVGz$IUA12W<8c}zXvwdw)T2uI=`Q4jo5ed8XyJt6?rnH(IVQ=bzV zd3@pH>X|=zo&_l71%9Q@!Csk6##hFM(&BtroI|%H+3%jg2S#@$6PZ*p-Vsf^bFwXn z^ATa@El3OvXPkH}u|D#7RdZhF*QgGBNoH{2)hmmZW zMpbVda1+$J>-1#_7M<#K>2EjfH0tW;+?*k2c&MLFMLgQw5RDJh52~PVIEBOAD=ud-s;@pMEr_>q&& z(AT=mfRkJ+_*;6t8+S9&I59dQL(88O6ApEUO2CI3-ISgR&+nq#iC4-LgPFCB6d ztCquO25WK-Hz4YVX+O_RxGAzrHao+xA%xYCNM@X&XgW>YitGt81jNajy=3(|gVCWO zFtHgY;AVUHsMs%2L6m^T_^X9l4EQEhlME9R?6AZy+TqeY4MZ}8ru_0%9k^tX9 zU^Y&yucMMc%pXNJvx<}n^Sx*SErh9ldL$hPKTnY43w&pf)}Yy{3YunuL3ze`jc)NI-wyncs2uBr@{(~KA|GK#lc7XMgS>-B#Vm_t>mrC+na7&9CY(}dJ};hTzM2NA~bX( zuSzs3+?e$3jkSnmkEv9cjf99;i$g*u?ZCNAK0K!vjDKAM>??A<>X$bR6qK6@wRzVM zH2hE7$+79jeQs0R%Es@n8elt=?g>XBzCq>fvp%}(b^rBv_vKR#`$co=jpIyZ95q6$ zX&X9%WlFg{7rP)Fn^#<`pIR{#?W1`|D!Q|X!aT&6Q^S3k;gnlj>k0luUQq+({(gdj zW>l@d_=YaY{{;as6|F4jnme<8#tNDVeQx&eX+l60y3aM{w2Y3a&hh=6Z$R$AKQBwH zx^!UPXP$iMnqTgn{Eew>zIrPQO*p)J*>6k3-3A1zziT@vsOCl!M7HX+!0`v(P%q*O z5!98bVORg)o1uov!^g0$IA`fqiSur4zxB``yz=Jyn@%v5v12tm)LrOB>F>li7w})T zJ@F((lBU8Qi@P(2Qf?p3fn;J@ZEa|uXyggiyAd5}4qVjFsuP!(C)q#fhPXljiXR40 zo_T8i>Fs?lE`9Qf?+iYC!n%)|%Ge2%1(c4Kc$_|f8Kjx?Rp=YF!X*^hr~nX12!S`a zyYvkTSpows`-5+W8n~B2?%aC#tmMNV>9~B&AAkSW&5yo>f&0tYXOJEEUi1))Ht8e4 zsL%J8)^?w`TpIrTFzkJ&J25<1TU#lMKXQwL1q1RM)HPKkzxYN@q3@5$^!L(L%T-`J znLx+SIH9{)JJm!&W9)0H7jlh<_jLpz2wu+gZK-Z^%u3*!&wqqH%nzL%TvR5T{ zBQv%unu&UKri$@6zXEm{^_t-*zQgc1l7spbmWNMMSHX~T&Tro3e zC=Kd_?k2Rd+#OmG-2gwXy4~L2FY-IG{+_v0mnSpiqDdy^PFW)fLkzF63yp9cGfvh&Ps#qAHf=`l{Al{bXgt;rY|D;M6MLUnSdvCI3b15C z&Y|cq3}MoW#I^hUq;B3t_sn|ppQm5k3x?n?yW1mlMFW`dXtBmWr^+&FxbOTet5$zO zE&SS~2j1%a_>1jZkJ|sUi<@?a0w?qUPq)<5>Z{y5!zW;%ATc5^bL~vkg2_b(EkZ2q zl0jpU0%%IBfGRF7G0?y~pfzfEL3u!d(U$Es4=Aa?5(2g>V08MamK9}1*f z-UY)1TjXksWz#|c$YjC5AZAG7Ee7B~2i*2byh9}rFWE&#SA9s>a#KOXJK>cv7!e8YaNy-+RTBw|WXb~x{yE@v$O3bu_rs*7ZB_V^veCa3WES1c z#>+&tizve1u^DddIpXhS5{W&@lx$-Ty+KQ&C|`r}a*~NNhZ8b#i%_`JOLtbdLzK^x zagA>Ws);)sqHk7sF(G;y?!8w6+F^J)rC|MES)*caRI{}AOt&wST>u0e24cM^4sWBn zR}4`IU@b*L2V8_UIS(W1^vBk&bw!qRZ``F+9m>oB4-iC(tcodX;isG8^imE9rBTq* z4VkC|Kb|U_RqKdrI)6Llr7YGfqz{RzovD<@5gm?arp?GkY@I1yVw{3!b*>p)9~)dU z>!|~Dqc=%(EP6xJO4L|tH}G;$+dPe?I9TQ)8q_@je0;qT9hf0PjU|i$JqV5}?{HJC zo5&rPX{sTRBUUF$z&nBtj0(X9JSi^IlzJcC37%3OtVWKeCr=uP5%I^wqB>d_rdBi& zJ5A6uCElu1kSI-nmfam2jLL5o(eMI|>nb+@0}}+0-*J%|bY3+7xSb0n2#_DRYujXMD2=8-hSTw2~%t4;bgUa?K~|frBSo9(h|{jqoqw zzK$is-!+L!l^{W=zpmC0@sH$1`L9%-GJ08FUO;e}|9e!U{0zCt)XI`y{&Lp8=Kp8s z1JCaH>wUi4bQ>DReSQXi`!8VRr;nwMyL`C+_%H4AmshT6zIctP3|KLb2AD+hzkYs3;Vk-hIV^YYynDn}7GU-#+D(vk&+$ z;K^SGFB{`KA5RCF~1UOevUx-YF&LgK);7%JL=_2COThi4~MH5gENq2oA;w z9#l80UZzD*N5m!kviwJw`EmAMcST?S_V2r|{OV!H9{b;KJPNq`%K-P_`B720>j|QN zVXF8bU%wqf{>8gC{rHr3ywLIGd2cly^_6KC0`mSc)?xsCk>#}~{m9W;01Q0kEz}X_ z5_OI-iu&>#zL@%b*Ns;!x%8PE7haqB;)-v-8J$E$q4>qJJ^q@We(o)cF1>o{!;7E$ z)h&RYzbt(4rz}~Au6nPW;15jpC1>9Am2bTCZ2N_qcfGX#_tOUOaKSlggFgbEpo^TV zy0?U|!5@jNN^G}bgFl{$PzeCDW58r5zY}d^Cm5yU*x-)`86lPt->)7w!PW+UvalS% zZag;llZB%AQ3(!VgFjgqR|32?_#?rar}PEw#fAi{6VrpVDM*4!Qc~4hi5=|ZFF0{0QMt6UMRabv3;s-_{ME!5;!jHr@kwclHnZEv}M+KY+16&|@mI!Jphn z+vq^vALs$({bj7hOw8cVW*YHf56)04FwpIdjzk5^9JO42+Wzwifo06l-%cm{vq zGu;8|t|wD0n-4&QK5JCDlM4{jAVUR*P&65~dsi@}j~~0K^lB1`3dW_t|IX`acZJ zkK!S^@^(nUSrNM{9mU&%cQ^JU@g}g`teTyzzFX9HtNJcC#&{Np8VN^%3w4+tO;(pL zlwcQ_5g_$dd`D6yun@4d3(PcN=~r>s+8Cn;V3lxj+Zdw+a3x@CV~if+jZ^}{Hpb|M zFfr5$IBac-Pkk!wyGJX9Ty#jRoS9}9MF8}|mILqt{o>2W z$r!k6;%lfw83TEiAL=gMX}<2+o*9Q6+kW2<7hiS44Tt`i4H`7G2mYZ8*29C(rmu~^ zcFX)n&N+S4&j0w)bEYyF5vp@47aw#c9HVlTBIrjPT;ome7WRZl@m>~7cyD;tPM{v& zUA2P3)B-FWwXc`3diXa?<4N2jxpm@px1M4;^}ifft;wxnDgzFcxjGg&q}JrYZl^YO z^t5(#cQ-b5HPyGaHn-01uJ3AVZ*6R!UEfmI&{MZMB2d@TRo~X!*xuC9+St+D+Sc0M z(9_Y=*3{nG+1=IA+$fIl!iGg>fR)jz)_$>*rVs0tbkK_tdH%`CEUu*+erFe+#jL?6 z=mMr*`mdVLEdRG3EV%x>!~Xd1ub+I8sSMZ?o;doJVJp-8Kp53K(aN5IR8NW6>#T3C z?`&&oYUt{yZ|rKRBQ!U+bhqXWStvmnypEqo~2+xK=-eo7A{F~^5@0x$<%Tsr``kJYi19|>3AWz5# z)G3ySRTc6&>l->-TWPMfb@Vj1(Uk0L?Wk*RZ>p>7>}jv-t`p)yAg?EtJljo}aMw6q zxI2PiTFx>w;OWlAZ{G6E;i;vc?0)0bZ%^9qZc`a>2e&M)D#Tq!V|Pb=eN%H&ds9nY zcXLAv{;lt5?rCpo?QUpkj^I3XxzUCRZB65aHuzqbKeF&`_g!}PyhopW{*j*5_iq&- z2AJ_9-~x({z3Fooe&*u;Sn$xlE%-{ueJAc>DuZi|>j_31)NC)m6dH|i)!`_d5BU_6 za~+j(jm@G^`RFMx@1xpu7PF!1zw$In0D{k!#C@b{Y3b6XFYZz=;; zit8YizzQ{7qChK49r59Dj8?!YJVM0KLPRlC{8Lio8R+`_Q&W%p;gfZXzwlP)elKq5 zdd*Y@6c$%Rssn}P=p;T2HdJ~IBO{H!fjC?xBX8f|9QMY}!@C@R#ZPYA{XOT*`8$y3 zF9Y(5DAMP3}jXRljFj}+kr_*+K;cm6W=_dx)PWy9E{E8o8dU&cJs zo!XAgbQm)opj47`E^-Uih0E*zktOQiz#E>Y(C0cKx_#n>bu8FR@4WK-;VEw%yX20; zZ*QFRj_AknKJN1~_}hO0P`^nwozc3-Aq$`U@*!R4{_21JYAUhC&lJo~CsFWB>0u>n}Yv29Tu_U3*xpu=?eUwkhL6ZnU&yhMY4 z(MTCb<>m>zfDZ3PpTInUv(PqOCT}#{3c`YyD(XqD*m&Qx#~Ifmbz{FH8sp45qTADH zH?u4r-R!2sQTL*5RrOKy;G!rUaONiZl61T|?PEnJjbj_DjiPO}i4|=Uh2zwN9njxL z$Lac%{K`vnpK$vwVmonMCM>=OH?S|n0ss^ze!=!^h4~vMcXZTB&Y2hQMK3`=_m9Y1k*av7(`UDCd|`wSeNg5$mDP%nX495brUoJ?$%^-P=PEJ@Pt ztEj0~;Gdqv)@-7Fb>z2fk%OjUS!17Dix+6~dvVsK z@GH|c_i1r_I2~LGrn8w|DsV8^Zx#4<7!Fexp5~U*flNl0@;XtAyvn3GQS-f21!yis z%@EER%Y77`B(5<`B#50b)$yZ}Os1++!a#Ug;$`|HMx!W>h>d91OL3wNMR5kwnn7|% zo|kHAC`4}8B?|i{Dbdx(nziH}dl5}2?nFw+GN3ER#hH`?!-wl%X@BnEoQBqd=XE;&X(UST~9R%B=2cDp*D3O*se9dM^$OpN>8Wf7O!Nek zG?<=x7l@{4uiR`yq8)6HKwAN0ciS1xWOXkiC~2}V$-wYPgvOJ}^~zRrodL2MsgtA= z!h9s%Doc3K?}t9vA?`j~0?4{x-CJNaFsK)(OMoK^^ zQ(h)YfQKNM5>`d9;VaawRiqs!Q~j|7utm}!9UUAZ1x)E#!bnf!1k+%gJ+68YgtP5+ zuiQYKy)z8XP9Alfot(wl$rfjd=G0g5^#`{X5aV#9iKWc2gPr9x5sbLIHQT0Xz9DfT zc)p=#Q8Ds*G3}rXI@ryhPQ8z3Vngwmo0{cxlCjfE2C=)2r0oV`#v8?c*22i`i;_?# z9_o4+EzMU^5zSUoAYD54x`68TgB^{xrWL|WycMw?5qepaOb!{*eX)Am?E7@+ZZNug zMXlZR%nG>)c`n*Wjt%Xc+Cn zcGNyLZgU~kKzE2BQo@}k=_4h&3@TBH+HzhCPparXZV6%R2x;u}sUdt`b=SL0Q8*KK zIMVoe0S+%>b#S4s5EG5fe!Q^QAAyW zfv_WhIEWPr0;ghLBoum090YP*WJh|Kg^@=3R3&B_$%%_;4gkL3rsUy2f)7QIl?DP4 z6I;$}=_*okJy_?SsIz;O0&HH?w2p2BF2xw4m}=ls42QJ!l2==N?!=uZwSDg^$A9{! zU3U8KgHkuLrH}4$x)fGj?DF~5vyS@a#m9g8$a4qZeao^#O=WE2;awR#pF}^J8+%&n zJ1N(*tG%(iv95_y<2&km+M2st+MAo&S~`VtGA|Vy5_z5r=#5o@ITSLBAhab{v3>GI z{vj|WFB#BRe?;lq>HE^E?+m|h(blaWeDcl>yNjs^uB|w?dNTJ55MBR;-|heXzrEb~ z_(i+*zS{b?vrJ`dl!>=Rg_G##?B=eXy7um_rsl@Rx}K)lovl3$odoOd?w0PZ=B_pY zWyG$sP(HZ`ltbHIV+v)4Sr9ZC!hqb?h1WlG+m`g=>(-vM+fODI8;>Tz3sd-ZMCf9-<*!1#j3hI^4MYJ@gFL!U;LBZt~;euf|vTC}IW`D+AQBisB8 z0%DNgZ^C8c*!&F62(kGYU>*9Y<`B6D|rbiHa`Oy z88$ydl1HFWu=yDhKzSN;bsr&xg~NgQ8Ef7c?fi_$jDMS2|LMQZzkciKr!{wWyp1h= zz>f1X_N3qb{0vhWn|OFvrXnB$-PuszIJ>^CgLc59%?@YRH@4A^YR#<;U5%|Bvm5H0 zCR%<5Qku%i&j3XI`5C4%Hp=L650q!u6NoAArKz>Ev7xQ2rLnWUv8}GPqp_*3slBsB zLU{+u&j957`5C6N@yyS_7O=H{`_tUWqbDr7><1Uldg#`#pT|g5Ss3^;_poz~b=4S|^8UYR2{0y6)AsG|> zi}hi+{5&dhl`PM{Q5BAXV1JG>2~5E_yMKn=oeESPNIW(_!{%oQwiiet?7TCvmtF9x z&Cd`3RR2^(te;(h1#xEcGZ=4Gfis(*Ve>P7>GAH`{WIkB%u~~=TN}6e88$yd60Xh9 z@a(^1_s>wuM)8fbY<@;HGycH+Gq5paaDK*{qn)4euE>6eUH6_<3qEnpwnrB}^Tg4n z{EWS*OaA-}V;M|1zJv-giT-M>>!@$)Zt7|3>}hUqZ>D3?=(Mz^j+U;5_O=!}vT&m1 zXY|vU%gN6GME&_0rZP6l1fa7}p55Bf(%IhCMZ1*DZf$CrJ-er=v8S=4wX3eFzNe$5 zbw}Gj1CaCQXPC;yGe6@X>f=EBoo64idjENs$4^ALQ7 z!|tCU7-W9RQE_LW&Cjs;8G?9heg=WT9}C=G7jd&I(B@|-#wfn3JFsi>Gi-i_&Ckfr z*X@<{+WZWgpCO6Z=4aUa41-F^f%HIyJE3@>NqIw%%bstd0F?b2%lz8F{ESBGPH=w4 z|BiNkM$bLJYMT6uQx@O;_MI;J$Sbe6Gg$#BynhBlGXDGwQyHh=<6XUfMsst0XLEC1 zYg1!qeM?t!M|WLIeM5amd&BIyhSsj03AcZSOM@>bKLZf;=Vutpj9D;U^>vLMbf`&F zcXLb2?B?0+4GoSHhZz8E8&)a14Glt`IplZJ(PEF(^DpKxRH{~Y! z)X}Lp1xFrktWG-*K4b0sYWCUu3<3n0XawtZ=cSUvL(Y=up!ty8Nm&kN%BVV$DhNJ3 zQB*Bz{s}#YgYnjh#uC&R9fnE=kZ+{J6#b{(PhHZ!xcdz35#_|zI&^%hKy1bt!jY{Nu|csXdzwybPGq971d(R%W_rnn9|^sYh&YbX=4Tj4YlZ`gvNR;fq<9q4 z?w?`z&k&@7f9(Dlk;tF2LO2rnV-_+dfjo)s1`FiHbWC-!KXNZUG(WkK1fkNIq}0ok z#7PpMDSbM9+9Pk}yZvs)O%0MDOgjUjKG%`luU1H3uARPx049;@5%>0dlRS-|y*7c) zK%1Xo^E1T!52O%w-kIFRyWmy3e}({{`e!VC#eq1p`5A-_KQoNj{EPyU9B0ojC+A26 zP9j*=Lsa0TsKgl@j%Q*+@tB*M<#a|9PA?h6?mCjT8{8SRU45)?K#KdmC<$d@3`Y~n zvUSus^>C=9+zoCj?G~_Y?fE7iwao6HAvx-HHjQn5hRx5AglqFNY<@<*7E;_uPCgX=-Y3tm|y5Ywd2RpJ@AMtfj%1lb->I`tvhP zWo(oI$QsIBJw2^mZ5<6wE%ipa+bf&C)&20?yLw;liao(d^=R-Y(wEK8u={67Y8cCtZteaV1aq68K|rwi z8Fv2+yMG2nC=(kN(56GL6i(cxkcWLpj0wWp-Gt$Wb-qG zT(kRU*!?r?{uz-xx1ZfV!|tCU75}`DWN~Mp&Cjs;8G?8MWBu&Bv-ufnl8LYCj`g!E zuprLt`6i6es>rFa`)AnwGwl8uJS8J`|BQ8RI`X)3_j~iH@76G)U;ZtlkD;>QeCpoi zE_of0i?uQ~=$YCl)VG)d)m;T^b8S7fkiY*{iL%fyliBLO@w z>!*JaxbhRgR4NN508xFm_K(uD$i+*GM%lPVGTo_lGo1R>NUuZAoj`CbL0yW*V`tOy zvRMvj$B8GCL-f}SNee=gPG@5AxO3+4;E>a6^D}IIM#-^}DrfwG`5DbLmjd%MuKMd} z=Vwe=e92#*zwa-dpZxQwrw;71f6|nnu@800pPykWV-t@a_hb$ab#=9N z);Bh{)z`K3w9w8D9j!Q%qi&+*XRM>amy@3Xi2Cz0Ol5480mwQ(qqDoAt-hzeqp6{; zrK7c>zL~N#TI$+c3G}pCiOPb(+TzGIx)#u@C)f7GlN2tPnkLp8cV`Zz+`d?vgvGSl zS}^mIX|-=M)gMbBx0)DuIyyK+!2}hT5F$Dac^`>9p#;+5K}iK(q7vOU{DVB=x>LNwEJh+{WAnXOY+F44`#=KzS^S|k1<&oHb2AWXW0Ah7x0ci0tJ5N9?&gH?j6z?sd@u=yD_KZB>F&Cd|I5;i}B2*NL8t2}}ms7cxU3~U@M zay?RRw2xLYtrJ;2l+$B3RT7L(*r0a*3@HTs)4n?PKMTyym`%M7%+Gl0Z=;=`@%lq6 z&$<75_qShv`l7d%-#qvaj@Wz_X_ zwAME^H1u@NZf>Rj8oHaidb%fCe#QWext#nAK-8a~VJc&zj2`zuxwEIfr@g(cv#Gsv zc56#xM|XE)cSA=h0=d39k?eQvi5CF5P$umD83c)vb3`Lo0f2N>rw$TmVc7f(d%g+Cb}V=3 zvFDrE{WCywBgreX`587pL(mZZvFDrE{0v15c}v`Eeg>~&APBt&P&$}C3)Ur)DOcD) z%iXxUA)4sh?5uRtW|QnGye2M_N!CDjvL=}@!NlTCX_w9El}+^|Q`v?@JA?Gr0@_U~ zHB4LTPgeIb;-s9(bktWrorfc~prQqR>y@qMIs;@iQYY!mJD87T&_%P`?$ctDC{_*9 z3KN^3A#fF_^Rx4=V61jlz?4AgDGKEWG3CmdZ1Nd*8_bXEzy-Xs~?x; zfp*&7K_X#$jRdhPuprKCeug58h|SMP%>e_p=bI2kjHPXxRupKOr}lgk37qZBMP|=8 zvHNF8!p&1dY<`B#&xjP?($MB-R5Rlb%+F|{UI*r9y!_T^=Vxr$|J600KH%|14-KY1 zvhvGweq_qez@|L@{0vhWn|K25!T})iGkRJZ+giGso7$V|D21S_skx=ArL(=UseN|O z?Cy@%iI$%cqv4m6p8<&a^D|6kY?S3fxu=UZ&}ivyX{u}QYV4TZPCI9`^|ZFO*UxUJ z6He+H1(bK7{0uDHb2AWXE2A~PG@&u zenu+|EHFRA`NwGIXME;u58M_{U%KRuhBG?8@%tyg$d*39%ll{SN5B2~8KyEe@$jw; zFe5*sxvitAtGTnjsj0cArKPcJWns>DP3_#AGpJ6H+&-@H5 zT)O6q$df8<_zXnt~|-eFGe zN|4^1P^lBxrXVxmBl-|Z5J|dhFd*u49hse0 zo21Fj0+X8S zfA~i8{Nqy7O!*o6Qf?;xKYe?BY`>nnzBIe#>A}~21*~G~DEAQl z%)Nf7?sTYP{OR3GQ;stjM8Oo!*;fZz49fBxk3`h7B;cRqaK2QJz6l}EgsoeARrdhlzL9(b$w<1e;v zJ!=2YE^gZS?WQs&4ZODvtszS9BZX~rHRcu9>Zim8$AWB}MX|(sX9aCz+?N?nxsk{# zY9QRlPf%S{mA?3fF3JCejdZ7?<^^4IXV%YHksMC-x!J#`MT*_$8b!;hL*jIoNh=c9 z?(>tnc^BO?>&<_jesM1z#C?8-U-W(hihsWL@(Y$tKd1fv&QqGcGw1jZn##tL|I|_+ z_g>Yu@Ov-Rc5V6BdCP9Teamu;q2SoIs8M_AunBL`<$v)#C|Ipt=n#*{hrBNztM21V zP`i5WC48gs8dVTf!PV-%zk;h!4vO7^A9UsIMEJUDx=-GZXVTlE9?Glb&!yDD zwefek?EDY!rta)PpFnoLK=s$e&iBGSpdTkd1#|M1stWVQ)ko0XY)Eer&XaQcJ4iN& z-OT5pW+5WLjIe)oTFggh2x4Q06AFP?TCYHC!V(}Sa4aAy(3Cbx+%>8aGoErz|H{V` zPWJ+$(qfPMZaOg35r>0KNz0SJDBNjr#sC(FeXUb}nQ)d(Uz0dnjAPPFrwiZAH5&JX zKa%bim|8%YsQDCn?xX<MqHlSDAv=}pnG1Ov|6Se!!OX@|~hi%L8?gVFSQJe3}D z`(kT1Q)JtTC6H_e^g2UsYGyCZUMgD~AExu)3e3{SROdgXzWwX@C*0l@Yt=wa828Q6 z#RO&ZEd7?Mr0iKLt3IEq0YB{p6$qr#p$`)GIGvBUten3Rxs)5x9*-wC;$R3@5D4Wo zWN{sh4-G`qvuY)=fzZ)Z|2<=W7jiUvtQP;w18O>!`n!2u&{Q^`Tm5ID=MTHV2H z#*Klt1mEfrY|E0DU=>2xq!iaMkrxhZjX;-^^H(0?X=XmXsv0waO`*F*~lf%wHbc2i6 zv$ZNV&@hA2;bg8Jz3b4yv9Y*lrooxoOLhP;h=fx|0;%8KG>xhjvmcD8FY8T0r+Qub zn^N`~b#>`Xa>yAT>ZcQmj-~^b;=}ZVD(D+drN{>r-%Lj#MHA^5GWMK}$>BJq=0Q@W zhh0){XfVhKBnhYbnQ~`th|$w-e=womT!c_3oNjZj;tVE2&8F@xCK7d|17~@X&Wi%P z1=BGSEnDPfW|MRDm5>cyyRjEdiI%t_+0Jp)O^>Q8#gsI0A~1*OXF#32K=exm z@nl~#E=z)uzQZXk*M>p*@+76ehDQ1)RF!2R9ZeaKer!0Tr_j;#P_&QIdci&o?mpG&Wpr+6A&vGbb& zUi|Qkr_`e+rVcbm5YXuyPLVtpuy>XYfu|d}ISw6^7fjs~miC_M_UXOLkD{_*Jc}ko z3#x%h^tedzXUhX>Kpf6P2qgP9M&<<;5k%vFlKv2tEgYL34d?@(gX@bdtiB<$s9}cB~wF5vP!W|!{cu16>bb^ zO|X5M0zVhBU1*AU0x3VDcu+(N*f8|?ey~a@vsw*4Y0sHA(v##@^uRgT+>ftrr4TlUaGnH}t0udY$ zbIgrbAlwKUlZ{~1!invREY{Y-RP{z4@&^?KkS}lOd7J;APLv$CV=Qhyn{jPJasqAh~C87a91{Ku!a~#TIJgCWg$*NTe=J2jJ{kHKxmp--Vv0Hxq>Q6T8 zE5eHf$F@av*c*}$is!$GhS=ZTp<2cJ-j{>o`NAoHhs%xU3tb2mY@rXXyhwbb8cSe2 zA8#@7_`hu=9?-!h*vT3N%aR?oRi2(@Bk_dcynyXh0`Z0$oC1>fMpd{p)~Rlr%v>9Z z2XGb!A$B{(xQ)cyNW79vdE%cn6B9ScW@(6kgN?-7NW5Z<{8iki3X=<$iM(JT+emzM zDhW0cPqB3yiN_4BZf({^;whaSXre2~?3{24?X_~eMyZlbzd%&QM&d`oY_*Yi|2hpD ziB}VlzACZr=u-veHyp?|60ZPM<-*xU;$2FnvypflA}Fsbl^+6sAzB{!0DS@@@z2vE z7pph&g6+>!oV4U%``y1dZ_2qxe`4XM-v6iC{lE9&6&%n&S44m4`#}0EIrE;ceB-5O z+b`U_>!tm_pEh7B+u?%khzKs*8ng$`6p!Rqlkfp?n+4SCnf*`8mrl8we}~ z7VFtX^@?oxs}fShhVsWUeZz+GZ74qyIZaLIJcq;SK{v{GQ9PxpG$nxAP`(0=_^NK< zY(x1rlrO1ul_J`_P(GF>2Zr+3yg8Stbi<)xqB>jMjKy7^s0*IfR_^Xy7R-#N~2 zTKZ`!Tc8G|eJF7{KwQoKN^O?*i}!+V4F3kk$LoyF7l% z!mX|I&NG$SIDa1KL_x7QezE&pYfju4>(0wrR1d^m@XhvBv-g{K{O2Bf^7(`Ixc5F& znT_)^*aNem8iP zD+xB9Z{zuja;saLwM+Bu()=8=(=N@I^LF(17qjtv8_&1#e6b7vB$``xlYFHZ6yKQ3 z#`A4FUlL1TJpUNF9~{sB-!YBnzx##x%lCZdTk~(bbm~6${^gPfIm&?{a6I1>buyLh zaPfRoco2Xq7>=X+0N!aIdiBhjmg~E2dFswbKlbLie=?QXcs`(+e-(?@7rW0j=EU={ zMQ=Ird?0SyA$y+oqaQtd+y(c3ci(0I`;l`@Wj3DAU=R4t3E}7b!7r2)&j$_;z5np{ zANtZoJr^f$yX><+enH^HUpAicd=TnE3om)`fYz%QU-_3y&c5g5+p&c}VFpr4JpV=1 z#{TXq+$8@4HWKfik$3DMa^P?>iHKDB4~?fns)LJs{(EslXa38;K79 zwvEK6BU1=A!Hbl=2g^t7arLfakE=Iq3}++pHWF_m@%aYgC?1SpBk?v8ZzJ(G5})UT z;z(uSCXO}|ZzJ*2{t1l4A4~TGBk?c4HKvjH6R-S1=Uu=3`Mgj5;^{(>I2| zk@!RC_kHhNzv+YxnVx%A+!Hx!yNwe)<>4!_J{NT^28Ni?lhIzNIamKe-(?g7rW0j=0xJ(MWy9L;(@pq zez5Ywl|T8?(vP$fZtmRktH~pd|LomQ z?e~sY*FQ{U;~9xZ3ib7GedF6_uKsP;b;n%O^3t=-H`Cl(362AqY zp)1d!|BX^=VF}0Ic4fVUs$E$x;b2$R0}j=_7Rj!xS9A7L>f3Lpj-o3pa%xZ;V;NMl z@q8Q4S5iJt{Bx#Z!Hg_>==};eGdyGuy;t0fzlx_4*?4}C0H|&y!LF>gE9({IRyU#A zc)pG2+jzc>=SL#gsu$-}I4g#teXg^jFB*3paY~=@e7?(Bi7~Dsz%ItYsb==j`z-J( zvLDk^s(O=AVt2~du&;Jkla1%wc)q08ze^x(@~$Gm>8sm#Xn8SDYyIU)Rcn6RGLTZ@`PII%{x3EXZ&%iX;`6Qf z;*NH^vfcnT8;K{N1iLYWb7XO{-;JC?&z&^jW(M4plSw+mY1ipZMH77k&e~W!`{hn=TqJPIq;IO}6O_EQ_rf5UUKMbo%9R8giMNq>MY%Q-Z_lh(q(EO) zky?7K>W?W>XZN_5zzLE_k&-2nU0H8e*4vf!c4fVP#X@n%gN?-7NW7Frfsy!jx*r&c zzyEJz8j1h%F28v4)UKN2KJ`NDujk$V(d$f+cq}0I$BRs5J6t5*A;6TgvL3*D@VS?s zzw(BKoe$jm-~s3E_UUs>Wi}E|fHGVNs1}N}7rW0@=0xK6rP6XD@j%?q_Uc);?vDT8 z-gUr7QFQSOARr)3L==<*=~4oO`hk#6LP!v>AuS{a1VR#1=t$^A1eB(tR6zw)5EMj^ zBG>>CyNHTl#fFLvDc}3g&TRJfW-oV_dNA|*?d{&1_THQK-jp{xd#UUEueUcXF=9&v z8BBTN1=}s|PR@6yKO%!yo_Mr@Svh5}qV&Y$O@H&5B_I|{Z+!U;f1ShSqXxr?&_U*AsFgw^WcPfCmviV-fNfYop`hn1uM6TdM94?C5ksSrqQpDU!u@HWIu%p zz&As3wpV0`T^K`X-v#aH)VyN$q?EL*%#7yt;N;}g(UgYrV59&e=(JA!yKEu-KJ;c=HMCpr%z4dIePD7n>pGg}JGm@~# zZy%kSm7HiFj6Gu+S=6`D=EKZk@tJn&;m|=+ggWD1a-`ctuCi{OvW8b>d!=T^Gk&wt zfK+G~@*?FUomLcUz0EY|ZCO!~R!>*TW!Q8&m~Ad)gP3%VPzH^7>?83`Zw7m(mj*)w zNKU0!do_p}w4hzsJX?9TZn zwqySZ7s6JA{JV5y`Kld+mjmMt@lL$#BxV`xiu1(Fj?4z*Fay+QfdH5SnD^k^sr7za z*DiQX|LNo2nA&r*45mEsCdToJ;vI=0cU*zn^C>FaflqX(!;*}>}dE%8PUU}lRUeZMp`t#n?B|q~^P2v6;K`Or z)gqpGv2D8pBhP#-gDFouxak^l^R(v{FG{?G2fiF&yN;fH@x-Iyethq}#BWZI3*9v5 z+!GN&KTegwuq-6%3SgUS%Mhe{t5_VBdjmc8OiGDJPoh0c$zx;VM>_6G${ZGzlIR#? z!=ll6iUo9{eLMqBw3Q%eX}YvD^q>Wl%+uORAky7_MRo1>#G41B7EfRN&1=tBoebRF z(w5Ds{+8cy3qmdm=8VPtYx65P4IX*ovl)q!R})rwQ;HBpaaV8FbGB+b{s(bhT6qdB zk3#kS;JHHG7rBGe<>C!e{(NeG^B`8eSx-!{Uj1TSsXF7H8xFJZ6vXSTLwH>>rA}=YGP#l&ALY*{R`mnFC=^DQq5S#E zpRY+MMT8TT^S73a@~ z-`M;?YXZ4=)c`XFJN+@AaW8`@f4-4xInTNI>vM}2B{Ban_w(4Q5Y!iczMb-!&$ySt zls}&sYpi2uHJJC6IdqlFcR76Mz0EC{3()hu{wd z&Qp6(G*#GZ(T1MN@W`Jp`X+H#o_LLU z{Or9!oR?O99Oa3ZEwc|2Je0mRSD#{YaqDU??c;5VaQ(}%4KuW3v>l1|wA2iT^(zWj zT$`yk>$$vHX=y$#Vik}5GRhOL-mK?6lS}t6MkcaFFMXFr43;A8y&aiZY0?*;%k$FZ zucf)S;H+$|=mVsfp{XfDl7?o{I}AAZ8J|61X9~urYo7+kpNtWXWJe~&;^=2~STK_1 zd^B8q7ol8&BRw;o4hl{)=2l;uFHDcF^2GDb#_T>X<_=EfiC3O@F1f{fv0r)Ol_y?# z;*}@fW`m2?@G*o1+vS~L7ktFMcz4dq6R$k+nzUMa;=?K4+7o}VP(ATITdr;N!o`NM&)2>o z?SU!FKNMaLkRZG=b?Djr{-+Ff#d+doFY1DESQ^rohX61IFz@l6+g7*UcyHJ2?-#Cl zbl=psWiaK5H!+U?&CS!ETf8XM$rFzQk$v&Rqv58GZr8iqaF0W#ZWDrcT)U{GQ15 zr6Lc;ef`-^5F5ZRJiCN!#8NOi)7xkumyA6C&)^yU;)!tHLP-uY*R-0a!HpgNP>LrM z9fPm#?}1mLR=O--asG_gBpU(iZ!q;viBF^NOJ>?}%!G7demYQRL3SePEfk|qa^OT2 z1$Gnxs21@ZpA1no9XBy5DK#r2d8|DnGc}#ut)uA_414eRQ4V8?*8bOH zoKmm7ag`Tnl)1c_RLlp(f?!$GUIUV#?xF#tt@;2bTt0P0N9?{;nS)c*z`rovoW52{ z-+?A^;-A_~OHIp4rf)hW+UanSAxY^O^xdYhcACj1_uwzb?3;je8gtc$E| z(X2KoK6?vYwh`hkq+mg&t@wzLyj@v=i0+m;8qFD>kl@JBJ_|1N)b}>B^oAGnHnN;? zL=dAaXB<7LKbXNSQg?nwi?HGU9*Ug8fyNG}6^G#lt1bdsvFy;}Bc9k^zj^4iVV$-F zNB`VS^c_fq&Ih3`UAN9(5&36YXvC)I3Q52G9ebAyCQJwNu|tBKOa;yd8c8uiH_Jge zbxpPR&P>lr$jnN2lq)Avso({Onv zK|gu6bI{c1(qkqc3?5S@I(Rk`f;F5y`0EnT#<8bPHNV*H7L6$0kR=3$u(CQJwNsbN|1 z8J10@_89Qjuk%musvrKeV}4}xBV}(TP_Dx=w6S?uCW95_u&g}cIQPzbzKh>-ZMO$b zG%CGtQKJWQrA;<0Yl~bIU^|7A1OFT2r=OKY73w1HzOIC^3Q&oq?cU2#koC)8f(>V~ z_HtxoC1*+(OE7+AfsJY{KQ29pS7WsdWw}&Q%nwntw71=eDVFwjB{9{~-o6WVa(21Q zks(4}8{=EI)au%>)OC?77T@sXuYbLHvydu7MYekMr+J@s4_#<G>ZhwBcFjq4JQe$4 ztV~7g6G~KO-NmNTMn+ZI!GVqjY zPj?KV=1xg)us3<)AtiQtDJK)|Ce_-aF_?e3g`3u{gp?QpM5d=^rCGatmx>al&0CjZ z_2%vExGxJ0qbY4iRxlRR*-8OCzC&46G)6$%ksEL{y?iw`C1F^4YD&^L`aC5(y^Ugn zdxQ^+rKNg%(hz$RwJn-8lf85WZ*hFeSgoAK&8_wNdrtTjqt}6+w{)-6WVv%+oCzRT z+em~vt|y?;B{ltfdtf<$5S7k*pwX3nZT6L!~2=Z z3`K&bBvL1Uh>`K>BOK|?2Gg)0ky((YnyhJ^K^hw~kf0?eGs^)JgN_4biR~r4P@53VnyLcHVmmva4Tu$g<|1~ zZFmp^2~C1rI;d1?^>h-(Bx+B3r#M43BABk(C$Zy1W}k9~m(1R?A$l)*^LkW#O2Sxs zA4i6Kz3o+2I(}sB8c1-fb{!nWDvC%=*Q;T*U{6ET5Ib#Oa5S~o<#Cy;MeDK=B+L$t zPLfkoN9b>i4@(+4j8NpC&?d8^3jhY6WGOOfZ<8i5T7RZlB=-Z-SA89(_^adWs2e5E zaf9q;ARZkCI? z{@QM9-LzXZv<4aj!+v`&r~%E_ljNVY{~d{0kTqWeim_@wl#ar+vNuplv?2Qk4IDiz zi8@zw$RZ(zkd86b;ZvI?QWCx+k)SylJuk-Ny7S*tsGst zBuP!cN+e@JCPVH_fDjGa0Ll*WNrT9;@0-#JM`lu5a*`vxxjmF-E7XW7j-k}UkD^XO z6D~HOOo%7xVRDvZKDfPr7}D-#M|y@swK!`ZHfMRtO^d^M!d|o$Eu+2vniQWAnoQ~^ zZT@YnX#B{UAG4s`Oo($ObV3Yu-YJwkQ2>UaqGjokss7F+LbVi)ea0vr`2j75=&q`IQ@~xE76z^{L*ObkdGK zjg?Bn&q&LHOd8yED6DWXLA9-;GGGx%6sSruK_fGeIod%}(?A+6(CQ;4paX)2(lQmb zJ^tw<2eJV$3~Z)N^X$wdlAUoRB+cz?YD;5Dh)h$>;xJ2+k%_9^~c7ElNX* zwX!IKQF>0{;gqzu_QnI6D_+!!sf2SYYhtEJOD6Ri)X4NkKX2nMzK=XFyYa%~ZrT`U zt+MatYIb5sdg@4f4=l1kUr4j%%bcP_d22fz)F7q|u=0-dj)Pe}5mb$+g;f$mSlmIn zPe#L`E%GpZO|>TsO9hD82`97C+}?|397!}ZWoY(x#HZ8XH7z-dRNsw)Z{#-9>s9Sy zuHbj`Hg@qz<9&ZipR}Fay_P=dw30sfq<`x6-{!X){T8!6zSmdFf1g{@=#z$T838@Y z*$*~$nI4uH_fm)R8#dNR&6L5!Oc(ib_V9_BE&S5GDMkobIoJ?75Kr@;V8-FF#|<9t zNXR5f;qET&^UFClMell?C#|-5TuKD?A5mRYRZb8QIgp$uo|ggOMTZ|ok9FETGL67B zN`LposTE&_KRA8zH=8H6J%W@d!B`4l#sFsB(cwVp^B>d=%WgdT)Xz-<_Q+tusgJy@ zV(<)q3h5n%&v&GEeK0FA`o$`Ld^4}jj6tkwRF4N)$mTKM@;h#9O`h&}X1gqS#`?Gm z5pfZFP%0WpIrJU0@MgL zSj=H%OR$%bL;tc{R#gstcyN?MpLbD}`|}6$fIIiIb(KS(FUfel2vN*ev`G;Hr_clC*@xBhe{ z?71rY`;FN3`ZF?EQTn5=Cmcfu4Go>XcWaM@S%bn`)g0MV&>-l*f2W{4$I5d|0%19f zSDs_yj@Oeme;uAH&oMWS<`oXhr9FRbY2`UaOJDZQtUSlcbIeVe)hxkZEtv8g^M++N zoPJy(o@4bYxOx>_y$TKs?sAH{@*FGAvFO@uHuWkvf1^Wr zjtxuN`fI$}E1vYeC3`zx`Wml#6&%{c-U{+rhWvFjsXWIn69dbIO@D1;n)TL!bDm9Qworb+)@qwfxl`rX2dx*1X)jp30%G9QqJ+3YVK`D~G<;uG+71 z=nHNrhdyz_Wd`7<@*$QvWG{B8SHU6j=9VrVA1YU`f~!}-g+Zo!9$w#54t>7v=k+3l zzq(}9tKjNYaMz7J>Q!*{Dmd#=^3azkhra7@(P~-1UwaSb&}Ujw7Qa`VL%#DibGMdx~Olgt78RQ`2}o74%mxrFy{}nn=NAmCtI}=C3WS{LxoLGb?|z z@<%g+ru@-h!>?kNK+o!1)y1qLGA011yTl%BBx_iOAE9LasAKm?ra$mRY7!@RoL z%V0(6k1kI*ZaI{(H2KV`Zrdje7*q26hwl)`{rk~x@^R^W!vk_2)wjn@!CT*a`qc}|E=`xgin^UY{VZT*uf^|0Jv!;8 zUtay~p6P_P`*t=GYg2!0mje$DbG2~M-P82d`k6d31foF!e~k&*D5@3#)9G4FR|;Jt z=}M*x@4aNvbst?1)Aa~lSZQBK*CM)*c?n%h=}Myu4yuRfdVsFEbUjGdJi6x7HJYwe zx<=5IL02SQ2V!;8O6fAjqmC$YA) zI`97O=Gzu%hZwAW>-Rb&m?CpDQz8tvtEz_|)taarkhZZqx7XnJkHPPfTC z+~~p1F)MFO8a(liV~;q|i)vtP5nNbn$qc(Y6MW+0rAwCdLZEtR)w$M(9vs015gCWj zkJ=j0bysRua-uyxEiHMhJ)X{|pbg!L_900rLmlb%H0oyT!yM@j@9qB7jX%buU+CC< z{>0g9JN@*|r!H)B0T3=|Ng;^0&@%#WU3SM|B-sLxV@&3g<~60L_H+&CJD?I$i0r-T znQg=|0$Lyk3cHE!mje5iDo@F}qJPzb5x0Gm0#Foc=XD>{k};TwLl+4x)q-9E_}rE* z!YdKEV|ft+kq*zItUmPIcR&Q-H!Unvs zY&lAWNWC^;IiHba5!tmUJxhQs;8H+XA!lUYI5bG8AT83GG}pHmysPL_nxxDn60$u*^FE?*X99b<}7Y0 zGuCBB(Sy3oS=`no#$4;P_H^PRo3nDbLC1_7q>jcZ3+l3vLt{2jA<)9zO*SJl%(Z#I z409GyD^*HCR}@$AHKXW3UFIxq>oT(AYC=UM#vPXjTtsi-VKyTd&9!+znK_H7l@Op{ z;-a0$ih+_yj5{;$yhEl}}H&Kt4 zQO|aPvd!Ry_2AeUkrdCSY?@e!j2n0XA~Ejb*=@#qcq)-N*Nn#IHcN>Gg#t5dhq3 zas*-BSpmjE8DKp{h!U$0AOv|pMj>`UseMV84L#=rvD87CG9K)q5qED$hP7KoT!SRj(=Gzoy21wxHXED*_c7JxV>76^cx1;%1s zSb(ffED(TtWpY>`V6H3>F}binB-2?S0A>~l?K81JB-dF0o;a~U0OTw%7VE+SNR$%` z1fbqkIV=z`R~CqvTv#BI=`0WcGYf<@F|j}-*I58Xa$4WAgrBPAOLa}7>jjb0j7jbED(Ttwj34+m@5lJOfD=C$#fP7 zfSCni$YWxGNUpO004FIB067bc#cC{IC857YaAJS})GM3A00DDlfQZS30V0{s00A&F zK#X5a3=qk620$;I7$5+01{jNVkpUPHCl&}my{mIrAYiU65HY#1KqS*yAOL0-h%u~* z1tPi50$4{U76^cx1;%0p3(EAPj+P}~4h~a5$IF-g4={iRVrh(k8yFd4?gmuR0FWn< z3X?UbYyj}0gSglq2gJPjMRSVIw5g}E68-~8I2jk?fNw)PVUVAncgidvm>b|9l_FEUU-1=duFR612g zK;P2qso@9oEnSy1d_doU48NyYsTz^B_7Zm0HTY8oxK^JrCG05pZcJ6{HRLvp%#E$u z99X$za~{d}K&cd%z|v%!9*srxErU@w0~=HJ9Z-!isRV{G6x=gOq|%vW1W-||cril< zBExnQ;?_(TZLgPS1k@wvLmBYhrPO?`CxGf1Dip_veLmMyg6dgO2=$btddi8$Hqyh@ zg4r(Pw2?`G5n$b7H*qP`Tg(X1)I{T&Sm4R46u20s>H`c?VXUR^fSSiSb}Ul@{{xXG zi@-Ek6LzDSwI+2RU;KSW;6%^p8$`g&LSHTf zjtIt#bu7{Qv?)ZHC-ZT%mNg#GXz-N5dj~%ON8iTYV(xFChN*!C|hpx{SZ(v2D6jYlxocpS~TSEJFXrVSis&Jco92J%SZ4h4+S0k`^>R*^_0xWWXI z{*UE}5yz;%1y2QX6|%7A(W zjw4VX1*ThcN1P|sM<5dtTk0by_XvfdD2l>g+KqK4-|=VEfJ=nc;(_i=XTRrwA^dKn zL#ht_d2z;sMuNNWc-(Xaqvuai0f1u9kyQZ;k&uG9fCT`Speq{>6kLqKZ@lUREneU8 zfxiqD#EXW@29$zJDZhJDiYP5zE6hm@?7SdEF{g2&@#WMN%&RxRlI zf+ujX;S|SqW8!YCUN1%9t4aWi6epEDXmX(Vp!h%>PGdqXO#S@qN(pV=O~tYq|e7l$6+QVz2$3LY1r zCC~X~FOJY(m-z{K3NB6L>0DOb@R}HcOT_&e+%;kkk66v`Ao8T)S?|UO#%5rrcw{uc zo2#m8Yx{ zaX{GzO%N0x6dzpn6M!YE-_!)7nDZg;t0Bdqgq%st<*_28sL+&0txSOrYGsN^gP9F# zWy<+bczr15(R-6(x{tT{u+&)uD^pl}vRs)0H3G+iTbaT;+8&{xR;KvM)N9_XDPnj9!TC_WGec*kBG z)>HD1gVJtIrWGG9Pd=!XDYUD3Nk;9NV$wbhziQ7E;{|^7DXZ5jQ)MW35v)uBVasJ9 zoUbQ_Yz4P6g(F5iLP4!e@s+8S-mEEQ6MGR{R;E^YQ;HA+wK4@>>T0f5roay61J}5q z_@MZ}IH2r6v9uZ9$d5^@HuYW-c4Kg9>d2XH`);x7+*P%BetQ?)V$F1WB^ z8h~nL3S3}8ABuUsGF6)Ld$KZhOI1pkeh&}+P<&8)P@_Rj1`31^d0%tR>ATgM5*i9~7u{^pv)b(huBa2D zhzHVdvU$CxgvA}>ibD|CO96ssm^j<=c})q+MwSaY*nuU6t_8QIRK-&i)S42vJDs>d zcyxBTXh5}3iR3KDhO2!_V29eDqj5p;LGgicKp*2N`=CjL;)CJ?aX{&XCI*TRiVxnN zd6u86F_(vDO|21Ul%$Y=~v7E*cwWb63_>v-P35SK8bxRgrTC!u01k-mM9G7a z2PF?V<3*(xnm$|(d{ApCT3ae>ulT??pwEhhcB?fd@I|dDG3hX~L9Hp}*Sl{eh`&X! zri5i9%QdBP6e-L=!L2D(^ArWOro`8jR;x87k{JZGrlj})4yZSDG&xXwP<$W`=!1AA z4@w>iO&-)*iY9D1gJ!jIu5m>1LGb|`5R*x@rUY)77gN+eC2&QZr$ju+`*}(YsT8c= z7}u0q(SHO89$!LW|EprW*n&e`PHz@U8^{x^W_h#{jv1cyK_|hOD1XKy=kWUse%Eg) zyu`ma1Z!Z&`7@%7C5l=R%}W2AC%lW_T}rQr;wad8EqK;TtmH28NuEQJGrLO$%AsJc zuksQN?i%rxb#XRZ3eV-z;ukMny7WBH=@N-dZpZfB+|}8cM;c|L6UPHlI+y5q8sNoY z*Wm3ygo0lo9l*uRuaFiB4-M>S)F?!aLLeM!A_Fei>hbxU<apqf7`>9yO6+Y|wQ= zm=1A=34v2ujY8B~2$K}G7D8-rnx`le!UV&u2|)^FLX-(%lA=rqu|b&-O%|kk6~*X7 z+?!BZ^C+YZmnAr}xI>FU9>9#}v)o)<$9MvxQF@lcaMP_BJs(E7gLz~K{!qYQW9GjM znSp@_dO?#p#8`mQ1E(kah?iuHbdr`_i5tYLGVeLnH`HhFDvUd6OBx8^kF1#0yfEAt z8l`xwnn5tmsP3P!K^I@4v*O->MLR1?OAdo18D%XFK9j$Bq)}0f-;b(+cqBy55_Cb` zMD;jv62U07S`EXs2%E83qXKW>h~OqlLzY+oP~AYDz=#V=Scf7l4@Ia>k%ASLC0w89 z5^l_M3D@Phgd039A(av$7@NY*xeK`7!iNvV+=dH4@%%SWXtZ4?kbnZB4COdU0kd6S zv1B$|8owJ0`G~_%fKdR9qQnaMm?zvMDdY=7A#O4Gk|%tP-=+Ovvb#uSe;Id_{bg*> zB~}<4aj#F&CFnBRxtfu~f-ZGp2QfkM zL6<@$4@w@u0bz}lJScg{4|&M@nPI8~O%fF!6dxD|_;^mqgOZ1Wk_UBu8#rs8Jh2(r zDNX8ZY!*n*=5_VTYWdGB%XMaMP_1J%0zlc)AeGy_PLTgS$rbwTcLr)ZNvh zZnjLB&Lbsc+HAwDBXb72OAEisgYNLUlk-MO(F^V(H(N($cZs&H(;ghft6+Y>1> zEn2kl;}#LNrzLz3<1pNeV#WqZ0uObBrLEY%DDKxiOMNb~Mgw?x?3KBRD6<@-!7C_q zY#>)e7bjCqPfPH4uMB6lP3@K8oKSN;#t1dnV{Fj7L7|%B-h_*b(MqYeAuI>?gE+ff z2C0Id>TL+4B&iVwlNYCfXWkFQ6S7uMqPy5YfqmZzsrd4Fu&1yhB?%o$dT zoOEaSSLF$p@d&dDRGw-PVSAY8G)l$;Jh8djJ|!sP2cE%*=d~PW&ftP)HJGF@Hz^gf*%>`m9&$7Tnz7=$)i-uLsUFgCc99^?i>SNI%k{ajo zOo%cn%Ts_);gQA$H!|`;9&gU9ceN9E0vD9>MZ5*!FY#K8sBJT#rlUhJMvCR2oId(+ z$#PhaNKs`XXQj)q9*L^)x}~~-aX*4lu|Ls3HWX?^b~T6N#^mTz4(P`3X1-R&Hhlz1 z)!AJzFF`Q!DVP&tuA1@5_vIDAC+vYlFjje+MU`2AJ6Lil0XAEbyU1ZY(#Y74ILu6) z3u8a#3Gd-|Gh=Q0d4zO{5PFVaq*B1lRnJ61x21^*pGzC!m92cCQnZe^!>fQ`Ip)K3 z7r{tih($B1l}wFSx*~hDcr#s*7KhC3CJ#=f#W%W}oL zQ!zMJ?o{PYN%)(XAqREa&b4|5T zM{U$0aWT)Ura^>?!){9Tty!kbg)q@F_AHoHtDZ&mEEa3;s%H@cGc{*{c~Wzh!ZOl+ zy#*9=76jF^xb!Swi&_m+t6?Mtd@)(|EYJznvw#a~HH>jVs78((PRv;nxX;gk%Vj6bExg3CbgxJW zLim3Op|KXW?FSp_#QDldC!UeHk}0!s2brE3rD8sg)n4IfMCQt-%*L8=c9_$dsQ_SW zt90OT4Mk!*t8urK*M}{m5Nt{{7UK1mD-?natHwf35DbC9>|%fDXSH~sJNRMyiUaWH zI!bNTEIM;|dbUfYI%SYDr!u9wo+6E=#cCfnJ82;At7bw7%Td)esA}^Dw8|AJ;s%N^ zHn|WD8xX$Hgs^(kl$gRLBJVG^`se;E2n}{^ON1u73ly&wMH&_FI9Nu3z`EhVe;393 z98e07*PAG{Szc|}Y=1LFh@2?#7+nbF(wQoMro}N6T$@t3m|&qI*pq``)K0!B+NI>? z*ts|W^-(Zp*vesMRQ|*!*=0P^XibcnU$V%YSd}uvh>zk4Txdw7NQAF>0;&1g%p;-E zB0$3#b)tka^uMmVQi6F_V+X?w27F~`8H5XlDoOxQLf`IWNkcQFqhLwHV^o1#8bk>N zL_Z56@SO%xLIJgd2eO2k5iDuIYg=x0T9i;gGb29B@|FQcpyvYp)iZHq`{*;4kZ*24Iapn=%FlWAne@Bk|?3* z`nbWsk%I3uh!P5@9XyaFaX!5z4eN62<3tGsM1u#il&&>H9@;^a0AhW!OF+SL+*&&K zF<%Kbz|D&+i4qE^9XyaF)Qn&$OMcSFVRmRq0|<26Pos}R2}Re(1?74EAWBfOWU130 z*d<5-q``Mt5+xL!ED1-3?=*-KicXfAP#eI!TGHUrJPsuk5Dgy4l9+{A(m>d`w@adg z0-wj7;N~X;C{e&);{w%-JRUcFk(i#Vfx}pBdz>e5SsbD`+hbOdfQwZ)%M#$T$Xf}e z^IQVnLCqTun1to61h|s&RsvQN^Hu_m%kZd#Ba{#!{{;#%V~GO9F;{_t0Ozd)*p$4L zfIcQ~C1ABZZzW&}IBz9fo97a$ds@OSN{C=3P+Pc-!Odu)Mqr~0rh%AYHX1l))IK&Z5X@#($H476(kv~r zwI5mFjny^G0*zJs3*H!)_#@sJp!*}<5O{yY8>Yn{@rK#Qfx!WDyWhHnQlYXb4 zJG?7M@Gd6(&H#6KV;eexQND{wztfk{vXt*~61zq@l0?BmA{Gy3NA~ZFvrhv z^o$Fb|FGn)GwszJjvKll+rRjsFipF;Zu=IEl|NJS2E3YLz&i8@{=~Zags-PsUcgd^ zPRXBG*VGHCV>;)n!WO_n7Emt++5*b_smYuBX_Gf2ygeQB6|k0LDCAE~4g-l$473Gy z+Mig55e-5yU>ycC{=~X^jB%c^t~m8AjruU`}C%cGG_=*XL7CBXg5E3^#ooOwSR>HiAdG zydL`jy*)6TM~>xpWMGq12L}j*rt|+U)8NV%FI}2p6}f=KcM6X*BHW6@aD!%wfNfc2 zJI|UO+2-tL;j`5gm}7IpZsm}-(d@5rkp&N-TV5+TV=2#ydp+Z z8OqeXRcvaagYAs%6Q4fRk!gG+hFn7Fws}08s2Z$d5#mQgi2v^H=XqwQ5>NrJ#3`?U z#S`?G#)t2{@Xvi+*Bv_A;hz`(sVIY;78xi#t3an=6)#tyI-6oj?&8VcbE-7wkD)Yu zttcl}dorfM#>`m9=B1k$wtAb$;(a*r%5cL~LyR^naf})nOG< zBVMGze-T)l(Vuv_PT!m~II#YX=qKO0VaQjv^qnGu^)(cdJ1d;36g(1Di@Tvj_Ab2> zsqIB7cK4`tMGl~EPk8a}gINt?X3xHT_tT@wr^sNXVE%bEb+!17}_Va(u zj~iPV}07q;{M z5o%t2G@L-sW-}~<`K=iSF=jI?gZYse9z!JgVunGs*$m5Ig>8mg5?(pM zD>DrA&1P5zD@rqb4dLjE83r9@Gc1ECGn}7hxa*(!ZHE7x6aRLVg?*z}-?wdgP-uz9 zGBcb=ZEZHgGML|*VGv_B!!np3nc;Cnk}qZ$WSh;f3|81?SbXS{(4*j$83y`hGc1D@ zr5UbBIQn9SL5JB4%V5e3=cgGS^jChH;R@;hz5e4p$z9i6GjYd1L0A7QGs6yQYqJ@a z!TiZJwm>-$piA0hwW*B6f z&9Dqs*k-r`;gu7-GQ&XMY=&j9qBO%*2uEMcFz7IwVHr%B;rukiEC0=JGd#WG#IGy2 ztRJ?q&Igf)_k4Y|%nT2swld zFl7PTR}5QNI5g)5^vz~i1}jQ4j050&F~gw4Y=&hpWrp+93~xG@-)8vv4}Sl$@%8Jv zZo6iBjf|sPpO=~8Bx-B38J5BP)(nFfvl*7b{KyPXB9eSD!ywyihGnqAHp8t5ubkl3 zXc*|5&9Dqslx7$QqxxcoL5JB4%V5e3=cgIo^Iv|O;gKiL4}LQ}wfht2Upf5wp*u&& z%90(p%7z6Q8=PmA!m5PDI7JAU)9_8V7==1 zmp{;T+J_16r%Y`BpkM&XE5{2RLH7%@CVqHb$)jQG`g|PICS$@n84O<#7J+G_{w5nf zMvP!AU4!sn%Lu1b&VN`HqRK}oZd}TS=j!Z#Cw9@LHhZh?-r`hoiP;RL|Z_?(I#;9goe-mw{OJsO_RHADc|&q=EE941RBh+ zeCms#NCGu>_one);hCLEup&_KoC(|dQf>E)yDjvA4=={G82eup8LUEy9K4(w$>nv> zFFd6|ppa8=&Xds(LC|)0T-y7?_bozq3>dv*)ZYJL>z+pn^;T!wzk_B@4q4EC+2(H- z9=#uQnql)%7!S^LPUlcdax5c6d33*uuFUi-N6v$Y^r+R~mqh^Pqu)O}Y4F1Vv1@w$ zdf)&0&Ad+ro5xaXKgFAx=MT0yuyW?km^JSn+B9Nz^-iG14Ese00mV5}^NmRc*LbQ& z2L9NZ)1OAYItMlnWT9y!J+^I&=cXZ@TMB5f{@B=u9HKt2Tl<^H*G7h|aYSr*d1c#y zUoDCUf6TBCMCo*Q=8t%(7oY5w22W&{h8VV1oDJ-ZR{f7C(rc;~9ljJda(wBKXYTo9 zQU6ir&Vnj4%zF4f+SKX-4gGFKm5~e3$k@~rO(WTZ$nH5c-i!uAQ2cO?fy;pJIFERg zBQZlD!|#;^NtPqQO*A0090{Hvz3_T0b~xtPkGE7A((R>wUmvUd;-&Qh1)wBGf64S* z=f{$Rr+iwr+w72tYg>F@y0Z*clw+|h!m;~*`~I2nPqpsL-&nV5&X&!;g9fnNC=q}e z1Lzp>!pBcP-up<8S5|b2eDvbPw`8!Q7>fzKG0xl=RBHIqy9Y!rND69u>y~Tqey2yY zb$V|>jgLCDidcDcP1=CJ{;3Dr%&>eKqkZCwT?QS-;E`U63?Qad(7OHUza5F$e6IG% z4cUVuWUym`la$`scAEQ^d7#0N+IsdNaFEj|@`0o^Y@_#NC!W&~0fkG_LarulWwX{?XIcCBdSQ@0BREniR0_k2Gq+#n~-f6vH zeZ=gzMZ+en4tzYdn7&o{Nin$KHht<``i~NeKYl{;XyK3J_$Bhh3fTS#7PI{ z^57&CDU^6*xsxTUZ@3WmOs@emCp8;X0r}ku1@h2U_1gs?+a`aDyiQ{Q>AdRtGbLoO zd=mD;x8gEokik3`>UZ*8sAbkASE2p`DJaZ0Xd@d_%_02IsUx_UcuQMbnToNtwG`>K z_*Gv2^qO_|TnL`ip<8;zp|iKk#1Fdr{^e{P0_sbK6h9 z6R}~`=$0qmxR@z}SxcUoHngl$ZF#0`G!=Kg?ERt7Pn;LA`-YJZKN1@~1vR*(?I%vP zi{xD({453RU5d06urn0twSZ+#JYAvQ^zy-58^o;{v+3+KBR5KOKB2!@IB3vUp9O4+ zn*8d4b|Gtn-^BOkv0r&VqH)bmJr7#&q_nETnN4`SB;efX+h z0>@65!8TI)A~+d_Vz7!0e9dDO8SFuW6>*}$_eEa864~9!xXH$M$mG@lP(0|Ew<};s z%d=;?Kl)}&yYM?lJ}HBRqA(tuXmc4W!gz?3>~2(NrwBKHSP5l#f;n_=Ij2_pDYfdw zJo&{N>;Ft@-V;#|(KV;k{_0)3z8yVvL-gK@ov)n-_ycq`F0(ZI{B4JW7dKqr`Nb^< zj{`oJu4aq+Pu|+)@yHiH3$gVIJ+cY#2kElEo;|MDl#0=tAG>O4x8p<6SJ+r#!M3|o z#+8nF>AAE+neV*0^9555=Q;Xt)NLT0?&`@@N$|4jqj6JFQs8!@P7;0N87r5`L^ zea8L|!D}<@2^7YIGq3Yy0a_F-?oO>`MS}*n>=e$>IMlLJ$VN>lfP#x>5^%43jH7Eh z-~DLq`rT%|{=WqQ5&fzdMXV&N$7Z{a?mr(~F|p;bwXstoyVPuS?H6@rFzar+;JD41 zVZ(aV1GDaLI%;&cxLs3^9scak6@LSLjoWyV2hb7SY{uUWn%9b$F=pP|C7(GpP6n%D z$nGRbF2k+-ACf?;Lgs9EIjL^h=-I7rzjX6E11kd^PiXu5i)WhlI58x2W}8<6HVyf` zKWH<`Y<{BYs=5Eo-i=glNyR`N z;ah&k&9}pLF&P`qOL19F#vvpKLPch4f4!Jd401Q2#elDeRgqrn^^wzce^2OmB6RwY zd+uyIV0(r@8Wjk=#we>&wMspA1hkD=n08g_noSRGmcf>Ajv%j-d<47=5CvoD8ianq zOu;i9=)nW4LZn00hUx`azsp97GFVZL_|P+%N8BL56WXdJ?Ogk4%=wU|)vtTC$}6|j z0c~d3K@`S=-aZWo5avkEjJNkm8tJg#T`nRyH9phcC?hFlXtJYOTDl`4DI+O0rLj#v zr8Z9vEljk@+sB+3xQpObYuYTkMLTVQvFsKHQDt6hNKDI;>;D+jE_Uv-Re!jlM9c!C z42!iOILMbwKJxmm=oc}QP@q(Fa-n@AN$=%Xs zDMNwep0t#qY%0@h8M-j8{Dj-nI`>#;OA4vpqiQuH!EEJ;aLuG^@m1MdxAv*nb>YNA ze-FqyHbn+2%K7$E!f{y1FK-;;INEJ-*@#IeU;Q2S!#$rV9&~&^YDU~WmF^6m@#Fio zqMQHpm<;wZ3gf|9Kk{W{NbTxwBZ!bDP?>nD+{q@l){a|xZ~vEvg#Y_Gka8OOI@RA&wb!w{2}{Irh+y$mII!B^EMPui9XhU_8qdkG&C-VFK{BCKVR=Qg> zT8Ykvmykb;Mvm2gpN#0eEpAK4;FtEb8~=^bc!{M(7=|~lX&XJ{oAcckG_(!;a_;r> zWU!(%UJD7w3N>Gvvi0Z#ky|>~dA98B5sXjx;S8fE*8n;Olzl!vab;B0wBGkGs=EB& z5i;02hC-Z&J*#-3f^$Ai3%pra@pTOeWZhq`OQW9qXGT1H%)WV1!re7xum>zjHSd5p z%EvxBTLlkvfSZS%JTv2_NQbHo)eA8DW)S`W--JfDpXvSApzcd{cAlRd-uguuOsF3# z;1>G5w{=KF`;hSP)N) zgF@Q34r$ZAL;K)X5g`#Bf`Z$JhKGf;X>F@WiMqw7Bn}KtNg5fS=}5E@8HF_f^vRwP z!r)Ns+#2hj95FTSrJG)Rs_}i}*UDhRSW$AD%`2{jwrtZfv_nu(tFVxkt;5;{5_{Wp z2y5Feq<#B#fh}#4hjqmjR+15542%h6JuILdg?ew zN@4O0eY|IsHz5bU=4~Z1STPzhq!P;J-8!CX`_SlqeD<1jx{qZu`mqm}%y&Kd?XeowPW9OO z(C(RcOdS0WxMPN0Rzm~E84sD$@Y)J>do6o0`k}!kZeDr!flt94GwgC20(irlvioiS zUN^Bs_yhfy4U0O|U>A5}hFvCIy+>>*&7Do(LhC5tX63z}iUh-XLgNwwTYas`Ba-;t zSfbl+xjy^az-mou-yi$)^E;`M}16Bbvb5?{^08tQX zR^**VA|c~Trvb9forVmibOp^#I}~{jTm%EGmF_;)OB2 z;8h{bAXMmz?884Ym>=nigUItmS3tH|S7b1yD-fU})s;Q&zNq7quH4pe(vvF&$3{** z_YIv1FtCSAS7cvjk-_{(SB6kK`l2f!+pH@xn9>z!N|EZyyZ^X*7m@k_uO}n34mBCw zyU*DkGangw;+4`pzn1BW>=PO?m>=oNP-;hCbOmIabwvhKx&lopQe8RW?%NbT^(*J1 zuO7SS$BvOx{(bG?Ro}%reVamz!DQb#kiq;&SB6nL`l2f!+pH@xn9>z!N|EZy8FwEL z@JUxLy|VO%Ro#1ce|h-udT(9({gbkOWfBo>UJ#bS{76@D$ht4O0xvBKN4kP{%YD%mkZsl#8BFO4 zF^WPF>WZBXN3e9B_|&g7dG+O+=U@A4_j%XsUNWK9=WS)WGMR`r>xvBKN4heYNb*Hj zK(<*|WH6;G#3%|ys4H&IQS(Vx2JU~m+rEwKVi%q0_kR4GH?m~9GKGjX>xvBKN4gSE zB>AE%Als}fGT4=_D+vL_C<f6=2_M$Mg4#rk-*{bm@a)NBJ4HwQyG@_~6sbHGu&-ypU%$>jy{mrs(~kL((T|k9 zRR$9bLZ(aXN4!Vy4QHJwogJ)-6e5TS@!yj>tAZEIw)WpTe?{b`E8@y_|Vo3xB!q4h-5+w^QWos?lHe z8$W)q@4}x(?Pxiu$}Z`H@Yl-x_tm@34vAaz&9jwjwt6DTD1}1!v7Mtv>F>Tcwc^Y0 z2d7W|X7j|hM`SR;An?gq_|2~veay9jb2P_8uLC@Ia1#Col;P|L8@o&oON@J|!}$#x zYoy|3=v;*#bX4zj@b1|+Tpu_4j!wI49b6Y7gI(#uAH*$)*TR3#H*-J#_QaNmo#pRa zKl|C`@A@wM3re{W{&%Szz4m~tZL&K0%h5OY*xF{y?2l%=cZ*E;v6-sU{3%%t&vuDj zTl>k@b;`s)B!dYCQF4>;uL6jID80a6CB*3>ixNNBvAJVH)P`5C+g&c}&3ZrpO~{)O ze_aB|njJE0^{LdF(dz;qPP=VMKnoe{O4o(uoO535!t=+^g^qk-d&s;$9AkRVc(jA> zx-f`rvt>u{t}h)y)Nl1itvFpPZs`|G7Or)?ohGCew2F>k20cIX_`KK$UVps%(#*}h z-}*DYjtnLkguKoj0mKQxSh@z`zm^e(RHf#J5UgiA2Tgr0J!bO3;4xLAgJ;WNfC1Egbo^VlZms`*ZW#H>q*F`l>|VP|2D{RQKM{>e!E52)_|4`APG@!qUGww( z-*?{gb06P@zb6@bOX2_6mtLUe_#pG>|gYI4fbca}ZB_AVLhN*DgY zXjBSb3xDT~i(mfOxnkVQr4Ni5eRk76--W-cyXkzJBt3!i2PXFah*Dd${*ZX*x?M-B`%U=o5?^%B_2*-a9 z=gf9_*KaSfQt(7V}{I5|*A;k&%1)mph)D{>faB{&?nviK>% zBQ2Lwan7t|_pyL-d#yn)b)K}YcHPj>g^80MS$Wf$K!H0$2R{_%&~@m$TJN1L`BBV_ zFYjMd`slS?WU##~wf5tzK?UD^;BdMPyMq^n47;K0hPVso4{dIV_q}q}9MEAtzFh{( zC(X&f^XIv!NYBX6m2huf`pbhx?E@kdyw<2DH{bATAN%3Z&6R3Tn3%l%8X=X1tWjrt z(WpCSjyhKL*>NE|H#M&p{@K6(6S#vBLgVoffLm{Spzf@(KSl58b4Ri_27kA`k`f{=H{(q=X4JPP7p#Ni1=>~pvnBP0~t(d7vtP~11~XN zu(|E8ZsMuE)~@*DC0ZPR_fpiHcb-c9aeUj4goNh5cAaq7Um2w*e-6=ma%7cS|GYIj z`muW-@B8EV&o>Fez)GQd_|C@W$hYf#JAHoWt4*(drgB{AE;5+lF7i67-YS47h|-Jv z9Yvh1_3=YpKmTIhw^6gU{(I)0-RZ4?Amqa!Q2;pwkZu0thzzE*ld;V^?G)YxueI|` zLf1Fno*&a=+l+ljl7cIA5n`7A+F6-|!*VnU_l%I9{L#+VpLN|5IOs@N_6sfFUK|t^ zD+ohHLOW$=D#~DjyU6QaI}6NrL#B-doU3L&xe^hwPo4n&2wmZIhMe8L>+iV78h&+f zUwF5Mfaj*IV1xNXKr)!pR&dkx*jTrHsW_U!Yi<4Ot_>^pz1SjTYoq$#mA1dXSO|6g zYin0`+L}fbdp-Ai`R3*K)j$7R=O!!&rC&32v2P=_gKVc`#%lF zzp#D23?>+eyv_<)xFc1ZKfAkLpQbT)JQlWiaoe|Az3@ye;FOzofhL>jb6PT((k?K{ zOYIWY+H379yuQ#*L|OKQ3rKpr)~@vxzxwQjmE|Iy-7=x!V--8Dk!ja_s@43}PZ>-w zkdm9UYZX8gMCk?A-9dp6Qt2{(Ocn6l6bxjUze^{BUAYQ26>J>N`RuYfDfTIPtwZ^@ zk#iHxNiB6`6D_TJtt0zuR(PP|{Q2S2Q^!8p;rD^k7X%g%SIl3Zm%#*sz(waCsNg-f z$y8^lpmqDxe>)Ph`CRRj8?pyS0FT_10(87T|GVpdFZV;&rC*jGP-)|X=Vh>bQi?Lb z$ryyyFv4Zsh;i&F#AV z9%7c)niCarB=X{4HNqdc?#|)q!%s~WxT9gj*zF;DzODPdnC#!PK-utvO4m&hO^zt-O%u6EULjT50lc zcjyU{Q_JoIYZG28#hej0ynW;Oce}1QGc)jbDu5`6 z(hGdZbstq`{=g^@fRV*z6+qUqnLiBw^Ntt0ub%ed6AeF~{j?00PdZYJdl&b*Am*-K z>q7n=T-nnXaew2PPq*K*eo@Hu_21qT`{$od;(iqu3e1PipGKF#isGPmA-idWqxlo_ zKtDJ61|8;a&B$P9L`9U|xqmD8Z^dDC(EQCF0(nH6c^w0^nPEb9QKl1Zw!&R^k*x^< zCr{dNdc%Dm?7Y8S>_fd{-v2#p|2?473|lN~!x&1~%aNI$!9kzhN;TiaX z;0bTmHQN46<4NDfy?o=yUtjM!`UCLB47<|p_g=+RQK^*eKK4xEK6} zD%l1vPid=NyLa`O_m&UK4$pXM)=QPDf;Ka(a146E@d>;@@I;QszyIsP*7nw6b7J0V zmo%k&OYp-CyV8xgIJ3a(L3sWhntjIY`le`Xy62BSyvO3F@9Q7%OX%+5<0|eiQ~pkw zg_nIaO$IAU3y&eL`Kxw6NevM8{Q>&XL6n0*DO0QUJ5hFiq49B zAK@1pwt{sCp0IC2m9G+qo~{(RWkbWao?6xWJlJQ3UFrSD0me-qCIR{PW~19lzyfM$ zuO|Ud{aSCuv=Wc?c&=})a^rix=Hx>blK`xso4-acgB4{Lkx4lA*#A|DfaeBax8CE!xfP&)_c!A&vKSKMLNc-qwg}8a= zYi_--YVbzz!wkF9jkq|5!0Sms{+-hh=x!3=lM&DOxBE(FH**}F4l=I*I${+?B0K6qw^UFk+&c-p--`uVpNp)$RGYq@;C2S=YlK`7+U z%Fnsyx{W`-Xj;h5fsZ}<$MV`v9~Bfmf^2PB1}lml0py+cJpMC6kZ5zAHH@a&7pzT`!#ac!j5Id%AhsPa+z; z5WM}1CYSE+GvouX%?$I;{zynIIH8L$o>%jeD?8A$*i~JLp06P>3$WSgNt3t=bZ0N! zGKgMW2>YuY&`{Bor832Z@pwa}c1nhTGaa-n>@Sn+oEiX=)>27QOHMXDi|C3_ia@I1ZS6XBl57G>z7_wkey1wH2(dO*J7HQQX5I;zyT`MO2f>b~BGPX6q_)u)CgZu_4>7 zl5Fke*_IlzHKrtBiLo{hvq6k~$Oc{WAsf`uhin*w`;ZN@10S+s;^RX$XqFGzO8Si9kHjL~p#i>zE<1)b6fpQhFqRF5;L?I# zf-wtndzr;dxCgbES?oa;B=Hh4vr2eSi`lY!kfn_Gh?#pU4{9;@ixyc{Yfa0>XyzUm zO^a+=&|4pWXK*00n1^>3*|cG@F(bye#ujp$kyprWd#5&8zVxrP+0FmA|0slsonB!` TFzSo;x0iZ*cjG_~L;C*%$6VIc literal 0 HcmV?d00001 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset new file mode 100644 index 0000000..b31efe5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27adec7d65184077043df2657fb805f32299bf6b1f6c255c42e0eade3f1f8f41 +size 615119 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset index 861413b..3c67b68 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8704f1be3876c6336d0516aa05cce659b88311a661204eb81afe03ba80d12c32 -size 2548622 +oid sha256:7c0a7cf83e4fa2453fd1d3a207c64f04fab17383fc4d4844f70603e6f8e0b027 +size 2549686 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/GripAxisRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/GripAxisRight.uasset new file mode 100644 index 0000000..ef4044f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/GripAxisRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39566d6481a9c00f35da9b80cb8a43c44e99880231480fcfec4372bb201e2bd4 +size 1386 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/UseHeldObjectRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/UseHeldObjectRight.uasset index 5e905a5..d7c3110 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/UseHeldObjectRight.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/UseHeldObjectRight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a74fd5d208d06fe519de6ef05f423de3404445aa9450b293d0f301ba67017e5 -size 1795 +oid sha256:5f384e5d18480d18ecdbaf5745058a3d6caba9bb182a58258147e74b57d8bbf0 +size 1569 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputMappingContext.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputMappingContext.uasset index 2d753a4..81abb6c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputMappingContext.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputMappingContext.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d34a5e7ee3a2530417b75636531ab541e6ee686c1531ea561a12176219ac7cde -size 29861 +oid sha256:5f5ec5728c28813a58ca803e3fe08764b1972dc56dc29d7a8e0ff4566d2e32d6 +size 30359 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset index 7f8097b..a0eff47 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c1146572bd5efab6814af79486a614b97fac74c7dd20046e72cdf2eba9db61b -size 68838 +oid sha256:2bbdc156613b44edbbf8e00e98440e3306391f9720918f955033a42e84ed4682 +size 149058 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/BP_Duck.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/BP_Duck.uasset new file mode 100644 index 0000000..d6d360d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/BP_Duck.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c7a9fdddf3abdf576beae401f56219f577daf534e19d62aca52788b927d985c +size 126168 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/M_Duck.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/M_Duck.uasset new file mode 100644 index 0000000..5e25628 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/M_Duck.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aabd0c81c980d970fd520d27953bd7b7dff5c00d687a8ee7a8e066177a6efa52 +size 64562 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/PHYS_Duck.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/PHYS_Duck.uasset new file mode 100644 index 0000000..6017170 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/PHYS_Duck.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e354c097fdd5c28e31f631c0a61310a25c16967079ede2bdbff7ee3deb8f6b01 +size 7830 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKEL_Duck.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKEL_Duck.uasset new file mode 100644 index 0000000..d204f18 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKEL_Duck.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9efbde083822ca8f2334b397d6d6da5ac686176320515ebf7de15748cbe86e9b +size 7571 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKM_Duck.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKM_Duck.uasset new file mode 100644 index 0000000..10c5a57 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKM_Duck.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:024890ac74c37d0ac822389b2953fb96f4cda6f8409524f9ac3279867bd6f5c9 +size 733257 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_N.uasset new file mode 100644 index 0000000..8822925 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76ec65e7bdc9c572fed79e292c451f34c68b96fa56d168aeed333fa20949bdb6 +size 11321425 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_R.uasset new file mode 100644 index 0000000..379b16f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b2e1fe0570e57695574b4b0800de891ffab2b51bb8edc7ba2ae7295180ccf44 +size 4226917 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_toy_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_toy_D.uasset new file mode 100644 index 0000000..fe82fe8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_toy_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4fa07c7bb81cd360a5e1a9efb17746b266406ea7bd73529aadcc8682291b142 +size 9540000 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/M_PaperDispenser.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/M_PaperDispenser.uasset new file mode 100644 index 0000000..ce4ff7f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/M_PaperDispenser.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f99d1bbe73bde983f6f2e125238daff5f654d057f615bc389100e2903b75115 +size 67146 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset index 53e2975..6d71bab 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:079e212c2815357f271573c0c38900ba4bbf180c84dbef7d41ab11b6e2cd6895 -size 1097672 +oid sha256:1e622be92999647915428b54d6a3476c840773b046c8815db12bbbb96d2e338c +size 1592 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset index 3c4580f..13a0d50 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0847a6c643d9e0109c0f0dbb1d3f97a60bc8be62aea8f1de1b58ced22651d6e9 -size 8332008 +oid sha256:b847f40e81181d573277f10f4cd7d8cf8eaae7e053d9d657162070d52d1c9d07 +size 1587 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset index 6459b0d..9fcf509 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7aa8d1f1ff2ea52ea6e83a3ba733869028980b9cfe7f6f98992c3ac275400da7 -size 337713 +oid sha256:154a4c7233b83e243abefdb9fcd2c324fbb54f05e1c00e09e4047ae68e448df5 +size 1634 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset index 17b55f3..6538684 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b45f707449aa8ecd33130da2a1c78fa42bcc1969a0e03b8648c7eea5cac777c1 -size 67210 +oid sha256:0e4a1874566bb330e28d4678fbaab0c27e0244ec352a330b8a7b73cd76916791 +size 1534 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Body.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Body.uasset new file mode 100644 index 0000000..55bcb0d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Body.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42fcadaaf1e543eaff7fc7d772e9ecb0009fed8ef4fda4ac76682eefa12a42a5 +size 99492 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Lid.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Lid.uasset new file mode 100644 index 0000000..45d5664 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Lid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:773b28fe778a31d771742952e3f6e91d175dc5a1cb0d13301f3de1b07ca85197 +size 92961 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_D.uasset new file mode 100644 index 0000000..414b39f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a2fd244bb3172850cdbfb95ae75de1374648c1bc0bad3bf45f1475931d318d3 +size 1097742 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_N.uasset new file mode 100644 index 0000000..62d1564 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e31840003951bdab377f9839509483df3c0c406459397692141909bd1bb13f0 +size 8332083 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_Roughness.uasset new file mode 100644 index 0000000..fdf1ff3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:752c417aeffac8b19e016cd9c6f2a51221fe6323d4d049f9ca21142dd3f59c7d +size 337813 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset index ef50809..f28a808 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffe969a0494445923c5c012ab23685c070a33b4ce964b3a6ca63848bfdd97049 -size 92606 +oid sha256:6ac22609b582b4c9fdd75442a928cdca33b49b8be895ef14c8d2182dc9735cc7 +size 1531 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_Baked.uasset index a99a624..999c477 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_Baked.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_Baked.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:622df9143d7949998b44453e3de1f9231a69850b718430b7fc08fdbe22f3a404 -size 99112 +oid sha256:e872e79d2f138c8c8eb6cb8380a2593e50b6fe66045d9c4c038fd020ec38b931 +size 1515 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/BP_Plunger.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/BP_Plunger.uasset new file mode 100644 index 0000000..3ed7527 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/BP_Plunger.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f85e5ab0c954752235022292fba2753a9f2665ceef79c6e2561d2dde361e2943 +size 33756 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/M_Plunger.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/M_Plunger.uasset new file mode 100644 index 0000000..7dad2bb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/M_Plunger.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8aadaadb6f8b0764b2391dd9a800513dd3808f8df700c859becb1db1d5821a76 +size 64916 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/PHYS_Plunger.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/PHYS_Plunger.uasset new file mode 100644 index 0000000..395012e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/PHYS_Plunger.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:647d6cf425dae0148603e657534cc8e94ae655a88d2fda96f7f16186e6d1a035 +size 10327 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKEL_Plunger.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKEL_Plunger.uasset new file mode 100644 index 0000000..230b301 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKEL_Plunger.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccc458ad1f369232d97b7424c995da1ed0b5627c1e5ad59c523295084026d6da +size 7222 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKM_Plunger.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKM_Plunger.uasset new file mode 100644 index 0000000..b7bd4f1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKM_Plunger.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:921828978a8e4afa12bfde0feabd413feb291d8d4e3d7d055259cfedcb36b946 +size 536735 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_D.uasset new file mode 100644 index 0000000..1f34ca6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3162fee1570193b0ad937a0fc1bf93867c68f04ec52265ce5fb17e6c3b6d9ddd +size 20387236 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_N.uasset new file mode 100644 index 0000000..9a070bf --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:100536bbde9374b757e803ca6e7be91dd6c07dcbadbbb490068712c6ecf0e8d1 +size 50157341 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_R.uasset new file mode 100644 index 0000000..6e56077 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08ce72fa47d9804daf1cfcfa9b404686c60c43904e7cac3de9028b5e27a9b40b +size 9568757 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset index 6c8f79d..22e0b9b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b16ee2b42c8bdfa67f194beab2e8a163f1b17a88a024d51e86984aa8ea208c79 -size 329876 +oid sha256:c39b5d5851a1d0d47b6f6d5543ed6c499f856890a94102cd429cd2c4d66800fa +size 319918 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset index f805aac..0cc42c5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de6f0b756fb8bf1ae6aaf7fbd8bd15aece0ea1ede2025cc137574e2e109ca280 -size 93992 +oid sha256:702495f47c50447628165ca25bded444c65835157174bfadebf81c0fb722bf06 +size 93306 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/M_SoapDispenser.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/M_SoapDispenser.uasset index c76f182..1d9119a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/M_SoapDispenser.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/M_SoapDispenser.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fd3693adafdd15bb822c88ca4c6263a07818ea1287d000e2e46859f5e2561b1 -size 22808 +oid sha256:bc332e5aa45acc03ff0b9dda399014ea01f97129b883788503179580a9d38998 +size 22865 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/MI_Toilet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/MI_Toilet.uasset new file mode 100644 index 0000000..873b1e6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/MI_Toilet.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22db941212bacdc7a43b85aaeab0bfc9ba0717e5c982223e811c3ae6e60776eb +size 66486 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_Toilet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_Toilet.uasset new file mode 100644 index 0000000..d470ca5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_Toilet.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b2f26009623770beb85d246f75c8161b284e879cbf1d0ae32e71449433fae11 +size 289442 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLever.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLever.uasset new file mode 100644 index 0000000..6288ffb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLever.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b149952ac21c949ee64c8b61111477183ec3c63d0bc49e0d5081786c437048c7 +size 82475 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLid.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLid.uasset new file mode 100644 index 0000000..029e529 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f8b00e731b08caaab7edd24a9c7192f92eb46b0a64118d71bfd01f263c598c8 +size 126844 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletSeat.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletSeat.uasset new file mode 100644 index 0000000..7f6297b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletSeat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c3dd0fb7e39dcb5051b164ad8e25e00d0c0a0691dc5652cd6fe47dd9a85d6ea +size 113640 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_D.uasset new file mode 100644 index 0000000..3c55bde --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3646d23d5874dc5fd97db77b415c06ac0cb777ddc8324416fb28c60856a95277 +size 738607 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_M_R.uasset new file mode 100644 index 0000000..bdfd486 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_M_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7713ef78e97d81da8721c6d76597ba82fa67eb0ee1adbf8a7cfc588047a5127 +size 1002455 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_N.uasset new file mode 100644 index 0000000..ad9811a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb3dad9c55193f5015d1837d43e088c7a0db2ea5dfbcdbe2c13f169db2ec8f99 +size 4272167 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset index c1558cc..28a5b20 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01004fafd95fbf25434df15d7ae2f6cf88067e0abadde846d631e3d236f9d704 -size 66450 +oid sha256:3ef340549a3a66587cc5c0f1892f8cad28e4920ed90974f40c3f6a39aee1da65 +size 1404 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet2.uasset index cafffa4..9322d8e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7eb25ac38c6daef9f82c796369ae2b9394cb9016f4a5c68e9b2d4b93627f4dc1 -size 113248 +oid sha256:dd9048dadb1dc61eaa6870082c5627e035ceb20acbac1294609579e679af076c +size 1397 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet3.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet3.uasset index 86ffcea..c668c02 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet3.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:009c3f49798cbc5e3d328eef94df2df23e300f523cf61d278dbe1cfbf8d9fa68 -size 126484 +oid sha256:5a4810dcde49822e51f8e529836b294dc0d03565c8b2666855f418d62259fa39 +size 1393 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet5.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet5.uasset index 091642d..3f2f332 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet5.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet5.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9d44add24375c6d9ec9dbce7fa1dc66182d7f959c15d3e3159b485714262757 -size 284044 +oid sha256:8ce99624c3ca682d84582460127a5f75667d02787b33b73d332da895e8cb5a6a +size 1381 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset index b358b09..847af6a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72342dae949c1feef815a626cc36e4c6b2b9bc62c2d2007b00a2b28015ffa477 -size 738542 +oid sha256:3ed19d6e8efeade58e9ea6e0f56368c97a3a89c3bb2f60c6aa49c5c2e7e9697b +size 1428 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset index cc57b4b..4c0de1e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6119d5e296e9ab70fd7b368cfb9f0dc2e06da92c36c76fcff0654ef1be3ae283 -size 1002500 +oid sha256:92dcdf3331ee35ad606d848a8974aef7b8ffcebe24a8b9e45dcf637eece5a6e7 +size 1556 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset index 3487df5..1db7c9e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb9116c9feeca4b4ed09f1f1595c631c4032b8055432828130c8bd172c6312f2 -size 4272107 +oid sha256:b69c37d1719a2b191fde1476d8b1cad41232fc472eaee2d0d1019fe05c920a52 +size 1433 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset index d5a2593..37cc7a8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fed2b9977a0dfb444df0328444ec6f6176b4abdd3e2656bb3c58d5dea2412df -size 73733 +oid sha256:31ff1f0a97216404138989b51b4b558d702a1d356ccae744e9164170e4355884 +size 1410 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset index 90bb4ad..8594bb6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd598ab60787ecb0d365fbdfa978704b62c62b7f4821cb97ab331d0b759229c4 -size 79654 +oid sha256:cf8806749657653adf348359a1c3512654707442611d1a6ae942f48002fa5df9 +size 1446 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset index 2eba228..0528253 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c09236bc3056e6220363b3aad38bdf0b0e935ff5b941ce19570ee9dd90ec35c -size 80441 +oid sha256:50d59afc3a5fad2fb78a609ea564e1b5866f799a02bbdb13d932c77f0f3a7f2c +size 1410 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset index d24fde2..5f90fd4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7ec1ad715daa014b42c9c9b34f9e092aa9592830e1b5a5314e6599ce6c3eff0 -size 85284 +oid sha256:cb6dc30bf5804dd59e481e74ffd33c01f3d81c246543affa0e57b56c0555d1e3 +size 1398 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset index 57a4c85..6b1fe21 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3059bfe30a3df1fc9a59d052c6577c033a6a55931aa633be09e4c9a0598490c -size 622041 +oid sha256:33c8139c45c636083ec33d1f38b95555f22d0acef2e17dacaadc48b1f7b91991 +size 615581 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Test.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Test.uasset new file mode 100644 index 0000000..7cb090c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Test.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d8de0ab506b736c754cf0541986b182e6b5f6c343da5adc3078df423499b94f +size 615356 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset index 504a2f0..01aa956 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c8e9c3ff1c75be82dd616fac4677171861909f30ac626961ef205f29f7611d9 -size 86558 +oid sha256:123626a993564a69e8340e6be084dd23f40482e14d0c7db561b81460672d1b46 +size 1383 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset index 6f21205..b14aad1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8986a1a730bda1c474b2f90318840ae2a4b79082a28c3e8cd372e6f7b236c8f8 -size 88370 +oid sha256:f017037737a849736656c7cde81bed931e162f538745fb1b878346f495968519 +size 1432 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset index bcea0f5..202d8c5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:434cde1f535529500ebd4788ba34cf889db00cd6068c71209b85847b875729c8 -size 87239 +oid sha256:fb4b09acbee7e515139a319a770f841ffc93cbdd1e17e61fecd67751eee41dab +size 1472 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset index 32237b9..ff952e9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a481fcb0c73888fd8cdd1cf6d407940a25527f34f056fbdad3e4ac0ca4ac15b -size 80306 +oid sha256:bcf69810215e5e98017c394eea7f5757c411e2d97acc206df94d18e1d24a165e +size 1459 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset index 91b3ee5..ff7b4c2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b9c74262f82b5a65c6dacd0279cc4fbf40e5dd7b5446abad576fbb8bcb145b8 -size 85069 +oid sha256:5fe9fa30f41eb72a4f82a73db273d6115302a4c7bd9b95f31f91a420df290009 +size 1495 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset index 8c1ec63..032dc41 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f57e14f33c4064d48fcb0181e5deed8f38d7f7953f4d00290554578155cb7d7 -size 73433 +oid sha256:0bb5a8bbe5d545bae4c216e2e7d794789ac1fb13a83dbb859339feb2fac1be16 +size 1401 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor.uasset new file mode 100644 index 0000000..5baf634 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:908bf37024a6b8d96a1f736f63cea4bfdc8fb6b307e43562d0cb316799462267 +size 64156 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset index 3609d78..2edc5e1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a257e9e61f01f54fb0383cba9027c37264295e2dcda47ed83b1be0bba935be97 -size 7649597 +oid sha256:5ee54d0951a4301fbf49571802700f4a3470692bd803f564ef8d407bad6e93fe +size 1520 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset index ea10a59..e4dcf81 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3507a2805906f92412841f9f0792b3463f371457206974225ba832df260a9739 -size 284360 +oid sha256:5426fdcf3ecfd81b7dba551e6573232bcc32f5fc648b60e53724ee41b723b9aa +size 1693 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset index cebe21f..6bf8313 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf0497b2f52b02263c675a85e736bbc1b5d731b7659a44c4e99cfbe69b8cbbf5 -size 78257139 +oid sha256:459e7e527f569d896e4657913c450cef6c9e1975de3c8d77103b75586d3739d6 +size 1515 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset index f640cca..9270994 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfca4bf79540ce2460e46db197430ac8dc14ef65db83044d0707c09745c0ecb2 -size 64372 +oid sha256:b9c8fe54a3f88f4126630866407b6e37813d7e53df3988b8866b896703a5b559 +size 1482 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ClosePin.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ClosePin.uasset new file mode 100644 index 0000000..1041fb4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ClosePin.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81823e00ea2e2ce63010c88d6cacd0a8c58646c7473b094d5ec6614a5f0318b1 +size 74083 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Deadbolt.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Deadbolt.uasset new file mode 100644 index 0000000..2aa07b4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Deadbolt.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cc599f1b000ea84cd3ba0366d6ac0ae911ca355cb3aae97a865d8af826a7276 +size 80791 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_DeadboltBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_DeadboltBase.uasset new file mode 100644 index 0000000..e199f17 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_DeadboltBase.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d50c7625d5b404f54d4109a8a08a672acbdf57e0592c0efa51ff79fb20e9e04 +size 80004 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Frame.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Frame.uasset new file mode 100644 index 0000000..3ef439d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Frame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9902d4c7e01ea64e749b9cc47109d0a0937e27749614a5a771e4ccec4da289ba +size 86573 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_LockPin.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_LockPin.uasset new file mode 100644 index 0000000..00ee619 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_LockPin.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:798493935161944b39d2ff97bb76388ffd323fcdd1eedd42613f6ec69a48dc2f +size 73783 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoor.uasset new file mode 100644 index 0000000..5d23766 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4f9a79ac2ec36466755e52380a397783f5e4a5bf839dda9b31cb051b3348db7 +size 85329 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorHandle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorHandle.uasset new file mode 100644 index 0000000..c0f9470 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorHandle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7770d04832b5f91c6ba3d20810174e5c4c988c9b465bdeb3b69c3e3ea5b83a91 +size 88435 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicator.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicator.uasset new file mode 100644 index 0000000..de3456b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicator.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d77cc6a06b27f2cdc49eff13e0c975254f92135433c5be3403dfa5f10eccb68 +size 80706 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicatorBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicatorBase.uasset new file mode 100644 index 0000000..9e84717 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicatorBase.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a221b0de109b875289eff6e0a4bc179f313302756d22b88ad8734114f3b07f2 +size 85469 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToilletDoorHandleBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToilletDoorHandleBase.uasset new file mode 100644 index 0000000..b82ad65 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToilletDoorHandleBase.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c3026e5c115e80cc4b8b2ec7cafc70fe25b346976bae0f83e023ac97301e4a9 +size 87653 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset new file mode 100644 index 0000000..4fe5415 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8f99b9a3099a82d6bcb2af2983bcf3f601dde617939a6a136ea7d59c31eacd2 +size 7649622 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_M_R.uasset new file mode 100644 index 0000000..72e0edb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_M_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf970431250f8ce004425afebd65add5a775c30c379685f2a412e45da90893e6 +size 284230 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_N.uasset new file mode 100644 index 0000000..0e2029f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d82641db03b84bc713edf75512cbbfe6eaeb0c72a4a5445739992b82206fa7d +size 78257169 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset index 5dd4a34..7c25756 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5eaebff80810a0a9603d3cdfafd9807283a2802af20d2cc72538202d85d21f7c -size 38143 +oid sha256:c737a148e23850e435b08cb29ce2db6d56a5595be8c93c2c0843af4896c9d70c +size 111528 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/M_TrashCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/M_TrashCan.uasset new file mode 100644 index 0000000..fba8363 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/M_TrashCan.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6560d24e3eaa0b0bdd8ecdadcf254a81622f923c789cda4b5d2bd6188af795c7 +size 64177 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset index 3c09379..ff8f5a2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e26c5d6d75b9e12d15fb125ec417740c1e0464de8403c9bef5a5d04d6362a4bb -size 63180 +oid sha256:b6a7f3b752a7dd7b65760a35ea2243a4689486e6df6c6ff1e3a0848fadadd26e +size 1504 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset index b328fcd..28eea42 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c56bd6607e623397c291e11c491ab1634ed4e724444ae01415f836436eb3050 -size 74061 +oid sha256:0dd0b3fefe7b960fd3856f0a5920520b60a24037802c9f0399b0d93aec11627d +size 1677 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Baked_003.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Baked_003.uasset index 1dbfce7..fcd6f4d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Baked_003.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Baked_003.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa732084936bd69e0b5e546045bca53f1eb17e20c207f12dd1140dcba27aa2e3 -size 64427 +oid sha256:248a08a5fa91d08d7929b3ae894a0013a0d7f8d60f3c5078345accce602dc243 +size 1486 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanBody.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanBody.uasset new file mode 100644 index 0000000..19f4e58 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanBody.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0748713ff3a8aaf1e936b8da8fd90ddb0995e3a60f87a7d8b0117dc3a6d2c853 +size 130625 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanLid.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanLid.uasset new file mode 100644 index 0000000..be66871 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanLid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a536bbff5abf5f47f0cf3f38c0c24f5887b39a4cf2fbeb3a331a657e1bea3fc +size 134573 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanPedal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanPedal.uasset new file mode 100644 index 0000000..a21fecb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanPedal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ac243840cb989760675fdd801cf65609c7f71f6b730f269d7b4f72df37f0173 +size 75967 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_D.uasset new file mode 100644 index 0000000..564a15e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:737cb8edb75022b2123ab9042144e82ec53e94c35ac16c3011a71eeeed1e07c4 +size 63195 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_M_R.uasset new file mode 100644 index 0000000..bbc4988 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_M_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38ebcbba5d528b18e29fe06985fd0cdb810a84870ed17b88294a4ad6115e10cf +size 73921 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_034.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_034.uasset index 69e5d24..19cf5f2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_034.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_034.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c27f72edf70b139ed4fcfa1809ffc85c50f927234d2faaa5847020649971e5f -size 130341 +oid sha256:dcb04ac1bb8e7170ea423920664210922e58f45b125c32f64ac20d9bcf139ebe +size 1493 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_035.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_035.uasset index df4bb0a..f87b376 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_035.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_035.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85392db890859b5caac6360f86f5637ff95fb9990c44c1cd55b4e8776a4136a5 -size 133828 +oid sha256:e5d1699689e9f560efac4bf45d1fab3bd526c3e623fefaaa8ceba413fb5ce76e +size 1489 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_036.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_036.uasset index 89ab00c..41ed26b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_036.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_036.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bc0d1fc753d5f1f16faa3f315297440f97dc75f140cf0597b115a5b85ec9eb8 -size 75211 +oid sha256:9102af9da577fc328721da2c50cdd88b9fc2f90d7198798899f8d949cc6151f9 +size 1497 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset new file mode 100644 index 0000000..3da5c9b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19a17bfda002a1c73d6ac459e54003127f54104e453e87f6803bf652b9efda58 +size 44133 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/M_TrashcanWithBag.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/M_TrashcanWithBag.uasset new file mode 100644 index 0000000..1d8b754 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/M_TrashcanWithBag.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d00b329de825ca5c80c721eb5001a51e08954fcae8c6ce41e2772a1da93d15f +size 66002 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/SM_TrashcanWithBag.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/SM_TrashcanWithBag.uasset new file mode 100644 index 0000000..80966b0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/SM_TrashcanWithBag.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fb809e4b766a324df0b39bbfed5aaba0a0f0d099884fdf94510e10e750718f3 +size 162461 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_D.uasset new file mode 100644 index 0000000..beebebc --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:014292940e96fa0df0bc871b096bd3687ef629edbd0ee25424065a964a3a1908 +size 319009 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_M_R.uasset new file mode 100644 index 0000000..b901c52 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_M_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26f355ef0642268920a88cdb9e506e6f1192eaf5ee974b956f7f10cefc1f3bac +size 1913292 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_N.uasset new file mode 100644 index 0000000..aa68ff7 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48aea1273a5db8850e405d6b69f4c5faf3175b792c5a0c3202c085cd067ad094 +size 4096494 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/M_VentCover.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/M_VentCover.uasset new file mode 100644 index 0000000..a5960df --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/M_VentCover.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e61096139319b1282a8bcbd819a422789085a9da26b594724cd411a341204386 +size 67529 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/SM_VentCover.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/SM_VentCover.uasset new file mode 100644 index 0000000..524acbd --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/SM_VentCover.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14d5875a102d14234281dc72b1425a6c9a81c4f7fe3f3f21c9a1f4187ef451a1 +size 94962 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VenCover_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VenCover_N.uasset new file mode 100644 index 0000000..befaa74 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VenCover_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c3a2e19480d998df93516aec2ea9320e1f3195bdad89948077ebedcd17cc0cd +size 3246414 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_D.uasset new file mode 100644 index 0000000..5ba4f3a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4a68859e8f6958a8dfbf30e4eac66af04ef7e2c4870426f06dcde17d82a2cb0 +size 1356295 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_M_R.uasset new file mode 100644 index 0000000..7baf58f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_M_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4653d0c108d0d67989a00a2cd202f88cdd25a0e2e2d6ed90787df6d934a0061c +size 666948 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/VentCover.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/VentCover.uasset index 16f4826..314a729 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/VentCover.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/VentCover.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0771a1d2cf8f81bc6fe9d36e77ef3ce0358c769f94fc439a27a868e3cc89216e -size 94612 +oid sha256:6f5c6a71510808f5ab32db0cdac599e88a6b0be6fb6e4feee82ea3732dd46735 +size 1415 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset index a7bce06..a39a9ea 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d9c5522ff4cbbbbc8f86c867c798b8360fb71a27b4ba47f510212ee2c877ac1 -size 667163 +oid sha256:61378a0b96f6c9e86ebacde1f3fe9bdcc44e1a81f4e1ad50a03afa4ac62e6645 +size 1765 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02.uasset index c30e4c9..fd0fb65 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83bda038faf4a1b42246df052c8bfbeb3072c07c677ba92d029d9eb6e361bc5f -size 3246449 +oid sha256:c766837fff783fd5bc784388f0dbc579ad3a37ff54ab47d11708511872355e22 +size 1558 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_021.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_021.uasset index 6e894df..6ab9a86 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_021.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_021.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3a1b62fc9fb600d7344f06d944d88d1cc90e892e1ef7fdb32458a0fafa2ba8d -size 1356330 +oid sha256:5fc68b71f3bd27834ac4b2d4489c151a7177a62bd51fc36f6342ac92e4fcff33 +size 1567 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset index 051966c..f0b6f71 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8554a96abf5ae82bf9f369a5b04211f6099c7c8fde3dc7200b6e5d7b3feb74e7 -size 67887 +oid sha256:468a4219b337ac251ab28fce8e6db09ef0c98e0f89716f3ca747ac6921cac64d +size 1664 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset index f43c70b..8596877 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:becbfd76dbcb7747980ff036c4a95c8114d78a7af25ac806a0ac316c2b31a098 -size 114611 +oid sha256:84fb8b41865ef0ee7a3fa96896cc0b00c714f411d66dffa7de7feeacdde01c1a +size 114470 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset index 9a2e632..0a4252d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4304c84e135537a25367d25c5e4b250198cb5278cabc8a0ad3ce9d2b4a62854 -size 228256 +oid sha256:2dde107e89837dda660ef620b455bb2273fa39415498bec09c60bfbf9df76cb0 +size 229044 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset new file mode 100644 index 0000000..7902b30 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f2e5478f22c3c309d69fa3a0ac9d2bc19e6fc0783cda686528d42f6c170f46d +size 19643 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset new file mode 100644 index 0000000..dc0c0ca --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03cb6f765c5e2e67d4412abd352126d771f3ed6c3bfa3aa5349629b5597f45dc +size 102525 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset new file mode 100644 index 0000000..e6a78c0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7489484a78c52ea4156cfa1fc61d31318024c8dc4ffa9bcbaa704d552b77e34b +size 590665 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_M_R_E_A.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_M_R_E_A.uasset new file mode 100644 index 0000000..0d378d5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_M_R_E_A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b53a4aec42c7ee216c9ab1e6fd665bdb8c07fe719e6040f367e773d3add0b649 +size 163855 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/Ivy.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/Ivy.uasset new file mode 100644 index 0000000..249903e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/Ivy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a81745208146fba63a8d4c5c38a1a5e7e767208796525b161059a669527135f +size 118886 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/M_Ivy.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/M_Ivy.uasset new file mode 100644 index 0000000..ee79be9 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/M_Ivy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef4278b8b718cf46ee63a9d9750e7f2a1b34306306d05abe24885d91e2864c3a +size 26525 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_D.uasset new file mode 100644 index 0000000..544aefd --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2f452f4f85e78b586367067a824a68f38e19aa276ebfd2005e8c5fca4760b03 +size 22626009 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_M_R_A.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_M_R_A.uasset new file mode 100644 index 0000000..c3fa42c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_M_R_A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f70df02203c8496d40192ee0fb55b9f4a4003642cb0d72e3f1dde893892b7d97 +size 11882747 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_N.uasset new file mode 100644 index 0000000..d16a0db --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40417b2094092bc09ec79cd74b8a36deaa9193f5f27b66f43309b2e6b8157dba +size 30844451 From 2775763bfde7d3cfa1cf2dd5e46f99bd62a9cb8d Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Tue, 28 Oct 2025 16:57:47 +0100 Subject: [PATCH 49/56] Collision/Phyiscs fixes, tried moving actors between levels by chanigng outer and renaming but SPUD cant handle that, so will probably destroy / respawn --- VIRTUOS_ExpansionPluginTests/.ignore | 15 ++++++++++++ .../Content/Maps/Map_Bathrooms.umap | 4 ++-- .../Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- .../Grippables/Weapons/Guns/GunBase.uasset | 4 ++-- .../GraspingHands/GraspAnimBPManny2.uasset | 4 ++-- .../Bathroom/BP_ToiletStall.uasset | 4 ++-- .../Bathroom/ToiletDoor/DoorActor2.uasset | 4 ++-- .../Bathroom/ToiletDoor/aaa/DoorActor2.uasset | 3 +++ .../Bathroom/Trashcan/BP_TrashCan.uasset | 4 ++-- .../BP_TrashcanWithBag.uasset | 4 ++-- .../SM_RoundCeilingLampBath.uasset | 4 ++-- .../Private/CodeOnlyFunctionLibrary.cpp | 23 +++++++++++++++++++ .../Public/CodeOnlyFunctionLibrary.h | 16 +++++++++++++ .../VRExpPluginExample.uproject | 5 +++- 15 files changed, 81 insertions(+), 21 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/.ignore create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CodeOnlyFunctionLibrary.cpp create mode 100644 VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CodeOnlyFunctionLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/.ignore b/VIRTUOS_ExpansionPluginTests/.ignore new file mode 100644 index 0000000..a01d5b2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/.ignore @@ -0,0 +1,15 @@ +/.vs +/.vscode +/Content +/DerivedDataCache +/Intermediate +/Saved +/UE4ProjectRenamer +/Plugins/AdvancedSessions/AdvancedSessions/Intermediate +/Plugins/AdvancedSessions/AdvancedSteamSessions/Intermediate +/Plugins/SPUD/doc +/Plugins/SPUD/Intermediate +/Plugins/StevesUEHelpers/doc +/Plugins/StevesUEHelpers/Intermediate +/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Intermediate +/Plugins/VRExpansionPlugin/VRExpansionPlugin/Intermediate diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap index 0d4fbb3..05c5c5f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b633da6ff1c803bf6d86fc39ca1fb64901702afe896cf1bee0e4d14baf55b19 -size 125489 +oid sha256:40908dfa847df4b2fdca95cb0ee9f47161419ce3ef8c725e4e1f05cfb6ee70d5 +size 97737 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 3ed4b58..046c0f6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab655cee8b4b3c15cd8bd6b5e048e6a70c64611cbf5846d6e0e827151f092c17 -size 582439 +oid sha256:f353334faaae375c066d69a46c4ba9d78fd3aaad9882d8120535e731947bb7d8 +size 626794 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index d1c994a..1dced69 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a36a7818f485b94981cabe5474999e79d7cec0b5a7d5fbbec95f8d5684c3158 -size 1771538 +oid sha256:3f7ece54e1e935b50ae80cb598e406bb39ecb65f73d8dfa2fc82527ace2974df +size 1772246 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset index 3e14cee..7202eba 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92c0a1fd3c0dd4e3e2636913955d33e77201075ef9dccc31e5ff2484ce2bd7aa -size 934654 +oid sha256:fea19b08511ed881cac92581bfdd5069de678009555c1d072c5dbfe423aabc7a +size 934045 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset index b31efe5..f46f5a8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27adec7d65184077043df2657fb805f32299bf6b1f6c255c42e0eade3f1f8f41 -size 615119 +oid sha256:56e61c5ec305541a0a221ba0c62e322860415ed78337a6eb77644d8794924913 +size 606472 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset index a0eff47..00a7016 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bbdc156613b44edbbf8e00e98440e3306391f9720918f955033a42e84ed4682 -size 149058 +oid sha256:2377dc436550e674d680dfaa303d2e8964cdf488d7c23d9a3549e904256fc7c3 +size 241334 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset index 6b1fe21..6e978d8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33c8139c45c636083ec33d1f38b95555f22d0acef2e17dacaadc48b1f7b91991 -size 615581 +oid sha256:045e1240e36da7bc222b8cadf8cd2f0b445f1ef400b8c172ce0c43562bbed492 +size 615151 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset new file mode 100644 index 0000000..57a4c85 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3059bfe30a3df1fc9a59d052c6577c033a6a55931aa633be09e4c9a0598490c +size 622041 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset index 7c25756..74e9281 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c737a148e23850e435b08cb29ce2db6d56a5595be8c93c2c0843af4896c9d70c -size 111528 +oid sha256:d0f3bb8fc4e50384a4522ab81ca9c87e07fe97ce7d427f6a6090f8f92b43d7b1 +size 130785 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset index 3da5c9b..da92cad 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19a17bfda002a1c73d6ac459e54003127f54104e453e87f6803bf652b9efda58 -size 44133 +oid sha256:9cca5e3325672472ea7133ff58d35f25789c59d892573f10ebcdf3b6d6c39aa8 +size 127532 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset index dc0c0ca..958accb 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03cb6f765c5e2e67d4412abd352126d771f3ed6c3bfa3aa5349629b5597f45dc -size 102525 +oid sha256:f17e3a5ead0e45e9e149a198ce5bbb3a7489990ba094f975938b25df41fb93ae +size 102851 diff --git a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CodeOnlyFunctionLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CodeOnlyFunctionLibrary.cpp new file mode 100644 index 0000000..e5a9920 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CodeOnlyFunctionLibrary.cpp @@ -0,0 +1,23 @@ +#include "CodeOnlyFunctionLibrary.h" +#include "GameFramework/Actor.h" +#include "Engine/Level.h" + +FString UCodeOnlyFunctionLibrary::RenameActorUnique(AActor* ActorToRename, const FString& DesiredName, AActor* ReferenceActorForLevel) +{ + if (!ActorToRename || !ReferenceActorForLevel) + { + return FString(); + } + + FString NewName = DesiredName; + + while (!ActorToRename->Rename(*NewName, ReferenceActorForLevel->GetLevel(), REN_Test)) + { + UE_LOG(LogTemp, Warning, TEXT("Rename conflict on drop: %s"), *NewName); + NewName.AppendChar('x'); + } + + ActorToRename->Rename(*NewName, ReferenceActorForLevel->GetLevel()); + + return NewName; +} diff --git a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CodeOnlyFunctionLibrary.h b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CodeOnlyFunctionLibrary.h new file mode 100644 index 0000000..2a6c5bb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CodeOnlyFunctionLibrary.h @@ -0,0 +1,16 @@ +#pragma once + +#include "CoreMinimal.h" +#include "Kismet/BlueprintFunctionLibrary.h" +#include "CodeOnlyFunctionLibrary.generated.h" + +UCLASS() +class NO_API UCodeOnlyFunctionLibrary : public UBlueprintFunctionLibrary +{ + GENERATED_BODY() + +public: + + UFUNCTION(BlueprintCallable, Category="Utilities|Actor") + static FString RenameActorUnique(AActor* ActorToRename, const FString& DesiredName, AActor* ReferenceActorForLevel); +}; diff --git a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject index d6e86c3..679fa9d 100644 --- a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject +++ b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject @@ -7,7 +7,10 @@ { "Name": "VRExpPluginExample", "Type": "Runtime", - "LoadingPhase": "Default" + "LoadingPhase": "Default", + "AdditionalDependencies": [ + "Engine" + ] } ], "Plugins": [ From 7bf7edeb7bd3386754eceed0afa34672b916381a Mon Sep 17 00:00:00 2001 From: Waldo Date: Thu, 30 Oct 2025 19:32:28 +0100 Subject: [PATCH 50/56] Misc fixes, Code cleanup and Integration of Toss in ItemDataComponent, Switch static Lighting to GPU LIghtmass --- VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini | 4 ++++ .../Content/Core/Functions/CommonActorMacros.uasset | 3 +++ .../Content/Core/Functions/CommonFunctions.uasset | 4 ++-- .../Content/Core/Interfaces/BPI_InstanceCalls.uasset | 3 +++ .../StarterContent/Architecture/Wall_400x200.uasset | 4 ++-- .../StarterContent/Architecture/Wall_400x300.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Outside_Default.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Content/UI/Inventory/ItemDataComponent.uasset | 4 ++-- .../Content/VRE/Core/Character/BP_Trace_Controller.uasset | 4 ++-- .../Content/VRE/Core/VRGameInstance.uasset | 4 ++-- .../Misc/Examples/DrawerBase/FileCabinet/BP_Cabinet.uasset | 4 ++-- .../Content/VRE/Grippables/Weapons/Guns/GunBase.uasset | 4 ++-- .../Content/VRE/Level/Misc/Rotator.uasset | 4 ++-- .../World/Interactibles/Bathroom/BP_ToiletStall.uasset | 4 ++-- .../World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset | 4 ++-- .../World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset | 4 ++-- .../World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset | 4 ++-- .../Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset | 3 --- .../World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset | 4 ++-- .../Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset | 4 ++-- .../World/Interactibles/CardboardBoxes/BP_Cardboard.uasset | 4 ++-- .../Interactibles/Electrical/Recorder/BP_Cassette.uasset | 4 ++-- .../Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset | 4 ++-- .../RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset | 4 ++-- .../T_RoundCeilingLampBath_M_R_E_A.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject | 4 ++++ 31 files changed, 66 insertions(+), 55 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonActorMacros.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/BPI_InstanceCalls.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini index 27745ae..1999a2c 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini @@ -102,6 +102,10 @@ r.Mobile.ShadingPath=0 r.DefaultFeature.LensFlare=False r.VT.AnisotropicFiltering=True vr.RoundRobinOcclusion=True +r.SkinCache.CompileShaders=True +r.RayTracing=True +r.RayTracing.RayTracingProxies.ProjectEnabled=True +r.VirtualTexturedLightmaps=True [/Script/NavigationSystem.NavigationSystemV1] bAutoCreateNavigationData=True diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonActorMacros.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonActorMacros.uasset new file mode 100644 index 0000000..9c4d826 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonActorMacros.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1e5ac4d9ad48213918194b8de6fbcfb571dfd2736ba88615516cb797aebd652 +size 85979 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset index 7b2d789..8209e86 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b55811f013d43991e154158845cd8e0ba8df11bd507e998bcb17bbb925dd340f -size 294223 +oid sha256:8b3bef4e28f919f63072f8764779e5f34c2faa1ee9e5864709abf885addefea3 +size 349655 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/BPI_InstanceCalls.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/BPI_InstanceCalls.uasset new file mode 100644 index 0000000..3ccd560 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/BPI_InstanceCalls.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9698cf717710a739316fa89111c02c68b02560c678938df9519c33a63bab4e7c +size 13682 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x200.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x200.uasset index ab2ae06..a913f8a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x200.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x200.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:320c07f0ec58d6459db3db59033835e12c886bd2fa9b672342d78b632fe11b47 -size 15784 +oid sha256:c7ff3e4217e6e84ad3d7720064d81d495c70a564dcd844bae9ddf5fa806ade83 +size 15817 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x300.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x300.uasset index f364d82..f2c58b0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x300.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x300.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f724b4b4f7b29074bcaa0eb6a37fb6e5a425ffb4494b6a93cff1429f3bc88c62 -size 14632 +oid sha256:cc9c1094b2ef6e992545e9042f8dc13c171226c3ec2c12d185b217f06b4d2e6f +size 17172 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap index 05c5c5f..2ed30ac 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40908dfa847df4b2fdca95cb0ee9f47161419ce3ef8c725e4e1f05cfb6ee70d5 -size 97737 +oid sha256:bd02b1fbdb1cfe159188c2b94e1645069399d9c7aa446f7fe06d6e39fb552a60 +size 110954 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 046c0f6..09d722a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f353334faaae375c066d69a46c4ba9d78fd3aaad9882d8120535e731947bb7d8 -size 626794 +oid sha256:7be3b6e8649da302b1f350edab1e54f2a92466eba0ad8c8247cf83c523c7e0ac +size 591877 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index e6091cf..cc81c18 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:670741ed3bf3b98620575125de1e864bf944a2b9c01076844c534ada60fd91a9 -size 1417963 +oid sha256:a20fc3dc3a682471c244078909dbd69e36fb8d98a9c6a518b6bb964af998c580 +size 1417955 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index fd58ec4..0b683de 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc86f8a4756501c3907b5779fc797b66727025717c1db625649b82fbedccf95a -size 127576 +oid sha256:0b919f90743ebd58d85d2c25be3773b8b97faa3def89b1a05a098189922655b1 +size 135707 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 1dced69..e0ccd13 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f7ece54e1e935b50ae80cb598e406bb39ecb65f73d8dfa2fc82527ace2974df -size 1772246 +oid sha256:56e305578476f434a71ae72d659016b9e40e5d79045d080cecf0d80575c7b326 +size 1732947 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 7e95f38..d7d1157 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d9f286e9c359eab18ef373981bcbb8f89a7609a9c068a954243cf343de17ff5 -size 224824 +oid sha256:4c83bcd7d23b3e7cd02bb7b959a90120ef31241bee2da36812715d63e2326896 +size 224870 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/ItemDataComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/ItemDataComponent.uasset index 0edc1ab..4d5adff 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/ItemDataComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/ItemDataComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bfc8bac5601a68148eeb3de0330debce7f279723a1253dcf82bb08fd0455e70 -size 27410 +oid sha256:451d9be58bd4cb24d0af8dc7c3770cbd8b538ad82046e97f0ea087bf8d0c3d51 +size 20181 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index 0aa2b84..c7cc476 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22df7912e9b0d70dd403408ed8ed9a82db9fec5ba27ede7be50a2312ee55405d -size 1834788 +oid sha256:634d3241663d85fc1703d63f7a7d7ad6e70d1255db93cac58aa0b448cf105194 +size 1898409 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset index 96df3dc..6c1dd6f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16ea5beb0ba037d82116d4e5dbbf441f86b42b9fdf6407d6130a3ce9af6649f1 -size 177065 +oid sha256:5d5b1a7385f6f3416ec64cd116d866aa44ee3015f11519701d3dbee7300ca5b4 +size 193126 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/BP_Cabinet.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/BP_Cabinet.uasset index 55167f8..dbf11cb 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/BP_Cabinet.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/BP_Cabinet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:764d0cd4b85a5eb6be89dcf98187c9d8418d628c16312c78fdd873cdf65d9cc3 -size 423005 +oid sha256:7ef0d11ba81d751d5681b1781d3a379e483f358a618084fe3fb6bbc034789649 +size 426404 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset index 7202eba..0a1ef45 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fea19b08511ed881cac92581bfdd5069de678009555c1d072c5dbfe423aabc7a -size 934045 +oid sha256:5b986db431f559fecce3935bdb2277e9bd5a171434c129327cd2c52ad1bfc133 +size 931066 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Misc/Rotator.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Misc/Rotator.uasset index 8ef4d2a..98d6ff2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Misc/Rotator.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Misc/Rotator.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a73a922a3e8c6651a9338c16fb071fab3620521ee934e0d2ee5117d403aa1a1 -size 50905 +oid sha256:6efd7ef42524cefaf7c8cfde32ae1dfea44755b0707f3b5854dfa2ec4ff61291 +size 53208 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset index 00a7016..a46099e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2377dc436550e674d680dfaa303d2e8964cdf488d7c23d9a3549e904256fc7c3 -size 241334 +oid sha256:a1375663c126eafa014175e6f4875bfda8b3c6d95b904a3dac3b33b77e546290 +size 269778 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset index ddf673c..04fc645 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e22ef3b6c3dbb4b0e7de6e5fb158b3bee7a5592633a85baa8c328b1204e6bea5 -size 64580 +oid sha256:8edfebc2633d617b736deb98592d5a745e0898b9bd8b8948d889b1eba350fab4 +size 64516 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset index 22e0b9b..bd4f41a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c39b5d5851a1d0d47b6f6d5543ed6c499f856890a94102cd429cd2c4d66800fa -size 319918 +oid sha256:d10c4f2d56a97d1c2b015b5e663c53dc758b79b2a0c9735d0c6869d818a007cc +size 319915 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset index 6e978d8..a6f9fc0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:045e1240e36da7bc222b8cadf8cd2f0b445f1ef400b8c172ce0c43562bbed492 -size 615151 +oid sha256:0542e949b5963e88269a06ceb490600b05bdad3dd2c2b6b1ed623931ed37701a +size 615304 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset deleted file mode 100644 index 57a4c85..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3059bfe30a3df1fc9a59d052c6577c033a6a55931aa633be09e4c9a0598490c -size 622041 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset index 74e9281..709367a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0f3bb8fc4e50384a4522ab81ca9c87e07fe97ce7d427f6a6090f8f92b43d7b1 -size 130785 +oid sha256:2391a83fba46fd0b5fe1c06ffb439f65c242f64f354289fd38d3258996f3775f +size 148862 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset index da92cad..8ed3506 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cca5e3325672472ea7133ff58d35f25789c59d892573f10ebcdf3b6d6c39aa8 -size 127532 +oid sha256:20b336d81747be4f9419415b7e894a222d78f56d3f1c8fe7c753299f8c106730 +size 129949 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset index 2fbab29..525b34c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b351bfc43ce67d5568b9b43881593e18fd677493c2ab02f2d2c3f11b4a432ae -size 62645 +oid sha256:b35c3cfb8041432d224896a30453a33b410220e0f8aa6be53550fde8d36eda7c +size 66078 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset index 4a194f3..a241a95 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23966320a31cdcccae3658f353281233e1ecfabfbefc6de6ab50779fdd6bd21d -size 43198 +oid sha256:d4ac84d845865f14502e6c17ad27aec503111bd9d782ee0ab7f91c09f9a44d52 +size 44106 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset index 7902b30..3456113 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f2e5478f22c3c309d69fa3a0ac9d2bc19e6fc0783cda686528d42f6c170f46d -size 19643 +oid sha256:ac7ac0b6a2fe341694a35d0f8ae518f48e41a3edeaa0fa76bc873c857a9f1492 +size 20220 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset index e6a78c0..c642d49 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7489484a78c52ea4156cfa1fc61d31318024c8dc4ffa9bcbaa704d552b77e34b -size 590665 +oid sha256:2ca1aa980f143f66fbcf380e314c2680c5f2cb218b3d0892e967fcb9cc4f360e +size 795071 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_M_R_E_A.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_M_R_E_A.uasset index 0d378d5..446c265 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_M_R_E_A.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_M_R_E_A.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b53a4aec42c7ee216c9ab1e6fd665bdb8c07fe719e6040f367e773d3add0b649 -size 163855 +oid sha256:963e3771f85d4f26be125ec53077234175bae2a709f40bdcf9c618665208981d +size 168807 diff --git a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject index 679fa9d..0670cf6 100644 --- a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject +++ b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject @@ -124,6 +124,10 @@ { "Name": "DisasterRecoveryClient", "Enabled": true + }, + { + "Name": "GPULightmass", + "Enabled": true } ], "TargetPlatforms": [ From 36c47078da75c898120fd67e893292e7f87240bd Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 31 Oct 2025 17:00:01 +0100 Subject: [PATCH 51/56] Fixed Teleport Feet Positioning, Added Self closing to door, Baked new Door Variations --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Content/VRE/Core/Character/BP_Trace_Controller.uasset | 4 ++-- .../VRE/Grippables/Misc/Examples/Door/DoorActor.uasset | 4 ++-- .../Content/World/Characters/Clarice/BP_Clarice.uasset | 4 ++-- .../World/Interactibles/Bathroom/BP_ToiletStall.uasset | 4 ++-- .../Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset | 3 +++ .../World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset | 4 ++-- .../Bathroom/ToiletDoor/MI_ToiletDoor_ToiletOnly.uasset | 3 +++ .../Bathroom/ToiletDoor/MI_ToiletDoor_ToiletUrinal.uasset | 3 +++ .../Interactibles/Bathroom/ToiletDoor/M_ToiletDoor_WC.uasset | 3 +++ .../Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset | 4 ++-- .../Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletOnly.uasset | 3 +++ .../Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletUrinal.uasset | 3 +++ .../Interactibles/Bathroom/ToiletDoor/ToiletCabinDoor.uasset | 3 +++ .../World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset | 4 ++-- .../World/Interactibles/CardboardBoxes/BP_Cardboard.uasset | 4 ++-- 18 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletOnly.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletUrinal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor_WC.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletOnly.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletUrinal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ToiletCabinDoor.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap index 2ed30ac..89a20c5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd02b1fbdb1cfe159188c2b94e1645069399d9c7aa446f7fe06d6e39fb552a60 -size 110954 +oid sha256:b8b1461a2cd844e116a0c5e95fb704cda437e10ae85a5bc8b7e024972e6f447a +size 138418 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 09d722a..6c76392 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7be3b6e8649da302b1f350edab1e54f2a92466eba0ad8c8247cf83c523c7e0ac -size 591877 +oid sha256:640a85ca9c20cce75587b331a6040cc76109dfae34b50038ceb31280adc344ad +size 560853 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index d7d1157..7052d4d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c83bcd7d23b3e7cd02bb7b959a90120ef31241bee2da36812715d63e2326896 -size 224870 +oid sha256:f8e07b20a17a1fb6e8362dc7292c1bd17adf33b7d8a8c62d00ee54ecbdf79e8d +size 225020 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index c7cc476..232c137 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:634d3241663d85fc1703d63f7a7d7ad6e70d1255db93cac58aa0b448cf105194 -size 1898409 +oid sha256:d7efc0ec10b12509a8621b0339971fbc110e2da5e3283f3cf568c72770c48104 +size 1924781 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset index f1819e4..f06dc6c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3d1125030db3a7cd7bfd6bc86c5b994c9f66027e25a6ec7d8bbb34afe5dd340 -size 487554 +oid sha256:2e7265d377b2c0df2ff7f169679da4c43321508cea19d462897d68534a84859b +size 485315 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index 9b2c6d7..8d4288a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15f998a9f83b8071e0646de7e0acb6c691046fa4ee7e3090444951cd6bc80072 -size 713307 +oid sha256:93852e54cd27011e7daccd4d1d0a6c3a824160d0453e87349a8f3dd89b63ccec +size 716918 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset index a46099e..10251cd 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1375663c126eafa014175e6f4875bfda8b3c6d95b904a3dac3b33b77e546290 -size 269778 +oid sha256:2110a08919b3da15eb17c1ae3f64c4958a8be6914dec536f98c8dbbc793e9844 +size 291522 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset new file mode 100644 index 0000000..fb5cbe0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:312493f196285d93d2a19194344c943d53760583a460187a86c4f8379dadc776 +size 643239 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset index a6f9fc0..c7d4be6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0542e949b5963e88269a06ceb490600b05bdad3dd2c2b6b1ed623931ed37701a -size 615304 +oid sha256:e2ab544e7c0c9c952743705f167d09daa900f4ecbeb8663121c10064564e6ece +size 2552 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletOnly.uasset new file mode 100644 index 0000000..3091f62 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletOnly.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10ff2012ac8ca5aa5faca34c21a757fc966c879b5559689f3e90529f5fe8a6f7 +size 10815 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletUrinal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletUrinal.uasset new file mode 100644 index 0000000..7b70463 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletUrinal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f3565db57c84a391898a6dc43444e99fba8ad0ab01369aadc69109d6c68c877 +size 10822 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor_WC.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor_WC.uasset new file mode 100644 index 0000000..31797e1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor_WC.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc625299c6221662d8864fbc19b458d5b056f74948d37fcc602ca4419e1e3b60 +size 7483 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset index 4fe5415..4396a5d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8f99b9a3099a82d6bcb2af2983bcf3f601dde617939a6a136ea7d59c31eacd2 -size 7649622 +oid sha256:fa6c5dfa95ec7d53432489214e8665ddaae78c6d83c9c0922192203fc0f8e6be +size 1494 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletOnly.uasset new file mode 100644 index 0000000..03aeabd --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletOnly.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:145dcd221ebc9fcabcdb4ef5d102d0580c0cc3492b8eeabf6336aa1fb68d86ef +size 7655364 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletUrinal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletUrinal.uasset new file mode 100644 index 0000000..2d9491d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletUrinal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08af700c51177e1663188462a588441bc9d01520c6e105bd95ccce607dafb1db +size 7623946 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ToiletCabinDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ToiletCabinDoor.uasset new file mode 100644 index 0000000..0304b87 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ToiletCabinDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70e387b4863fc5811f8fb943a8825205fdf0f931f43960a695a490e03389063c +size 2607 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset index 709367a..a65ca74 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2391a83fba46fd0b5fe1c06ffb439f65c242f64f354289fd38d3258996f3775f -size 148862 +oid sha256:d912e8f640c27df661c1432cb2599ab951ae5fd9e6f3c5cb82f9f5cb5c4024b9 +size 149807 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset index 525b34c..05cbcf0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b35c3cfb8041432d224896a30453a33b410220e0f8aa6be53550fde8d36eda7c -size 66078 +oid sha256:dea07f7d6e8e364e75c899fab10f835e52d18c36cec84069d1c97d4d69bb645d +size 80060 From 421a6a026763299d9528f7e3e0e6ce5f2916cbd3 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Mon, 10 Nov 2025 12:16:37 +0100 Subject: [PATCH 52/56] Toilets, Clarice Animation (Lookup, Turns) --- .../Config/DefaultEngine.ini | 34 ++++++++++++------- .../Core/Interfaces/ClosedOverlap.uasset | 3 ++ .../ScifiDoor2/M_ScifiDoor2.uasset | 4 +-- .../Content/Development/Test.uasset | 3 ++ .../Content/Maps/Map_Bathrooms.umap | 4 +-- .../Content/Maps/Map_Gameworld.umap | 4 +-- .../Content/Maps/Map_Outside_Default.umap | 4 +-- .../Content/Maps/Map_Room_Kitchen.umap | 4 +-- .../Content/Maps/Map_Workspace.umap | 4 +-- .../Content/Maps/MotionControllerMap.umap | 4 +-- .../Content/Maps/SL_FreezeRoom.umap | 4 +-- .../Characters/Clarice/AnimBP_Clarice.uasset | 4 +-- .../Animations/Blendspace_Walk_Clarice.uasset | 4 +-- .../ClariceMain_LookUpStatic.uasset | 3 ++ .../Clarice/Animations/Idle_LookingUp.uasset | 3 ++ .../Clarice/Animations/Lookup.uasset | 3 ++ .../Clarice/Animations/RotateLeft.uasset | 3 ++ .../Animations/RotateLeftInPlace.uasset | 3 ++ .../RotateLeftInPlace_Montage.uasset | 3 ++ .../Animations/RotateRightInPlace.uasset | 3 ++ .../RotateRightInPlace_Montage.uasset | 3 ++ .../Clarice/Animations/Walk_01.uasset | 4 +-- .../Animations/Walk_01_LookingUp.uasset | 3 ++ .../Characters/Clarice/BP_Clarice.uasset | 4 +-- .../Clarice/ClariceMain_Skeleton.uasset | 4 +-- .../Characters/Clarice/ClosedOverlap.uasset | 4 +-- .../Characters/Clarice/EClariceVector.uasset | 3 ++ .../Bathroom/BP_StaffOnly.uasset | 3 ++ .../Bathroom/BP_ToiletStall.uasset | 4 +-- .../Bathroom/BP_ToiletStallLarge.uasset | 3 ++ .../HandcapHandle/BP_HandicapHandle.uasset | 3 ++ .../HandcapHandle/M_HandicapHandle.uasset | 3 ++ .../HandcapHandle/T_HandicapHandle_D.uasset | 3 ++ .../HandcapHandle/T_HandicapHandle_M_R.uasset | 3 ++ .../HandcapHandle/T_HandicapHandle_N.uasset | 3 ++ .../ToiletDoor/BP_ToiletCabinDoor.uasset | 4 +-- .../ToiletPaperRoll/BP_ToiletPaperRoll.uasset | 3 ++ .../ToiletPaperRoll/M_ToiletPaperRoll.uasset | 3 ++ .../ToiletPaperRoll/SM_ToiletPaperRoll.uasset | 3 ++ .../T_ToiletPaperRoll_D.uasset | 3 ++ .../T_ToiletPaperRoll_N.uasset | 3 ++ .../T_ToiletPaperRoll_R.uasset | 3 ++ .../CardboardBoxes/BP_Cardboard.uasset | 4 +-- .../Furniture/Kitchen/BP_Kitchen.uasset | 4 +-- .../HandcapHandle/Cylinder_002.uasset | 3 ++ .../HandcapHandle/HandicapHandle1.uasset | 3 ++ 46 files changed, 138 insertions(+), 49 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/ClosedOverlap.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/Test.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/ClariceMain_LookUpStatic.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle_LookingUp.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Lookup.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeft.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace_Montage.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace_Montage.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01_LookingUp.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/EClariceVector.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStallLarge.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/BP_HandicapHandle.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/M_HandicapHandle.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_M_R.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_N.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/BP_ToiletPaperRoll.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/M_ToiletPaperRoll.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/SM_ToiletPaperRoll.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_N.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_R.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/Cylinder_002.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/HandicapHandle1.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini index 1999a2c..1961395 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini @@ -108,14 +108,24 @@ r.RayTracing.RayTracingProxies.ProjectEnabled=True r.VirtualTexturedLightmaps=True [/Script/NavigationSystem.NavigationSystemV1] +DefaultAgentName=None +CrowdManagerClass=/Script/AIModule.CrowdManager bAutoCreateNavigationData=True +bSpawnNavDataInNavBoundsLevel=False bAllowClientSideNavigation=True +bShouldDiscardSubLevelNavData=True +bTickWhilePaused=False bInitialBuildingLocked=False bSkipAgentHeightCheckWhenPickingNavData=False -DataGatheringMode=Instant +GeometryExportTriangleCountWarningThreshold=200000 bGenerateNavigationOnlyAroundNavigationInvokers=False ActiveTilesUpdateInterval=1.000000 -DirtyAreasUpdateFreq=60.000000 +InvokersMaximumDistanceFromSeed=-1.000000 +DataGatheringMode=Instant +DirtyAreaWarningSizeThreshold=-1.000000 +GatheringNavModifiersWarningLimitTime=-1.000000 ++SupportedAgents=(Name="Default",Color=(B=0,G=75,R=38,A=164),DefaultQueryExtent=(X=50.000000,Y=50.000000,Z=250.000000),NavDataClass="/Script/NavigationSystem.RecastNavMesh",AgentRadius=3.000000,AgentHeight=4.000000,AgentStepHeight=4.000000,NavWalkingSearchHeightScale=0.500000,PreferredNavData="/Script/NavigationSystem.RecastNavMesh",bCanCrouch=False,bCanJump=True,bCanWalk=True,bCanSwim=False,bCanFly=False) +SupportedAgentsMask=(bSupportsAgent0=True,bSupportsAgent1=True,bSupportsAgent2=True,bSupportsAgent3=True,bSupportsAgent4=True,bSupportsAgent5=True,bSupportsAgent6=True,bSupportsAgent7=True,bSupportsAgent8=True,bSupportsAgent9=True,bSupportsAgent10=True,bSupportsAgent11=True,bSupportsAgent12=True,bSupportsAgent13=True,bSupportsAgent14=True,bSupportsAgent15=True) [/Script/Engine.UserInterfaceSettings] RenderFocusRule=NavigationOnly @@ -207,23 +217,21 @@ bDistinctlyDrawTilesBeingBuilt=True DrawOffset=10.000000 bFixedTilePoolSize=False TilePoolSize=1024 -TileSizeUU=990.000000 -CellSize=19.000000 -CellHeight=10.000000 -AgentMaxStepHeight=35.000000 -NavMeshResolutionParams[0]=(CellSize=15.000000,CellHeight=10.000000,AgentMaxStepHeight=35.000000) -NavMeshResolutionParams[1]=(CellSize=15.000000,CellHeight=10.000000,AgentMaxStepHeight=50.000000) -NavMeshResolutionParams[2]=(CellSize=15.000000,CellHeight=10.000000,AgentMaxStepHeight=35.000000) -AgentRadius=20.000000 -AgentHeight=144.000000 +TileSizeUU=544.000000 +NavMeshResolutionParams[0]=(CellSize=1.000000,CellHeight=1.000000,AgentMaxStepHeight=10.000000) +NavMeshResolutionParams[1]=(CellSize=1.000000,CellHeight=1.000000,AgentMaxStepHeight=10.000000) +NavMeshResolutionParams[2]=(CellSize=1.000000,CellHeight=1.000000,AgentMaxStepHeight=10.000000) +AgentRadius=5.000000 +AgentHeight=5.000000 AgentMaxSlope=44.000000 MinRegionArea=0.000000 -MergeRegionSize=400.000000 +MergeRegionSize=100.000000 MaxVerticalMergeError=2147483647 MaxSimplificationError=1.300000 SimplificationElevationRatio=0.000000 MaxSimultaneousTileGenerationJobsCount=1024 TileNumberHardLimit=1048576 +ExpectedMaxLayersPerTile=12 DefaultDrawDistance=5000.000000 DefaultMaxSearchNodes=2048.000000 DefaultMaxHierarchicalSearchNodes=2048.000000 @@ -250,7 +258,7 @@ TimeSliceFilterLedgeSpansMaxYProcess=13 TimeSliceLongDurationDebug=0.002000 InvokerTilePriorityBumpDistanceThresholdInTileUnits=1 InvokerTilePriorityBumpIncrease=1 -NavLinkJumpDownConfig=(bEnabled=True,JumpLength=150.000000,JumpDistanceFromEdge=10.000000,JumpMaxDepth=150.000000,JumpHeight=50.000000,JumpEndsHeightTolerance=80.000000,SamplingSeparationFactor=1.000000,FilterDistanceThreshold=80.000000,LinkBuilderFlags=1,AreaClass="/Script/CoreUObject.Class'/Script/NavigationSystem.NavArea_Default'",LinkProxyClass=None,LinkProxyId=(Id=0)) +NavLinkJumpDownConfig=(bEnabled=True,JumpLength=150.000000,JumpDistanceFromEdge=10.000000,JumpMaxDepth=150.000000,JumpHeight=50.000000,JumpEndsHeightTolerance=80.000000,SamplingSeparationFactor=1.000000,FilterDistanceThreshold=80.000000,LinkBuilderFlags=1,DownDirectionAreaClass="/Script/CoreUObject.Class'/Script/NavigationSystem.NavArea_Default'",UpDirectionAreaClass="/Script/CoreUObject.Class'/Script/NavigationSystem.NavArea_Default'",LinkProxyClass=None,LinkProxyId=(Id=0)) bUseVoxelCache=False TileSetUpdateInterval=1.000000 HeuristicScale=0.999000 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/ClosedOverlap.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/ClosedOverlap.uasset new file mode 100644 index 0000000..814b857 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/ClosedOverlap.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca09bfbfed6263b60b8c2e33c7a0d020d46902da5a6331b21c749b0ff06484f8 +size 11502 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/M_ScifiDoor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/M_ScifiDoor2.uasset index dd53427..909aea4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/M_ScifiDoor2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/M_ScifiDoor2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65c96870d20a2ad14545e58f7ab9da67657e6c346e8023ea3ca9f556f6654f9d -size 18619 +oid sha256:a62df52133c198ab19b5c295377f452367969388f405df995d72ab9d5b7f1aa0 +size 19319 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Test.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Test.uasset new file mode 100644 index 0000000..59bee12 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/Test.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9a2a239e1e994670a73268b261e6a75d923b467b42220591af7953649f3411d +size 13898 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap index 89a20c5..11e3225 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8b1461a2cd844e116a0c5e95fb704cda437e10ae85a5bc8b7e024972e6f447a -size 138418 +oid sha256:25801b2f59a53cdcd31771cf1f84a5a92e5dacb6f051812261e244a3807900a0 +size 139907 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 6c76392..174d097 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:640a85ca9c20cce75587b331a6040cc76109dfae34b50038ceb31280adc344ad -size 560853 +oid sha256:9143b46700fbb5ec028e2a0a8cd98eb3392130514f60be6be420b225c3736f96 +size 5219852 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index cc81c18..2ac4aed 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a20fc3dc3a682471c244078909dbd69e36fb8d98a9c6a518b6bb964af998c580 -size 1417955 +oid sha256:363edcee30bbe79ab3d3bd9e7d3e6307e117415fd9291145318f0e5054d4b07b +size 1422041 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index a32967b..faa2092 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ceebdf0446315e8f2b7eef12d3ef8485dfd4ce463ba44785a028fe009982cf73 -size 144122 +oid sha256:b49e5c73638e0819992d9a105c72d12582d42cb9306399ffa415a5ad2c90dcbd +size 113742 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap index 0b683de..5a4334c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b919f90743ebd58d85d2c25be3773b8b97faa3def89b1a05a098189922655b1 -size 135707 +oid sha256:1ab2684d7a7b92985716722480e685a9ae4cd37b11f03e3f283644f79d03e615 +size 128854 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index e0ccd13..57a62da 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56e305578476f434a71ae72d659016b9e40e5d79045d080cecf0d80575c7b326 -size 1732947 +oid sha256:421c5a46edf3659e0b5f37e6298518b603cde72da3739df1a2504531c50e49b5 +size 1218541 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 7052d4d..8b158de 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8e07b20a17a1fb6e8362dc7292c1bd17adf33b7d8a8c62d00ee54ecbdf79e8d -size 225020 +oid sha256:3042ed3c68d29a64875927b42caa7e0bb8a4d2125eb25165470c019b36987468 +size 224870 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 054e185..21455d9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eccaa82c6fc0d97229e8327430286f61625c0633bb9a64f3d64c44c4a42bed2c -size 539998 +oid sha256:f923e6eea49a05f212be0677df904e28e36409b62242351f07643f2108329e68 +size 580548 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Blendspace_Walk_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Blendspace_Walk_Clarice.uasset index fa64e00..d1f4f52 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Blendspace_Walk_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Blendspace_Walk_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dae71e4f110cbf29615d5388c9dcd3a4da4e934f7b6ee7a783224ba77606828e -size 8323 +oid sha256:b9bd61ffebfed877fa47f260617d7379ba6ec06deac4d029fc9592e3d1c656b4 +size 8213 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/ClariceMain_LookUpStatic.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/ClariceMain_LookUpStatic.uasset new file mode 100644 index 0000000..56b89f4 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/ClariceMain_LookUpStatic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab9b585c68dc389a3c5d9d95e4106d34fb24f39896f0e32d6a9a6bc093c24576 +size 39684 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle_LookingUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle_LookingUp.uasset new file mode 100644 index 0000000..c8a1017 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle_LookingUp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3a248474eb607276eb6391d87d83108c538b1ded30417919c90a938b7408bab +size 140742 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Lookup.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Lookup.uasset new file mode 100644 index 0000000..be22dcb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Lookup.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:966e06c2fc6d16157ef58662983ce39e7cfee3b42aa9e2730efa78d4a86e3a80 +size 144582 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeft.uasset new file mode 100644 index 0000000..f39279f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e28e6766396f7970aace631ba5ff5d8ce3eda781a792ee6eafd47ddeee5dcf4c +size 139222 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace.uasset new file mode 100644 index 0000000..dd1af26 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a5e2db52c2b49134257299e3e413b5d09034d9a0ba0f4733f5d476a2662084f +size 140766 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace_Montage.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace_Montage.uasset new file mode 100644 index 0000000..9e8f0be --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50b994221da2d01a23d8143af4bc5458c6f57c2ce9eeebc961c0b155ee07629a +size 9170 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace.uasset new file mode 100644 index 0000000..f0185fc --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cd52669bbfe66c0dd52bef635aee5fe68849830825c8b93bde3aeadc998dd9d +size 140643 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace_Montage.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace_Montage.uasset new file mode 100644 index 0000000..42b3f10 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83b59ab9224678f0b43283a9e8d58781be5f96fc585e468d2a528de22a08d0c2 +size 9113 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset index cd0dfbd..afd70b2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afaedc4823d7f3250285b905c00fe7e9e7b382a37ed76ab1bc0873a87541f55b -size 155146 +oid sha256:e8071aa711b58105ae473bd61e80cd42ba728ba9b7e799e4e0cb7e1c278f32ef +size 155988 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01_LookingUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01_LookingUp.uasset new file mode 100644 index 0000000..5a0276f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01_LookingUp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fdab81899b597b534539b43d4a8366d95e018711c7bdb03aa09a6fb04dd7c8f +size 143308 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index 8d4288a..282bcd9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93852e54cd27011e7daccd4d1d0a6c3a824160d0453e87349a8f3dd89b63ccec -size 716918 +oid sha256:58ea668bc6b5f6d7e59f7e8a014f0a99e969524f0a49e08c6773330e762953b3 +size 1040271 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset index 50d87ba..976c07d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98e00efad14f8108dcc22813eeab910d4c1a45955f829e0a7eb9b83b392aafdd -size 14387 +oid sha256:ece7c579905e1820887fe2494516ae28efdf93c21cc7b7785046187c246b8f8e +size 14429 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClosedOverlap.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClosedOverlap.uasset index 8e11fd6..e51b795 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClosedOverlap.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClosedOverlap.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a6d87d5678cef5d35cd36a8fff924fdb9964a6ef3a4978682027a3f1da83978 -size 10704 +oid sha256:549c44b7a4be8711635829d19382d1a4c2d14bdbc1b8e4efef3b1c67763bf427 +size 2296 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/EClariceVector.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/EClariceVector.uasset new file mode 100644 index 0000000..ed938c2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/EClariceVector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cad6ac802e6a7745eef1225be84e2ae771987af364ef74acc9a19ccec6e90549 +size 1900 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset new file mode 100644 index 0000000..f6ecb4d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ac94ec7ac4a399fc49fd62df88c7fb9b84e1839fbfe7a0cdaa648cdb261f0d9 +size 133769 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset index 10251cd..1e56113 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2110a08919b3da15eb17c1ae3f64c4958a8be6914dec536f98c8dbbc793e9844 -size 291522 +oid sha256:fe75c8b1840ac7f9d9fb537d5697805d647b691a4fd238766636c3417539b0bc +size 292800 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStallLarge.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStallLarge.uasset new file mode 100644 index 0000000..73a5ee0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStallLarge.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c254385314bb0e793656d5a01956788e26f711e44c2936d66d8a0b60191e0fe1 +size 71765 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/BP_HandicapHandle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/BP_HandicapHandle.uasset new file mode 100644 index 0000000..38df6e5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/BP_HandicapHandle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86272dfe4fec70703d9793f3ca8ffba08a038acec3c560a7880a3d75185b3fc5 +size 36953 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/M_HandicapHandle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/M_HandicapHandle.uasset new file mode 100644 index 0000000..df4ecde --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/M_HandicapHandle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b86b066f5be9df9bb418becc087eb440e260dd43d019b59ffdfdf01ee8c90f0 +size 14537 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_D.uasset new file mode 100644 index 0000000..ba85ab3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70a7dc91c27de46c9ba5582ea17d4f7d0e2b30c7e0f7828fa1f928fb86cd5d89 +size 78576 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_M_R.uasset new file mode 100644 index 0000000..6fd4193 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_M_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02eff0e604a667d0fa91de2b438bd979b3c2e4c5d22ca4107213dd0f324c2333 +size 760836 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_N.uasset new file mode 100644 index 0000000..e914ff3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:210a0b2e3437732df1b561a0d65e4b07d349297272ffb2d27fa84a36d340330e +size 17445785 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset index fb5cbe0..a973911 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:312493f196285d93d2a19194344c943d53760583a460187a86c4f8379dadc776 -size 643239 +oid sha256:ad08adf74190e015fb72e9a49296cbcc26b8f015fa639bddc3c38c4af4a38505 +size 638462 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/BP_ToiletPaperRoll.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/BP_ToiletPaperRoll.uasset new file mode 100644 index 0000000..ce74fe5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/BP_ToiletPaperRoll.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1df7d7423c42c84d1e31555a2dbc830fb73760a2b126971ae129d65d94f9a3ae +size 46258 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/M_ToiletPaperRoll.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/M_ToiletPaperRoll.uasset new file mode 100644 index 0000000..b71a5c0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/M_ToiletPaperRoll.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b40ee8720755f6b69e27234401d3032896f5266ffe118c6087a3a23102c744e3 +size 65223 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/SM_ToiletPaperRoll.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/SM_ToiletPaperRoll.uasset new file mode 100644 index 0000000..61c52d3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/SM_ToiletPaperRoll.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e0f0beee9f6f7df97d8c2c8cce8a9fee3d5c2303eacec4a6fc2f32795f8d6d6 +size 95764 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_D.uasset new file mode 100644 index 0000000..52b6f12 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74601bf2d5224b82c65de42d1f196c2d9e7890d02dbfcb33191df3c07f81c2e6 +size 23087135 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_N.uasset new file mode 100644 index 0000000..59218fa --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7cb4eb25a0aae56dac9a362cd75de0dfafa707c757d3e582152c53358d11088 +size 34021087 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_R.uasset new file mode 100644 index 0000000..749edff --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:069ec4b291dfdf59262c36cd55665fa5083dc4e67b18b5f834dd5d7a0671bbce +size 6608663 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset index 05cbcf0..3760a2b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dea07f7d6e8e364e75c899fab10f835e52d18c36cec84069d1c97d4d69bb645d -size 80060 +oid sha256:d09d41cf31a87479fecc70055fa9729a6bc6d1d676cc0640557c1f452a8fc087 +size 77858 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset index 0a4252d..6d11365 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dde107e89837dda660ef620b455bb2273fa39415498bec09c60bfbf9df76cb0 -size 229044 +oid sha256:b62d4976f9cb36980f2d6104489973277ae70b34979c6928b6d040900367f6d5 +size 226688 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/Cylinder_002.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/Cylinder_002.uasset new file mode 100644 index 0000000..d2d9e5e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/Cylinder_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70367f3f45256679ccd2681550f4b2cd1580872ac47f8fa2430c140227fb6cb0 +size 96068 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/HandicapHandle1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/HandicapHandle1.uasset new file mode 100644 index 0000000..97b02ad --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/HandicapHandle1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb6cc1b1dc68c69b6a3182acabd1248cae8ed6f8010378d0460ec18854f0233b +size 86928 From aef1a8278455252adea303bce25e7aca5eef7655 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 14 Nov 2025 17:02:09 +0100 Subject: [PATCH 53/56] Tests on running Gas to Liquid model simulation in niagara --- .../Content/Development/Gas_Volume/NS_GasMolecule.uasset | 3 +++ .../Development/Gas_Volume/NS_ViewRecycler_Ashes.uasset | 3 +++ .../Content/Development/Gas_Volume/NewNiagaraSystem1.uasset | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_ViewRecycler_Ashes.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NewNiagaraSystem1.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset new file mode 100644 index 0000000..128b634 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb2109ba1c65d51b617ba93c58d102d9fa966a256b0701dc03ed39dea89be46b +size 706084 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_ViewRecycler_Ashes.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_ViewRecycler_Ashes.uasset new file mode 100644 index 0000000..924ccdc --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_ViewRecycler_Ashes.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcdf2dd388bfff77f39db3a759e4dc7c1e3d1851b25878265856a0dbc4739143 +size 572705 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NewNiagaraSystem1.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NewNiagaraSystem1.uasset new file mode 100644 index 0000000..98a7d19 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NewNiagaraSystem1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c649229153e5baa38710c5816c863ef1f8ae8b11172c90af3d9729728de75df +size 376669 From 8a63902c061c5338ea944e8222e9097ae45d7c7b Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Thu, 20 Nov 2025 14:44:40 +0100 Subject: [PATCH 54/56] Worldbuilding, Start moving Clarice Logic to Behaviour Tree, Testing Gas Simulation in Niagara and learning Scratch Modules --- .../MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset | 4 ++-- .../TestSong/Molecules/M_SliceGameMolecules.uasset | 4 ++-- .../Content/Development/Gas_Volume/BP_GasSimulation.uasset | 3 +++ .../Content/Development/Gas_Volume/NS_GasMolecule.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Development/Test.uasset | 3 --- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap | 4 ++-- .../Content/Maps/MotionControllerMap.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset | 4 ++-- .../Weapons/Guns/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset | 4 ++-- .../Content/World/Characters/Clarice/AnimBP_Clarice.uasset | 4 ++-- .../Clarice/Animations/IdleLookAround_Montage.uasset | 3 +++ .../Content/World/Characters/Clarice/BP_Clarice.uasset | 4 ++-- .../World/Characters/Clarice/Clarice_BehaviorTree.uasset | 3 +++ .../World/Characters/Clarice/Clarice_BlackboardData.uasset | 3 +++ .../World/Characters/Clarice/Tasks/BTTask_FollowPlayer.uasset | 3 +++ .../World/Characters/Clarice/Tasks/BTTask_Random.uasset | 3 +++ .../Content/World/Characters/CustomAIController.uasset | 4 ++-- .../Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset | 4 ++-- .../Interactibles/Bathroom/Closet/BP_BathroomCloset.uasset | 3 +++ .../Interactibles/Bathroom/Closet/M_BathroomCloset.uasset | 3 +++ .../Interactibles/Bathroom/Closet/M_BathroomCloset_D.uasset | 3 +++ .../Interactibles/Bathroom/Closet/M_BathroomCloset_M_R.uasset | 3 +++ .../World/Interactibles/Bathroom/Closet/SM_Closet_Body.uasset | 3 +++ .../World/Interactibles/Bathroom/Closet/SM_Closet_Door.uasset | 3 +++ .../Interactibles/Bathroom/Closet/SM_Closet_Drawer.uasset | 3 +++ .../Bathroom/MovableBuckets/BP_MovableBucket.uasset | 3 +++ .../Bathroom/MovableBuckets/BézierCurve_001.uasset | 3 +++ .../Bathroom/MovableBuckets/MI_MovableBucket.uasset | 3 +++ .../Bathroom/MovableBuckets/M_MovableBucket.uasset | 3 +++ .../Bathroom/MovableBuckets/SM_MOvableBucket.uasset | 3 +++ .../Bathroom/MovableBuckets/SM_MovableBucket_Handle.uasset | 3 +++ .../Bathroom/MovableBuckets/SM_MovableBucket_Whell.uasset | 3 +++ .../Textures/MergedBake_Bake1_PBR_Diffuse.uasset | 3 +++ .../Textures/MergedBake_Bake1_PBR_Normal.uasset | 3 +++ .../Textures/MergedBake_Bake1_PBR_PackedTex.uasset | 3 +++ .../Bathroom/WetFloorSign/ABP_WetFloorSign.uasset | 3 +++ .../Bathroom/WetFloorSign/BP_WetFloorSign.uasset | 3 +++ .../Interactibles/Bathroom/WetFloorSign/M_WetFloorSign.uasset | 3 +++ .../Bathroom/WetFloorSign/PHYS_WetFloorSign.uasset | 3 +++ .../Bathroom/WetFloorSign/SKEL_WetFloorSign.uasset | 3 +++ .../Bathroom/WetFloorSign/SKM_WetFloorSign.uasset | 3 +++ .../Bathroom/WetFloorSign/Textures/T_WetFloorSign_D.uasset | 3 +++ .../Bathroom/WetFloorSign/Textures/T_WetFloorSign_M_R.uasset | 3 +++ .../Bathroom/WetFloorSign/Textures/T_WetFloorSign_N.uasset | 3 +++ 46 files changed, 122 insertions(+), 29 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/BP_GasSimulation.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Development/Test.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround_Montage.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BehaviorTree.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BlackboardData.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_FollowPlayer.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_Random.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/BP_BathroomCloset.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_M_R.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Body.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Door.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Drawer.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BP_MovableBucket.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BézierCurve_001.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/MI_MovableBucket.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/M_MovableBucket.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MOvableBucket.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Handle.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Whell.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_PackedTex.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/ABP_WetFloorSign.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/BP_WetFloorSign.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/M_WetFloorSign.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/PHYS_WetFloorSign.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKEL_WetFloorSign.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKM_WetFloorSign.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_D.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_M_R.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_N.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset index 43c41e3..398d609 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d43eb29c59459d8c2fbca1e9532e8f390406cb16ef6123183456f1da46342b1 -size 8684 +oid sha256:64efe83452097628aaa3c7c878c4e7b034b63a4519b80a41b21ffa3c7725aef9 +size 8458 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/M_SliceGameMolecules.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/M_SliceGameMolecules.uasset index 9039303..27fe1ae 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/M_SliceGameMolecules.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/M_SliceGameMolecules.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37540281ae02ecd2d57766c7cf9a21b0bbb56ec40e2b74f57b303c36c550df63 -size 19762 +oid sha256:a4e6c4a7fd3e596dd59af9db9f95a997fb7d84a2c0877d1225c788dd34a6f377 +size 19789 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/BP_GasSimulation.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/BP_GasSimulation.uasset new file mode 100644 index 0000000..1e1492c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/BP_GasSimulation.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd61996e84432b5330c09cdbc787570e9b9d79aeb2230f9bfa63ad4ef0523ff5 +size 188830 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset index 128b634..73af1b0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb2109ba1c65d51b617ba93c58d102d9fa966a256b0701dc03ed39dea89be46b -size 706084 +oid sha256:dd437421278119b256089f916247bc49c109dd871a341feacdbd499924ebb510 +size 1076452 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Test.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Test.uasset deleted file mode 100644 index 59bee12..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9a2a239e1e994670a73268b261e6a75d923b467b42220591af7953649f3411d -size 13898 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap index 11e3225..065ba4a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25801b2f59a53cdcd31771cf1f84a5a92e5dacb6f051812261e244a3807900a0 -size 139907 +oid sha256:a9c02c5551162f9bbf212899bc129f2714a074995cb78e0d5bd56e4eb7364976 +size 143723 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 174d097..5d4cc47 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9143b46700fbb5ec028e2a0a8cd98eb3392130514f60be6be420b225c3736f96 -size 5219852 +oid sha256:fde1912607584bc937fd78604b0a79cbf3763465ebc7b7ba398784b167f39fbb +size 5208597 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 5266cf2..5698820 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:823b4cb5769630afc4c7330eb153b6f5e1e4a000778ce2b8ce50265fea237b98 -size 65250 +oid sha256:6fc4231e5666e43e1a78ff5f3ca555e1f7333ebc74894d9338d3011177405c58 +size 135248 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index 57a62da..c42946f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:421c5a46edf3659e0b5f37e6298518b603cde72da3739df1a2504531c50e49b5 -size 1218541 +oid sha256:01b15fa00fbea596f2c8fafce00d867b39f926d289572eada8deb5a66b708c40 +size 8468527 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset index 5130b81..45b2608 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7b81f183f46579c81c55985bb00b837fb501ad9bb74dac995e514c4821dd509 -size 317038 +oid sha256:50270f45a413bd06272db4cfcaf884d17470a8fc28eff92b3f8b78f348a2c8b3 +size 317927 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset index e28638a..16b0992 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3341d663057a271a84a00e1a28615d826c51e56f77587611ccd149e5fee1a73c -size 6626 +oid sha256:dd9fc0ba8f32ac22023b6f92f3ad99bbb7c0a1cd196e576a7ad328cc8c5a4b85 +size 8902 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 21455d9..71ee76e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f923e6eea49a05f212be0677df904e28e36409b62242351f07643f2108329e68 -size 580548 +oid sha256:f63fc2d80dca0b2307c75bc7555e801568031ec172983737282e2746a5265bfd +size 580400 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround_Montage.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround_Montage.uasset new file mode 100644 index 0000000..b852c5a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cf970637e84f47f3b3fc6136fb8d7199c8d769d070d8ce96271e8cc403cf5c5 +size 8916 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index 282bcd9..c6a0f1c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58ea668bc6b5f6d7e59f7e8a014f0a99e969524f0a49e08c6773330e762953b3 -size 1040271 +oid sha256:d98d3c8627b57669e267f7edcc300fa5c6addcc3b9c08870de09ca94896577e1 +size 1111196 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BehaviorTree.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BehaviorTree.uasset new file mode 100644 index 0000000..4ffe90e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BehaviorTree.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1994623d1f43ec3f7ac6d46cd28222abb10e60b04fcfd94269ec7f503193193c +size 8813 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BlackboardData.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BlackboardData.uasset new file mode 100644 index 0000000..c6d9ae2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BlackboardData.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:096fc6e44b7c5069b633a34c9fa2e1aa0c573bdbf1c3828b318dc7448f29a315 +size 2472 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_FollowPlayer.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_FollowPlayer.uasset new file mode 100644 index 0000000..b47a37c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_FollowPlayer.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0ffc9f456249b4d416a922f23ea052cc022e18f9e7c04f690feab7711b2e954 +size 62799 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_Random.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_Random.uasset new file mode 100644 index 0000000..c423dcf --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_Random.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:661021ba346b5b034830e675406ab45334ba4a7fe0842ce2d30700cb4ef2213c +size 34728 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset index bc93cab..c1c2d69 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80c8e6539c5bd129308e3ce23174159c84d3739f15d6ab21d9c1c5c2d22c0694 -size 240592 +oid sha256:2d6883d566dc7dd29cfecab0b7f4ee7af476d78419efe0f1ce8ba19e59d01ab9 +size 244241 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset index f6ecb4d..1d121d2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ac94ec7ac4a399fc49fd62df88c7fb9b84e1839fbfe7a0cdaa648cdb261f0d9 -size 133769 +oid sha256:eacb8929ab71d9bfe07ff5cc51aa617405bac2acabdeb833c49508ed3058b782 +size 137677 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/BP_BathroomCloset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/BP_BathroomCloset.uasset new file mode 100644 index 0000000..a5b02d8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/BP_BathroomCloset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3e79e50a48ee1d43bb5b833d3ce6d3522ba824ca9867b2331634333f73673b6 +size 46869 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset.uasset new file mode 100644 index 0000000..e1cda90 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3d0fbd3c029ab128740cb1202871a7213344e83d4b7d5fb86002011172405ff +size 14106 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_D.uasset new file mode 100644 index 0000000..327f6f3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a3bc9b67a3cc42c5aa772323efd8dab8bde48d960ac7474335e90d6044ae4e2 +size 4261203 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_M_R.uasset new file mode 100644 index 0000000..1927132 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_M_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ca0c57e84918a319d48bcefdc9434216127760af07076cca188f84dcbd29873 +size 882580 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Body.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Body.uasset new file mode 100644 index 0000000..8219ae2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Body.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a462f041328a2e63531785587d6e379bce4b64dec130c8ff7f07da84783ff0fd +size 108422 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Door.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Door.uasset new file mode 100644 index 0000000..ae720ce --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Door.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1444c3af2622d571fe5cce8e304ad6d359c9b246480717b02db28559bde3893c +size 95618 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Drawer.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Drawer.uasset new file mode 100644 index 0000000..1cb5c47 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Drawer.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6de7c101fb909b265ac35f8f259fec6be33f07592fa893ed905345f391d73594 +size 99858 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BP_MovableBucket.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BP_MovableBucket.uasset new file mode 100644 index 0000000..abb02e6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BP_MovableBucket.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d7bec784b5d2235f4d0e2f72bcda8d0d261a7098fb7307670522d28c0f17ae4 +size 47261 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BézierCurve_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BézierCurve_001.uasset new file mode 100644 index 0000000..4aae404 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BézierCurve_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d7771437eaf6bbedba6b5deb0aef5fd6f05ec971b42355ec81ed0cf8c0c4789 +size 1689 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/MI_MovableBucket.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/MI_MovableBucket.uasset new file mode 100644 index 0000000..c5b995a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/MI_MovableBucket.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:352c19834d0699ea801bc9d81681b7a0e4d0de90e5f738e44a12b5d1f5b5254b +size 14106 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/M_MovableBucket.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/M_MovableBucket.uasset new file mode 100644 index 0000000..50990d0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/M_MovableBucket.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1004f96b3fe4426abfff8f134be6b4e00275d12c9778b9ea1513240e741c3a4f +size 22845 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MOvableBucket.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MOvableBucket.uasset new file mode 100644 index 0000000..4be8af5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MOvableBucket.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7973d41628a2993607b0fe08ce4dfb34a78e5028e3720bde6028f94313b8b5cb +size 300638 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Handle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Handle.uasset new file mode 100644 index 0000000..3d08cbe --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Handle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14cdfa2e3c2cdce7278f65fc226cf2f54e4baf7815423f74834b292614d8edba +size 128087 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Whell.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Whell.uasset new file mode 100644 index 0000000..820207d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Whell.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e38dfc0d95ee5c444cf0d6a5ccc2bcd774198349219b59f774bc5ff1aedba7c3 +size 81463 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..9b3b6d3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a30dbfadf9aed53d2a789912d2bff5f74778f569f8b437f16b6140b4162dd05 +size 11317554 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Normal.uasset new file mode 100644 index 0000000..868cc9d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7533695f1b573750a08ef42db512b601f2bf56522fd73d93c37b5ab59a0b64fa +size 62952811 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_PackedTex.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_PackedTex.uasset new file mode 100644 index 0000000..73aaf01 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_PackedTex.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d41f38523fbc82c56efa394b34d4c7e7bdf20c87c976003d3b2bed75bd3dc4bd +size 3564271 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/ABP_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/ABP_WetFloorSign.uasset new file mode 100644 index 0000000..3fc08cb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/ABP_WetFloorSign.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8a0bac8e72b4263fa9a453cea999c65b5a2da0b944d54e9646c1f5183844a92 +size 49644 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/BP_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/BP_WetFloorSign.uasset new file mode 100644 index 0000000..7c779b6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/BP_WetFloorSign.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5b873e33afe28a388a01b740e74ec65fc577a315a6b989f18ca6e99b447e8e1 +size 124398 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/M_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/M_WetFloorSign.uasset new file mode 100644 index 0000000..eb01104 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/M_WetFloorSign.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aac70cb39ae83a091ab2e1097e5e82425116d46d96956b34619d130f5af9c2a +size 15852 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/PHYS_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/PHYS_WetFloorSign.uasset new file mode 100644 index 0000000..50fb549 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/PHYS_WetFloorSign.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5c8a0cc9330bbb0d4bb310c565a21437439ae6e5d464d12e691ba89f9cb6806 +size 12933 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKEL_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKEL_WetFloorSign.uasset new file mode 100644 index 0000000..6111fb8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKEL_WetFloorSign.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cd2b8bdbb32ac09b6346f6a65b24e7b5f8c5d1022e31f1e08145b2d0eac8ab9 +size 8264 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKM_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKM_WetFloorSign.uasset new file mode 100644 index 0000000..6a51c1d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKM_WetFloorSign.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:002b7dc2d51d5b8f6f5ea5029469bda56febaa1e25c636b99bcacc15d8759d8e +size 127281 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_D.uasset new file mode 100644 index 0000000..3b60f1f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6367175e280dfd147c0aef14c0a0844730fbee73bd8865a01e22ecb6219e5891 +size 373606 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_M_R.uasset new file mode 100644 index 0000000..1b32c8a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_M_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:083cdc77a5bb32fd9a90c21f0d8f4a06e135565174dc13a7237d8c55e8640547 +size 1323627 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_N.uasset new file mode 100644 index 0000000..6946bad --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58e63a00ae85aff1372bb2a2478a4196982ccf8066cf22228dc20453cfd74cd8 +size 675551 From 1a64805d43d3f4e739886cb922b78007e5ae796a Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Thu, 20 Nov 2025 16:26:22 +0100 Subject: [PATCH 55/56] Up to Unreal 5.7 --- .gitmodules | 3 + VIRTUOS_ExpansionPluginTests/.vsconfig | 2 + .../Plugins/AdvancedSessions/.gitattributes | 2 - .../Plugins/AdvancedSessions/.gitignore | 10 - .../AdvancedSessions.uplugin | 4 +- .../Config/FilterPlugin.ini | 0 .../Plugins/AdvancedSessions/LICENSE.txt | 19 - .../Plugins/AdvancedSessions/README.md | 7 - .../Resources/Icon128.png | 0 .../AdvancedSessions.Build.cs | 3 + .../Classes/AdvancedExternalUILibrary.h | 0 .../Classes/AdvancedFriendsGameInstance.h | 17 + .../Classes/AdvancedFriendsInterface.h | 0 .../Classes/AdvancedFriendsLibrary.h | 0 .../Classes/AdvancedGameSession.h | 0 .../Classes/AdvancedIdentityLibrary.h | 0 .../Classes/AdvancedSessions.h | 0 .../Classes/AdvancedSessionsLibrary.h | 4 + .../Classes/AdvancedVoiceLibrary.h | 0 .../Classes/AutoLoginUserCallbackProxy.h | 0 .../Classes/BlueprintDataDefinitions.h | 0 .../Classes/CancelFindSessionsCallbackProxy.h | 0 .../CreateSessionCallbackProxyAdvanced.h | 4 +- .../Classes/EndSessionCallbackProxy.h | 0 .../Classes/FindFriendSessionCallbackProxy.h | 0 .../FindSessionsCallbackProxyAdvanced.h | 4 +- .../Classes/GetFriendsCallbackProxy.h | 0 .../Classes/GetRecentPlayersCallbackProxy.h | 0 .../Classes/GetUserPrivilegeCallbackProxy.h | 0 .../Classes/LoginUserCallbackProxy.h | 0 .../Classes/LogoutUserCallbackProxy.h | 0 .../Classes/OnlineSubSystemHeader.h | 0 .../Classes/SendFriendInviteCallbackProxy.h | 0 .../StartSessionCallbackProxyAdvanced.h | 0 .../UpdateSessionCallbackProxyAdvanced.h | 8 +- .../Private/AdvancedExternalUILibrary.cpp | 0 .../Private/AdvancedFriendsGameInstance.cpp | 73 ++ .../Private/AdvancedFriendsInterface.cpp | 0 .../Private/AdvancedFriendsLibrary.cpp | 3 + .../Private/AdvancedIdentityLibrary.cpp | 0 .../Private/AdvancedSessions.cpp | 0 .../Private/AdvancedSessionsLibrary.cpp | 11 + .../Private/AdvancedVoiceLibrary.cpp | 0 .../Private/AutoLoginUserCallbackProxy.cpp | 2 + .../CancelFindSessionsCallbackProxy.cpp | 0 .../CreateSessionCallbackProxyAdvanced.cpp | 8 +- .../Private/EndSessionCallbackProxy.cpp | 0 .../FindFriendSessionCallbackProxy.cpp | 8 + .../FindSessionsCallbackProxyAdvanced.cpp | 21 +- .../Private/GetFriendsCallbackProxy.cpp | 0 .../Private/GetRecentPlayersCallbackProxy.cpp | 0 .../Private/GetUserPrivilegeCallbackProxy.cpp | 0 .../Private/LoginUserCallbackProxy.cpp | 0 .../Private/LogoutUserCallbackProxy.cpp | 0 .../Private/SendFriendInviteCallbackProxy.cpp | 0 .../StartSessionCallbackProxyAdvanced.cpp | 0 .../UpdateSessionCallbackProxyAdvanced.cpp | 9 +- .../AdvancedSteamSessions.uplugin | 6 +- .../Config/FilterPlugin.ini | 0 .../Resources/Icon128.png | 0 .../AdvancedSteamSessions.Build.cs | 4 + .../Classes/AdvancedSteamFriendsLibrary.h | 6 +- .../Classes/AdvancedSteamSessions.h | 0 .../Classes/AdvancedSteamWorkshopLibrary.h | 0 .../Classes/SteamNotificationsSubsystem.h | 24 +- .../SteamRequestGroupOfficersCallbackProxy.h | 0 .../SteamWSRequestUGCDetailsCallbackProxy.h | 0 .../Private/AdvancedSteamFriendsLibrary.cpp | 22 +- .../Private/AdvancedSteamSessions.cpp | 0 .../Private/AdvancedSteamWorkshopLibrary.cpp | 0 ...SteamRequestGroupOfficersCallbackProxy.cpp | 0 .../SteamWSRequestUGCDetailsCallbackProxy.cpp | 0 .../Config/FilterPlugin.ini | 0 .../OpenXRExpansionPlugin.uplugin | 4 +- .../Resources/Icon128.png | 0 .../OpenXRExpansionEditor.Build.cs | 0 .../AnimGraphNode_ApplyOpenXRHandPose.cpp | 0 .../Private/OpenXRExpansionEditor.cpp | 0 .../AnimGraphNode_ApplyOpenXRHandPose.h | 0 .../Public/OpenXRExpansionEditor.h | 0 .../OpenXRExpansionPlugin.Build.cs | 0 .../Private/AnimNode_ApplyOpenXRHandPose.cpp | 0 .../OpenXRExpansionFunctionLibrary.cpp | 66 +- .../Private/OpenXRExpansionPlugin.cpp | 0 .../Private/OpenXRHandPoseComponent.cpp | 0 ...FBPXRSkeletalRepContainerNetSerializer.cpp | 340 ++++++++ .../Public/AnimNode_ApplyOpenXRHandPose.h | 0 .../Public/OpenXRExpansionFunctionLibrary.h | 2 +- .../Public/OpenXRExpansionPlugin.h | 0 .../Public/OpenXRExpansionTypes.h | 6 + .../Public/OpenXRHandPoseComponent.h | 0 .../FBPXRSkeletalRepContainerNetSerializer.h | 16 + VIRTUOS_ExpansionPluginTests/Plugins/SPUD | 2 +- .../Plugins/StevesUEHelpers | 2 +- .../Plugins/VRExpansionPlugin/.gitattributes | 2 - .../Plugins/VRExpansionPlugin/.gitignore | 10 - .../Config/FilterPlugin.ini | 0 .../Plugins/VRExpansionPlugin/LICENSE.txt | 19 - .../Plugins/VRExpansionPlugin/README.md | 48 -- .../Resources/Icon128.png | 0 .../Private/HandSocketComponentDetails.cpp | 0 .../Private/HandSocketVisualizer.cpp | 0 .../Private/VRExpansionEditor.cpp | 0 .../Private/VRGlobalSettingsDetails.cpp | 0 .../Public/HandSocketComponentDetails.h | 0 .../Public/HandSocketVisualizer.h | 0 .../Public/VRExpansionEditor.h | 0 .../Public/VRGlobalSettingsDetails.h | 0 .../VRExpansionEditor.Build.cs | 0 .../Private/CharacterMovementCompTypes.cpp | 0 .../Private/GripMotionControllerComponent.cpp | 73 +- .../Private/GripScripts/GS_Default.cpp | 0 .../Private/GripScripts/GS_GunTools.cpp | 0 .../GripScripts/GS_InteractibleSettings.cpp | 0 .../Private/GripScripts/GS_LerpToHand.cpp | 0 .../Private/GripScripts/GS_Melee.cpp | 0 .../Private/GripScripts/GS_Physics.cpp | 0 .../Private/GripScripts/VRGripScriptBase.cpp | 0 .../Private/Grippables/GrippableActor.cpp | 18 +- .../Grippables/GrippableBoxComponent.cpp | 2 +- .../Grippables/GrippableCapsuleComponent.cpp | 2 +- .../Private/Grippables/GrippableCharacter.cpp | 0 .../Private/Grippables/GrippableDataTypes.cpp | 7 +- .../GrippablePhysicsReplication.cpp | 61 +- .../Grippables/GrippableSkeletalMeshActor.cpp | 18 +- .../GrippableSkeletalMeshComponent.cpp | 2 +- .../Grippables/GrippableSphereComponent.cpp | 2 +- .../Grippables/GrippableStaticMeshActor.cpp | 18 +- .../GrippableStaticMeshComponent.cpp | 2 +- .../Grippables/HandSocketComponent.cpp | 0 .../Interactibles/VRButtonComponent.cpp | 0 .../Private/Interactibles/VRDialComponent.cpp | 4 +- .../VRInteractibleFunctionLibrary.cpp | 0 .../Interactibles/VRLeverComponent.cpp | 4 +- .../Interactibles/VRMountComponent.cpp | 4 +- .../Interactibles/VRSliderComponent.cpp | 4 +- .../Private/Misc/BucketUpdateSubsystem.cpp | 0 .../Private/Misc/CollisionIgnoreSubsystem.cpp | 0 .../Misc/OptionalRepSkeletalMeshActor.cpp | 0 .../Private/Misc/VRAIPerceptionOverrides.cpp | 0 .../Misc/VREPhysicalAnimationComponent.cpp | 0 .../Private/Misc/VRFullScreenUserWidget.cpp | 0 .../Private/Misc/VRGameViewportClient.cpp | 0 .../Private/Misc/VRLogComponent.cpp | 0 .../Private/Misc/VRPlayerStart.cpp | 0 .../Private/Misc/VRRenderTargetManager.cpp | 736 +++++++++++++++++- .../Private/Mover/VRMoverComponent.cpp | 2 +- .../ParentRelativeAttachmentComponent.cpp | 0 .../Private/ReplicatedVRCameraComponent.cpp | 0 ...FBPAdvGripPhysicsSettingsNetSerializer.cpp | 258 ++++++ .../FBPSecondaryGripInfoNetSerializer.cpp | 423 ++++++++++ .../FBPVRComponentPosRepNetSerializer.cpp | 277 +++++++ .../FRepMovementVRNetSerializer.cpp | 402 ++++++++++ .../FTransformNetQuantizeNetSerializer.cpp | 250 ++++++ .../Private/VRAIController.cpp | 0 .../Private/VRBPDatatypes.cpp | 0 .../Private/VRBaseCharacter.cpp | 449 ++++++++++- .../VRBaseCharacterMovementComponent.cpp | 0 .../VRExpansionPlugin/Private/VRCharacter.cpp | 0 .../Private/VRCharacterMovementComponent.cpp | 64 +- .../Private/VRExpansionFunctionLibrary.cpp | 0 .../Private/VRExpansionPlugin.cpp | 0 .../Private/VRExpansionPluginPrivatePCH.h | 0 .../Private/VRGestureComponent.cpp | 0 .../Private/VRGlobalSettings.cpp | 0 .../Private/VRGripInterface.cpp | 0 .../Private/VRPathFollowingComponent.cpp | 0 .../Private/VRPlayerController.cpp | 0 .../Private/VRRootComponent.cpp | 2 +- .../Private/VRStereoWidgetComponent.cpp | 11 +- .../Private/VRTrackedParentInterface.cpp | 0 .../Public/CharacterMovementCompTypes.h | 0 .../Public/GripMotionControllerComponent.h | 12 + .../Public/GripScripts/GS_Default.h | 0 .../Public/GripScripts/GS_GunTools.h | 0 .../GripScripts/GS_InteractibleSettings.h | 0 .../Public/GripScripts/GS_LerpToHand.h | 0 .../Public/GripScripts/GS_Melee.h | 0 .../Public/GripScripts/GS_Physics.h | 0 .../Public/GripScripts/VRGripScriptBase.h | 0 .../Public/Grippables/GrippableActor.h | 1 - .../Public/Grippables/GrippableBoxComponent.h | 0 .../Grippables/GrippableCapsuleComponent.h | 0 .../Public/Grippables/GrippableCharacter.h | 0 .../Public/Grippables/GrippableDataTypes.h | 6 +- .../Grippables/GrippablePhysicsReplication.h | 11 +- .../Grippables/GrippableSkeletalMeshActor.h | 2 +- .../GrippableSkeletalMeshComponent.h | 0 .../Grippables/GrippableSphereComponent.h | 0 .../Grippables/GrippableStaticMeshActor.h | 1 - .../Grippables/GrippableStaticMeshComponent.h | 0 .../Public/Grippables/HandSocketComponent.h | 0 .../Public/Interactibles/VRButtonComponent.h | 0 .../Public/Interactibles/VRDialComponent.h | 0 .../VRInteractibleFunctionLibrary.h | 0 .../Public/Interactibles/VRLeverComponent.h | 0 .../Public/Interactibles/VRMountComponent.h | 0 .../Public/Interactibles/VRSliderComponent.h | 0 .../Public/Misc/BucketUpdateSubsystem.h | 0 .../Public/Misc/CollisionIgnoreSubsystem.h | 0 .../Misc/OptionalRepSkeletalMeshActor.h | 0 .../Public/Misc/VRAIPerceptionOverrides.h | 0 .../Misc/VREPhysicalAnimationComponent.h | 0 .../Misc/VREPhysicsConstraintComponent.h | 0 .../Public/Misc/VRFullScreenUserWidget.h | 0 .../Public/Misc/VRGameViewportClient.h | 0 .../Public/Misc/VRLogComponent.h | 3 +- .../Public/Misc/VRPlayerStart.h | 0 .../Public/Misc/VRRenderTargetManager.h | 20 + .../Public/Misc/VRVehiclePawn.h | 0 .../Public/Misc/VRWheeledVehicle.h | 0 .../Public/Mover/VRMoverComponent.h | 2 +- .../ParentRelativeAttachmentComponent.h | 0 .../Public/ReplicatedVRCameraComponent.h | 0 .../FBPAdvGripPhysicsSettingsNetSerializer.h | 17 + .../FBPSecondaryGripInfoNetSerializer.h | 17 + .../FBPVRComponentPosRepNetSerializer.h | 17 + .../Serializers/FRepMovementVRNetSerializer.h | 17 + .../FTransformNetQuantizeNetSerializer.h | 26 + .../Public/Serializers/SerializerHelpers.h | 144 ++++ .../VRExpansionPlugin/Public/VRAIController.h | 0 .../VRExpansionPlugin/Public/VRBPDatatypes.h | 14 +- .../Public/VRBaseCharacter.h | 31 +- .../Public/VRBaseCharacterMovementComponent.h | 0 .../VRExpansionPlugin/Public/VRCharacter.h | 0 .../Public/VRCharacterMovementComponent.h | 0 .../Public/VRExpansionFunctionLibrary.h | 0 .../Public/VRExpansionPlugin.h | 0 .../Public/VRGestureComponent.h | 0 .../Public/VRGlobalSettings.h | 0 .../Public/VRGripInterface.h | 0 .../Public/VRPathFollowingComponent.h | 0 .../Public/VRPlayerController.h | 0 .../Public/VRRootComponent.h | 0 .../Public/VRStereoWidgetComponent.h | 0 .../Public/VRTrackedParentInterface.h | 0 .../VRExpansionPlugin.Build.cs | 0 .../VRExpansionPlugin.uplugin | 4 +- .../VRExpPluginExample.uproject | 2 +- 239 files changed, 3947 insertions(+), 296 deletions(-) delete mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitattributes delete mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitignore rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/AdvancedSessions.uplugin (94%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Config/FilterPlugin.ini (100%) delete mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/LICENSE.txt delete mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/README.md rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Resources/Icon128.png (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/AdvancedSessions.Build.cs (85%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h (86%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/AdvancedGameSession.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/AdvancedSessions.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h (97%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h (90%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h (96%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h (89%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp (79%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/AdvancedSessions.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp (94%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp (92%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp (94%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/{AdvancedSessions => }/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp (92%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/AdvancedSteamSessions.uplugin (90%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Config/FilterPlugin.ini (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Resources/Icon128.png (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs (85%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h (70%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp (93%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{AdvancedSessions => }/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Config/FilterPlugin.ini (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin (95%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Resources/Icon128.png (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/OpenXRExpansionEditor.Build.cs (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/AnimGraphNode_ApplyOpenXRHandPose.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/OpenXRExpansionEditor.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/AnimGraphNode_ApplyOpenXRHandPose.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/OpenXRExpansionEditor.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/AnimNode_ApplyOpenXRHandPose.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp (86%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionPlugin.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRHandPoseComponent.cpp (100%) create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/Serializers/FBPXRSkeletalRepContainerNetSerializer.cpp rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/AnimNode_ApplyOpenXRHandPose.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h (94%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionPlugin.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/{VRExpansionPlugin => }/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRHandPoseComponent.h (100%) create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/Serializers/FBPXRSkeletalRepContainerNetSerializer.h delete mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitattributes delete mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitignore rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Config/FilterPlugin.ini (100%) delete mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/LICENSE.txt delete mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/README.md rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Resources/Icon128.png (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionEditor/Private/HandSocketComponentDetails.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionEditor/Private/HandSocketVisualizer.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionEditor/Private/VRExpansionEditor.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionEditor/Private/VRGlobalSettingsDetails.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionEditor/Public/HandSocketComponentDetails.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionEditor/Public/HandSocketVisualizer.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionEditor/Public/VRExpansionEditor.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionEditor/Public/VRGlobalSettingsDetails.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionEditor/VRExpansionEditor.Build.cs (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/GripScripts/GS_Default.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/GripScripts/GS_GunTools.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/GripScripts/GS_InteractibleSettings.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/GripScripts/GS_LerpToHand.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/GripScripts/GS_Melee.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/GripScripts/GS_Physics.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/GripScripts/VRGripScriptBase.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/GrippableCharacter.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp (84%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp (97%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Interactibles/VRButtonComponent.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Interactibles/VRInteractibleFunctionLibrary.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Misc/BucketUpdateSubsystem.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Misc/CollisionIgnoreSubsystem.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Misc/VREPhysicalAnimationComponent.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Misc/VRFullScreenUserWidget.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Misc/VRLogComponent.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Misc/VRPlayerStart.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp (65%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/ParentRelativeAttachmentComponent.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp (100%) create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.cpp create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPSecondaryGripInfoNetSerializer.cpp create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPVRComponentPosRepNetSerializer.cpp create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FRepMovementVRNetSerializer.cpp create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FTransformNetQuantizeNetSerializer.cpp rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRAIController.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp (71%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRCharacter.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRExpansionPlugin.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRExpansionPluginPrivatePCH.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRGlobalSettings.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRGripInterface.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRPlayerController.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRRootComponent.cpp (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Private/VRTrackedParentInterface.cpp (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/CharacterMovementCompTypes.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/GripScripts/GS_Default.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/GripScripts/GS_GunTools.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/GripScripts/GS_InteractibleSettings.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/GripScripts/GS_LerpToHand.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/GripScripts/GS_Melee.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/GripScripts/GS_Physics.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/GripScripts/VRGripScriptBase.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/GrippableBoxComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/GrippableCapsuleComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/GrippableCharacter.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h (81%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h (96%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/GrippableSphereComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Interactibles/VRButtonComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Interactibles/VRDialComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Interactibles/VRInteractibleFunctionLibrary.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Interactibles/VRLeverComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Interactibles/VRMountComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Interactibles/VRSliderComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/BucketUpdateSubsystem.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/CollisionIgnoreSubsystem.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/OptionalRepSkeletalMeshActor.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/VRAIPerceptionOverrides.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/VREPhysicalAnimationComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/VREPhysicsConstraintComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/VRFullScreenUserWidget.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/VRPlayerStart.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h (95%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/ParentRelativeAttachmentComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/ReplicatedVRCameraComponent.h (100%) create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.h create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPSecondaryGripInfoNetSerializer.h create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPVRComponentPosRepNetSerializer.h create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FRepMovementVRNetSerializer.h create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FTransformNetQuantizeNetSerializer.h create mode 100644 VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/SerializerHelpers.h rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRAIController.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRBPDatatypes.h (99%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRBaseCharacter.h (98%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRBaseCharacterMovementComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRCharacter.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRCharacterMovementComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRExpansionPlugin.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRGestureComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRGlobalSettings.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRGripInterface.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRPathFollowingComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRPlayerController.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRRootComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/Public/VRTrackedParentInterface.h (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs (100%) rename VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/{VRExpansionPlugin => }/VRExpansionPlugin.uplugin (95%) diff --git a/.gitmodules b/.gitmodules index 91cdba4..b3f2b0c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers"] path = VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers url = https://github.com/sinbad/StevesUEHelpers +[submodule "VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin"] + path = VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin + url = https://github.com/mordentral/VRExpansionPlugin \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/.vsconfig b/VIRTUOS_ExpansionPluginTests/.vsconfig index 3b919ea..b981b2e 100644 --- a/VIRTUOS_ExpansionPluginTests/.vsconfig +++ b/VIRTUOS_ExpansionPluginTests/.vsconfig @@ -6,6 +6,8 @@ "Microsoft.Net.Component.4.6.2.TargetingPack", "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL", "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.x86.x64", "Microsoft.VisualStudio.Component.VC.Llvm.Clang", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.Windows11SDK.22621", diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitattributes b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitattributes deleted file mode 100644 index 3373152..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -* text=auto -*.bat eol=crlf \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitignore b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitignore deleted file mode 100644 index 3cdb673..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ - -.hg/ -binaries/ -deriveddatacache/ -.vs/ -build/ -intermediate/ -PACKPLUGIN/ -saved/ -*.orig \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions.uplugin similarity index 94% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions.uplugin index 7dc2e3a..6188c09 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions.uplugin @@ -1,8 +1,8 @@ { "FileVersion": 3, "FriendlyName": "Advanced Sessions", - "Version": 5.4, - "VersionName": "5.4", + "Version": 5.7, + "VersionName": "5.7", "Description": "Adds new blueprint functions to handle more advanced session operations.", "Category": "Advanced Sessions Plugin", "CreatedBy": "Joshua Statzer", diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Config/FilterPlugin.ini b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Config/FilterPlugin.ini similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Config/FilterPlugin.ini rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Config/FilterPlugin.ini diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/LICENSE.txt b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/LICENSE.txt deleted file mode 100644 index 986c999..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/LICENSE.txt +++ /dev/null @@ -1,19 +0,0 @@ -Copyright Joshua Statzer - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/README.md b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/README.md deleted file mode 100644 index c83724b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/README.md +++ /dev/null @@ -1,7 +0,0 @@ -### How do I use it? ### - -**KantanDocGen Automatic Documentation ([KantanDocGen](http://kantandev.com/free/kantan-doc-gen))** - -**[AdvancedSessions](https://vreue4.com/generated-node-documentation?section=advanced-sessions-plugin)** - -**[AdvancedSteamSessions](https://vreue4.com/generated-node-documentation?section=advanced-steam-sessions-plugin)** diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Resources/Icon128.png b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Resources/Icon128.png similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Resources/Icon128.png rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Resources/Icon128.png diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs similarity index 85% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs index a305151..bb02018 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs @@ -5,6 +5,9 @@ public class AdvancedSessions : ModuleRules { public AdvancedSessions(ReadOnlyTargetRules Target) : base(Target) { + DefaultBuildSettings = BuildSettingsVersion.Latest; + IncludeOrderVersion = EngineIncludeOrderVersion.Latest; + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; //bEnforceIWYU = true; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h similarity index 86% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h index be1def9..a0c0308 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h @@ -44,6 +44,16 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AdvancedVoiceInterface) bool bEnableTalkingStatusDelegate; + // If true we will auto join a session we have accepted in the overlay. + // This can get in the way of Beacon Sessions, you may want to disable it. + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AdvancedFriendsInterface) + bool bAutoJoinSessionOnAcceptedUserInviteReceived = false; + + // If true we will auto travel to a game session when an invite is received. + // This can get in the way of Beacon Sessions, you may want to disable it. + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AdvancedFriendsInterface) + bool bAutoTravelOnAcceptedUserInviteReceived = false; + //virtual void PostLoad() override; virtual void Shutdown() override; virtual void Init() override; @@ -52,6 +62,13 @@ public: FOnSessionInviteReceivedDelegate SessionInviteReceivedDelegate; FDelegateHandle SessionInviteReceivedDelegateHandle; + // custom handle to join directly from steam ui "Join Game" + FDelegateHandle OnJoinSessionCompleteDelegateHandle; + // custom Steam UI Join User function #Self invite# + void OnSessionUserInviteAccepted(const bool bWasSuccessful, const int32 ControllerId, FUniqueNetIdPtr UserId, const FOnlineSessionSearchResult& InviteResult); + // custom Steam UI function to client travel #Self invite# + void OnJoinSessionComplete(FName SessionName, EOnJoinSessionCompleteResult::Type Result); + //const FUniqueNetId& /*UserId*/, const FUniqueNetId& /*FromId*/, const FString& /*AppId*/, const FOnlineSessionSearchResult& /*InviteResult*/ void OnSessionInviteReceivedMaster(const FUniqueNetId & PersonInvited, const FUniqueNetId & PersonInviting, const FString & AppId, const FOnlineSessionSearchResult& SessionToJoin); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h similarity index 97% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h index 457bcdd..d7c53c2 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h @@ -160,6 +160,10 @@ public: UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID") static void GetUniqueNetID(APlayerController *PlayerController, FBPUniqueNetId &UniqueNetId); + // Get the unique net id of a network player attached to the given controller + UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID") + static void GetUniqueNetIdOfSessionOwner(FBlueprintSessionResult SessionResult, FBPUniqueNetId& UniqueNetId); + // Get the unique net id of a network player who is assigned the the given player state UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID") static void GetUniqueNetIDFromPlayerState(APlayerState *PlayerState, FBPUniqueNetId &UniqueNetId); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h similarity index 90% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h index 04ae6d1..448c587 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h @@ -23,14 +23,14 @@ class UCreateSessionCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase * Creates a session with the default online subsystem with advanced optional inputs, for dedicated servers leave UsePresence as false and set IsDedicatedServer to true. Dedicated servers don't use presence. * @param PublicConnections When doing a 'listen' server, this must be >=2 (ListenServer itself counts as a connection) * @param bUseLAN When you want to play LAN, the level to play on must be loaded with option 'bIsLanMatch' - * @param bUsePresence Must be true for a 'listen' server (Map must be loaded with option 'listen'), false for a 'dedicated' server. * @param bUseLobbiesIfAvailable Used to flag the subsystem to use a lobby api instead of general hosting if the API supports it, generally true on steam for listen servers and false for dedicated + * Must be true for a 'listen' server (Map must be loaded with option 'listen'), false for a 'dedicated' server. * @param bShouldAdvertise Set to true when the OnlineSubsystem should list your server when someone is searching for servers. Otherwise the server is hidden and only join via invite is possible. * @param bUseLobbiesVoiceChatIfAvailable Set to true to setup voice chat lobbies if the API supports it * @param bStartAfterCreate Set to true to start the session after it's created. If false you need to manually call StartSession when ready. */ UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject",AutoCreateRefTerm="ExtraSettings"), Category = "Online|AdvancedSessions") - static UCreateSessionCallbackProxyAdvanced* CreateAdvancedSession(UObject* WorldContextObject, const TArray& ExtraSettings, class APlayerController* PlayerController = NULL, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = true, bool bIsDedicatedServer = false, bool bUsePresence = true, bool bUseLobbiesIfAvailable = true, bool bAllowJoinViaPresence = true, bool bAllowJoinViaPresenceFriendsOnly = false, bool bAntiCheatProtected = false, bool bUsesStats = false, bool bShouldAdvertise = true, bool bUseLobbiesVoiceChatIfAvailable = false, bool bStartAfterCreate = true); + static UCreateSessionCallbackProxyAdvanced* CreateAdvancedSession(UObject* WorldContextObject, const TArray& ExtraSettings, class APlayerController* PlayerController = NULL, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = true, bool bIsDedicatedServer = false, /*bool bUsePresence = true,*/ bool bUseLobbiesIfAvailable = true, bool bAllowJoinViaPresence = true, bool bAllowJoinViaPresenceFriendsOnly = false, bool bAntiCheatProtected = false, bool bUsesStats = false, bool bShouldAdvertise = true, bool bUseLobbiesVoiceChatIfAvailable = false, bool bStartAfterCreate = true); // UOnlineBlueprintCallProxyBase interface virtual void Activate() override; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h similarity index 96% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h index e610277..5d225d8 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h @@ -28,7 +28,7 @@ class UFindSessionsCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase // Searches for advertised sessions with the default online subsystem and includes an array of filters UFUNCTION(BlueprintCallable, meta = (BlueprintInternalUseOnly = "true", WorldContext = "WorldContextObject", AutoCreateRefTerm="Filters"), Category = "Online|AdvancedSessions") - static UFindSessionsCallbackProxyAdvanced* FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int32 MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly = false, bool bNonEmptyServersOnly = false, bool bSecureServersOnly = false, bool bSearchLobbies = true, int MinSlotsAvailable = 0); + static UFindSessionsCallbackProxyAdvanced* FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int32 MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly = false, bool bNonEmptyServersOnly = false, bool bSecureServersOnly = false, /*bool bSearchLobbies = true,*/ int MinSlotsAvailable = 0); static bool CompareVariants(const FVariantData &A, const FVariantData &B, EOnlineComparisonOpRedux Comparator); @@ -99,7 +99,7 @@ private: bool bSecureServersOnly; // Search through lobbies - bool bSearchLobbies; + //bool bSearchLobbies; // Min slots requires to search int MinSlotsAvailable; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h similarity index 89% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h index afdc181..b45ccf3 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h @@ -21,7 +21,7 @@ class UUpdateSessionCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase // Creates a session with the default online subsystem with advanced optional inputs, you MUST fill in all categories or it will pass in values that you didn't want as default values UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject",AutoCreateRefTerm="ExtraSettings"), Category = "Online|AdvancedSessions") - static UUpdateSessionCallbackProxyAdvanced* UpdateSession(UObject* WorldContextObject, const TArray &ExtraSettings, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = false, bool bAllowJoinInProgress = false, bool bRefreshOnlineData = true, bool bIsDedicatedServer = false, bool bShouldAdvertise = true); + static UUpdateSessionCallbackProxyAdvanced* UpdateSession(UObject* WorldContextObject, const TArray &ExtraSettings, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = false, bool bAllowJoinInProgress = false, bool bRefreshOnlineData = true, bool bIsDedicatedServer = false, bool bShouldAdvertise = true, bool bAllowJoinViaPresence = true, bool bAllowJoinViaPresenceFriendsOnly = false); // UOnlineBlueprintCallProxyBase interface virtual void Activate() override; @@ -58,6 +58,12 @@ private: // Allow joining in progress bool bAllowJoinInProgress = true; + // Allow joining in progress + bool bAllowJoinViaPresence = true; + + // Allow joining in progress + bool bAllowJoinViaPresenceFriendsOnly = false; + // Update whether this is a dedicated server or not bool bDedicatedServer = false; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp similarity index 79% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp index 47afb6a..8ca29ee 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp @@ -20,6 +20,61 @@ UAdvancedFriendsGameInstance::UAdvancedFriendsGameInstance(const FObjectInitiali { } +void UAdvancedFriendsGameInstance::OnSessionUserInviteAccepted(const bool bWasSuccessful, const int32 ControllerId, FUniqueNetIdPtr UserId, const FOnlineSessionSearchResult& InviteResult) +{ + if (!bAutoJoinSessionOnAcceptedUserInviteReceived) + return; + + IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld()); + if (SessionInterface.IsValid()) + { + // Eventually call this?, would need another call back to run through + //SessionInterface->DestroySession(NAME_GameSession); + + SessionInterface->ClearOnJoinSessionCompleteDelegate_Handle(OnJoinSessionCompleteDelegateHandle); + OnJoinSessionCompleteDelegateHandle = SessionInterface->AddOnJoinSessionCompleteDelegate_Handle( + FOnJoinSessionCompleteDelegate::CreateUObject(this, &UAdvancedFriendsGameInstance::OnJoinSessionComplete)); + + // Temp for 5.5, they aren't filling in the struct correctly + if (!InviteResult.Session.SessionSettings.bIsDedicated) + { + FOnlineSessionSearchResult ModResult = InviteResult; + ModResult.Session.SessionSettings.bUsesPresence = true; + ModResult.Session.SessionSettings.bUseLobbiesIfAvailable = true; + SessionInterface->JoinSession(0, NAME_GameSession, ModResult); + } + else + { + SessionInterface->JoinSession(0, NAME_GameSession, InviteResult); + } + } + UE_LOG(AdvancedFriendsInterfaceLog, Log, TEXT("Called Join Session for Steam Friends List UI InviteResults: %s, UserId: %s"), *InviteResult.GetSessionIdStr(), *UserId->ToString()); +} + +void UAdvancedFriendsGameInstance::OnJoinSessionComplete(FName SessionName, EOnJoinSessionCompleteResult::Type Result) +{ + + // If we don't want to auto travel to the session instance then exit out + if (!bAutoTravelOnAcceptedUserInviteReceived) + { + return; + } + + IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld()); + if (SessionInterface.IsValid()) + { + FString ConnectInfo; + if (SessionInterface->GetResolvedConnectString(NAME_GameSession, ConnectInfo)) + { + APlayerController* PlayerController = GetFirstLocalPlayerController(); + if (PlayerController) + { + PlayerController->ClientTravel(ConnectInfo, ETravelType::TRAVEL_Absolute); + } + } + } +} + void UAdvancedFriendsGameInstance::Shutdown() { IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld()); @@ -34,6 +89,7 @@ void UAdvancedFriendsGameInstance::Shutdown() // Clear all of the delegate handles here SessionInterface->ClearOnSessionUserInviteAcceptedDelegate_Handle(SessionInviteAcceptedDelegateHandle); SessionInterface->ClearOnSessionInviteReceivedDelegate_Handle(SessionInviteReceivedDelegateHandle); + SessionInterface->ClearOnJoinSessionCompleteDelegate_Handle(OnJoinSessionCompleteDelegateHandle); } @@ -80,6 +136,9 @@ void UAdvancedFriendsGameInstance::Init() SessionInviteAcceptedDelegateHandle = SessionInterface->AddOnSessionUserInviteAcceptedDelegate_Handle(SessionInviteAcceptedDelegate); SessionInviteReceivedDelegateHandle = SessionInterface->AddOnSessionInviteReceivedDelegate_Handle(SessionInviteReceivedDelegate); + + // Custom steam join game delegate + SessionInterface->OnSessionUserInviteAcceptedDelegates.AddUObject(this, &UAdvancedFriendsGameInstance::OnSessionUserInviteAccepted); } else { @@ -271,6 +330,13 @@ void UAdvancedFriendsGameInstance::OnSessionInviteReceivedMaster(const FUniqueNe } } + // Temp for 5.5, they aren't filling in the struct correctly + if (!BluePrintResult.OnlineResult.Session.SessionSettings.bIsDedicated) + { + BluePrintResult.OnlineResult.Session.SessionSettings.bUsesPresence = true; + BluePrintResult.OnlineResult.Session.SessionSettings.bUseLobbiesIfAvailable = true; + } + OnSessionInviteReceived(LocalPlayer, PInviting, AppId, BluePrintResult); //IAdvancedFriendsInterface* TheInterface = NULL; @@ -307,6 +373,13 @@ void UAdvancedFriendsGameInstance::OnSessionInviteAcceptedMaster(const bool bWas FBPUniqueNetId PInvited; PInvited.SetUniqueNetId(PersonInvited); + // Temp for 5.5, they aren't filling in the struct correctly + if (!BluePrintResult.OnlineResult.Session.SessionSettings.bIsDedicated) + { + BluePrintResult.OnlineResult.Session.SessionSettings.bUsesPresence = true; + BluePrintResult.OnlineResult.Session.SessionSettings.bUseLobbiesIfAvailable = true; + } + OnSessionInviteAccepted(LocalPlayer,PInvited, BluePrintResult); APlayerController* Player = UGameplayStatics::GetPlayerController(GetWorld(), LocalPlayer); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp index 5df1a94..6bb7eac 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp @@ -151,7 +151,9 @@ void UAdvancedFriendsLibrary::GetFriend(APlayerController *PlayerController, con Friend.PresenceInfo.bIsPlaying = pres.bIsPlaying; Friend.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; Friend.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); + // #TODO: Check back in on this in shipping, epic is missing the UTF8_TO_TCHAR call on converting this and its making an invalid string + // OnlineFriendPresenceInterfaceSteam has the issue //Friend.PresenceInfo.StatusString = pres.Status.StatusStr; } } @@ -266,6 +268,7 @@ void UAdvancedFriendsLibrary::GetStoredFriendsList(APlayerController *PlayerCont BPF.PresenceInfo.bIsPlaying = pres.bIsPlaying; BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); // #TODO: Check back in on this in shipping, epic is missing the UTF8_TO_TCHAR call on converting this and its making an invalid string + // OnlineFriendPresenceInterfaceSteam has the issue //BPF.PresenceInfo.StatusString = pres.Status.StatusStr; BPF.PresenceInfo.bIsJoinable = pres.bIsJoinable; BPF.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp index a5453d1..dfb6fd7 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp @@ -451,6 +451,17 @@ void UAdvancedSessionsLibrary::GetUniqueNetID(APlayerController *PlayerControlle } } +void UAdvancedSessionsLibrary::GetUniqueNetIdOfSessionOwner(FBlueprintSessionResult SessionResult, FBPUniqueNetId& UniqueNetId) +{ + FBPUniqueNetId ReturnID; + if (SessionResult.OnlineResult.IsValid()) + { + ReturnID.SetUniqueNetId(SessionResult.OnlineResult.Session.OwningUserId); + } + + UniqueNetId = ReturnID; +} + void UAdvancedSessionsLibrary::GetUniqueNetIDFromPlayerState(APlayerState *PlayerState, FBPUniqueNetId &UniqueNetId) { if (!PlayerState) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp index 9046773..d61f902 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp @@ -83,6 +83,8 @@ void UAutoLoginUserCallbackProxy::OnCompleted(int32 LocalUserNum, bool bWasSucce { OnFailure.Broadcast(); } + + return; } OnFailure.Broadcast(); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp similarity index 94% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp index 1ff10c1..6b07bf1 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp @@ -13,7 +13,7 @@ UCreateSessionCallbackProxyAdvanced::UCreateSessionCallbackProxyAdvanced(const F { } -UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::CreateAdvancedSession(UObject* WorldContextObject, const TArray& ExtraSettings, class APlayerController* PlayerController, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bIsDedicatedServer, bool bUsePresence, bool bUseLobbiesIfAvailable, bool bAllowJoinViaPresence, bool bAllowJoinViaPresenceFriendsOnly, bool bAntiCheatProtected, bool bUsesStats, bool bShouldAdvertise, bool bUseLobbiesVoiceChatIfAvailable, bool bStartAfterCreate) +UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::CreateAdvancedSession(UObject* WorldContextObject, const TArray& ExtraSettings, class APlayerController* PlayerController, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bIsDedicatedServer, /*bool bUsePresence,*/ bool bUseLobbiesIfAvailable, bool bAllowJoinViaPresence, bool bAllowJoinViaPresenceFriendsOnly, bool bAntiCheatProtected, bool bUsesStats, bool bShouldAdvertise, bool bUseLobbiesVoiceChatIfAvailable, bool bStartAfterCreate) { UCreateSessionCallbackProxyAdvanced* Proxy = NewObject(); Proxy->PlayerControllerWeakPtr = PlayerController; @@ -24,7 +24,7 @@ UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::Create Proxy->bAllowInvites = bAllowInvites; Proxy->ExtraSettings = ExtraSettings; Proxy->bDedicatedServer = bIsDedicatedServer; - Proxy->bUsePresence = bUsePresence; + /*Proxy->bUsePresence = bUsePresence;*/ Proxy->bUseLobbiesIfAvailable = bUseLobbiesIfAvailable; Proxy->bAllowJoinViaPresence = bAllowJoinViaPresence; Proxy->bAllowJoinViaPresenceFriendsOnly = bAllowJoinViaPresenceFriendsOnly; @@ -61,13 +61,13 @@ void UCreateSessionCallbackProxyAdvanced::Activate() if (bDedicatedServer) { - Settings.bUsesPresence = false; Settings.bUseLobbiesIfAvailable = false; + Settings.bUsesPresence = false; } else { - Settings.bUsesPresence = bUsePresence; Settings.bUseLobbiesIfAvailable = bUseLobbiesIfAvailable; + Settings.bUsesPresence = bUseLobbiesIfAvailable; } Settings.bUseLobbiesVoiceChatIfAvailable = bUseLobbiesIfAvailable ? bUseLobbiesVoiceChatIfAvailable : false; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp similarity index 92% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp index 019255c..719bed9 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp @@ -102,6 +102,14 @@ void UFindFriendSessionCallbackProxy::OnFindFriendSessionCompleted(int32 LocalPl { FBlueprintSessionResult BSesh; BSesh.OnlineResult = Sesh; + + // Temp for 5.5, force the values if epic isn't setting them, lobbies should always have these true + if (!BSesh.OnlineResult.Session.SessionSettings.bIsDedicated) + { + BSesh.OnlineResult.Session.SessionSettings.bUseLobbiesIfAvailable = true; + BSesh.OnlineResult.Session.SessionSettings.bUsesPresence = true; + } + Result.Add(BSesh); } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp similarity index 94% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp index dc0dc4b..e031688 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp @@ -16,7 +16,7 @@ UFindSessionsCallbackProxyAdvanced::UFindSessionsCallbackProxyAdvanced(const FOb bIsOnSecondSearch = false; } -UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly, bool bNonEmptyServersOnly, bool bSecureServersOnly, bool bSearchLobbies, int MinSlotsAvailable) +UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly, bool bNonEmptyServersOnly, bool bSecureServersOnly, /*bool bSearchLobbies,*/ int MinSlotsAvailable) { UFindSessionsCallbackProxyAdvanced* Proxy = NewObject(); Proxy->PlayerControllerWeakPtr = PlayerController; @@ -28,7 +28,7 @@ UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSess Proxy->bEmptyServersOnly = bEmptyServersOnly, Proxy->bNonEmptyServersOnly = bNonEmptyServersOnly; Proxy->bSecureServersOnly = bSecureServersOnly; - Proxy->bSearchLobbies = bSearchLobbies; + //Proxy->bSearchLobbies = bSearchLobbies; Proxy->MinSlotsAvailable = MinSlotsAvailable; return Proxy; } @@ -86,7 +86,6 @@ void UFindSessionsCallbackProxyAdvanced::Activate() /** #define SEARCH_SWITCH_SELECTION_METHOD FName(TEXT("SWITCHSELECTIONMETHOD"))*/ /** Whether to use lobbies vs sessions */ /** #define SEARCH_LOBBIES FName(TEXT("LOBBYSEARCH"))*/ - if (bEmptyServersOnly) tem.Set(SEARCH_EMPTY_SERVERS_ONLY, true, EOnlineComparisonOp::Equals); @@ -114,9 +113,9 @@ void UFindSessionsCallbackProxyAdvanced::Activate() case EBPServerPresenceSearchType::ClientServersOnly: { - tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); + //tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); - if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM")) + //if (bSearchLobbies)// && !IOnlineSubsystem::DoesInstanceExist("STEAM")) tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals); } break; @@ -140,9 +139,9 @@ void UFindSessionsCallbackProxyAdvanced::Activate() FOnlineSearchSettingsEx DedicatedOnly = tem; - tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); + //tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); - if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM")) + //if (bSearchLobbies)// && !IOnlineSubsystem::DoesInstanceExist("STEAM")) tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals); //DedicatedOnly.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals); @@ -225,6 +224,14 @@ void UFindSessionsCallbackProxyAdvanced::OnCompleted(bool bSuccess) FBlueprintSessionResult BPResult; BPResult.OnlineResult = Result; + + // Temp for 5.5, force the values if epic isn't setting them, lobbies should always have these true + if (ServerSearchType != EBPServerPresenceSearchType::DedicatedServersOnly ) + { + BPResult.OnlineResult.Session.SessionSettings.bUseLobbiesIfAvailable = true; + BPResult.OnlineResult.Session.SessionSettings.bUsesPresence = true; + } + SessionSearchResults.AddUnique(BPResult); } if (!bRunSecondSearch) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp similarity index 92% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp index 31aa9d9..c105aa6 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp @@ -12,7 +12,7 @@ UUpdateSessionCallbackProxyAdvanced::UUpdateSessionCallbackProxyAdvanced(const F { } -UUpdateSessionCallbackProxyAdvanced* UUpdateSessionCallbackProxyAdvanced::UpdateSession(UObject* WorldContextObject, const TArray &ExtraSettings, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bAllowJoinInProgress, bool bRefreshOnlineData, bool bIsDedicatedServer, bool bShouldAdvertise) +UUpdateSessionCallbackProxyAdvanced* UUpdateSessionCallbackProxyAdvanced::UpdateSession(UObject* WorldContextObject, const TArray &ExtraSettings, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bAllowJoinInProgress, bool bRefreshOnlineData, bool bIsDedicatedServer, bool bShouldAdvertise, bool bAllowJoinViaPresence, bool bAllowJoinViaPresenceFriendsOnly) { UUpdateSessionCallbackProxyAdvanced* Proxy = NewObject(); Proxy->NumPublicConnections = PublicConnections; @@ -25,6 +25,8 @@ UUpdateSessionCallbackProxyAdvanced* UUpdateSessionCallbackProxyAdvanced::Update Proxy->bAllowJoinInProgress = bAllowJoinInProgress; Proxy->bDedicatedServer = bIsDedicatedServer; Proxy->bShouldAdvertise = bShouldAdvertise; + Proxy->bAllowJoinViaPresence = bAllowJoinViaPresence; + Proxy->bAllowJoinViaPresenceFriendsOnly = bAllowJoinViaPresenceFriendsOnly; return Proxy; } @@ -65,11 +67,14 @@ void UUpdateSessionCallbackProxyAdvanced::Activate() Settings->bAllowJoinInProgress = bAllowJoinInProgress; Settings->bIsLANMatch = bUseLAN; //Settings->bUsesPresence = true; - //Settings->bAllowJoinViaPresence = true; Settings->bAllowInvites = bAllowInvites; Settings->bAllowJoinInProgress = bAllowJoinInProgress; Settings->bIsDedicated = bDedicatedServer; + // Added in 5.6 + Settings->bAllowJoinViaPresence = bAllowJoinViaPresence; + Settings->bAllowJoinViaPresenceFriendsOnly = bAllowJoinViaPresenceFriendsOnly; + FOnlineSessionSetting * fSetting = NULL; FOnlineSessionSetting ExtraSetting; for (int i = 0; i < ExtraSettings.Num(); i++) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/AdvancedSteamSessions.uplugin similarity index 90% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/AdvancedSteamSessions.uplugin index 307c51e..71adae0 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/AdvancedSteamSessions.uplugin @@ -2,8 +2,8 @@ "FileVersion" : 3, "FriendlyName" : "Advanced Steam Sessions", - "Version" : 5.4, - "VersionName": "5.4", + "Version" : 5.7, + "VersionName": "5.7", "Description" : "Adds new blueprint functions to handle more advanced session operations in Steam. REQUIRES ADVANCED SESSIONS", "Category" : "Advanced Sessions Plugin", "CreatedBy" : "Joshua Statzer", @@ -14,7 +14,7 @@ { "Name": "AdvancedSteamSessions", "Type": "RunTime", - "LoadingPhase": "Default" + "LoadingPhase": "PostDefault" } ], "Plugins": [ diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Config/FilterPlugin.ini b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Config/FilterPlugin.ini similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Config/FilterPlugin.ini rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Config/FilterPlugin.ini diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Resources/Icon128.png b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Resources/Icon128.png similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Resources/Icon128.png rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Resources/Icon128.png diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs similarity index 85% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs index 6a4c768..db55501 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs @@ -5,6 +5,9 @@ public class AdvancedSteamSessions : ModuleRules { public AdvancedSteamSessions(ReadOnlyTargetRules Target) : base(Target) { + DefaultBuildSettings = BuildSettingsVersion.Latest; + IncludeOrderVersion = EngineIncludeOrderVersion.Latest; + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; //bEnforceIWYU = true; @@ -16,6 +19,7 @@ public class AdvancedSteamSessions : ModuleRules if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Linux) || (Target.Platform == UnrealTargetPlatform.Mac)) { PublicDependencyModuleNames.AddRange(new string[] { "SteamShared", "Steamworks", "OnlineSubsystemSteam" }); + AddEngineThirdPartyPrivateStaticDependencies(Target, "Steamworks"); //PublicIncludePaths.AddRange(new string[] { "../Plugins/Online/OnlineSubsystemSteam/Source/Private" });// This is dumb but it isn't very open } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h index 83de461..a0a7b8e 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h @@ -42,7 +42,7 @@ MSVC_PRAGMA(warning(pop)) #endif // USING_CODE_ANALYSIS #include -#include +//#include //#include #pragma pop_macro("ARRAY_COUNT") @@ -337,8 +337,8 @@ public: static bool RequestSteamFriendInfo(const FBPUniqueNetId UniqueNetId, bool bRequireNameOnly = false); // Opens the steam overlay to go to the specified user dialog - UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|SteamAPI") - static bool OpenSteamUserOverlay(const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType); + UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|SteamAPI", meta = (WorldContext = "WorldContextObject")) + static bool OpenSteamUserOverlay(UObject* WorldContextObject, const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType); // Returns if the steam overlay is currently active (this can return false during initial overlay hooking) UFUNCTION(BlueprintPure, Category = "Online|AdvancedFriends|SteamAPI") diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h similarity index 70% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h index 7b8641a..7b6948c 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h @@ -38,14 +38,27 @@ public: void Initialize(USteamNotificationsSubsystem* MyParent) { ParentSubsystem = MyParent; + +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED + OnExternalUITriggeredCallback.Register(this, &USteamNotificationsSubsystem::cSteamEventsStore::OnExternalUITriggered); +#endif + } + + void UnInitialize(USteamNotificationsSubsystem* MyParent) + { +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED + OnExternalUITriggeredCallback.Unregister(); +#endif } #if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED - cSteamEventsStore() : - OnExternalUITriggeredCallback(this, &cSteamEventsStore::OnExternalUITriggered) + cSteamEventsStore() + {} + //: + /*OnExternalUITriggeredCallback(this, &cSteamEventsStore::OnExternalUITriggered) { - } + }*/ #else //cSteamEventsStore() //{ @@ -57,7 +70,8 @@ public: private: #if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED - STEAM_CALLBACK(cSteamEventsStore, OnExternalUITriggered, GameOverlayActivated_t, OnExternalUITriggeredCallback); + //STEAM_CALLBACK(cSteamEventsStore, OnExternalUITriggered, GameOverlayActivated_t, OnExternalUITriggeredCallback); + STEAM_CALLBACK_MANUAL(cSteamEventsStore, OnExternalUITriggered, GameOverlayActivated_t, OnExternalUITriggeredCallback); #endif }; @@ -72,7 +86,7 @@ public: /** Implement this for deinitialization of instances of the system */ virtual void Deinitialize() override { - + MyEvents.UnInitialize(this); } }; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp similarity index 93% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp index 85340e4..ea38621 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp @@ -1,6 +1,11 @@ // Fill out your copyright notice in the Description page of Project Settings. #include "AdvancedSteamFriendsLibrary.h" #include "OnlineSubSystemHeader.h" +#include "OnlineSubsystemTypes.h" +#include "Engine/Texture.h" +#include "Engine/Texture2D.h" +#include "TextureResource.h" +#include "PixelFormat.h" //General Log DEFINE_LOG_CATEGORY(AdvancedSteamFriendsLog); @@ -233,7 +238,7 @@ bool UAdvancedSteamFriendsLibrary::RequestSteamFriendInfo(const FBPUniqueNetId U } -bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType) +bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(UObject* WorldContextObject,const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType) { #if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM) @@ -244,13 +249,24 @@ bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(const FBPUniqueNetId Uni if (SteamAPI_Init()) { - uint64 id = *((uint64*)UniqueNetId.UniqueNetId->GetBytes()); if (DialogType == ESteamUserOverlayType::invitetolobby) { - SteamFriends()->ActivateGameOverlayInviteDialog(id); + UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull); + IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(World); + if (SessionInterface.IsValid()) + { + FNamedOnlineSession* CurrentSession = SessionInterface->GetNamedSession(NAME_GameSession); + + if (CurrentSession && CurrentSession->SessionInfo->GetSessionId().IsValid()) + { + uint64 id = *((uint64*)CurrentSession->SessionInfo->GetSessionId().GetBytes()); + SteamFriends()->ActivateGameOverlayInviteDialog(id); + } + } } else { + uint64 id = *((uint64*)UniqueNetId.UniqueNetId->GetBytes()); FString DialogName = EnumToString("ESteamUserOverlayType", (uint8)DialogType); SteamFriends()->ActivateGameOverlayToUser(TCHAR_TO_ANSI(*DialogName), id); } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Config/FilterPlugin.ini b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Config/FilterPlugin.ini similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Config/FilterPlugin.ini rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Config/FilterPlugin.ini diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin similarity index 95% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin index f04ed51..2fa6a31 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin +++ b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, - "Version": 5.5, - "VersionName": "5.5", + "Version": 5.7, + "VersionName": "5.7", "FriendlyName": "OpenXRExpansionPlugin", "Description": "An set of utility functions for OpenXR", "Category": "Virtual Reality", diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Resources/Icon128.png b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Resources/Icon128.png similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Resources/Icon128.png rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Resources/Icon128.png diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/OpenXRExpansionEditor.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/OpenXRExpansionEditor.Build.cs similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/OpenXRExpansionEditor.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/OpenXRExpansionEditor.Build.cs diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/AnimGraphNode_ApplyOpenXRHandPose.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/AnimGraphNode_ApplyOpenXRHandPose.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/AnimGraphNode_ApplyOpenXRHandPose.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/AnimGraphNode_ApplyOpenXRHandPose.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/OpenXRExpansionEditor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/OpenXRExpansionEditor.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/OpenXRExpansionEditor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/OpenXRExpansionEditor.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/AnimGraphNode_ApplyOpenXRHandPose.h b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/AnimGraphNode_ApplyOpenXRHandPose.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/AnimGraphNode_ApplyOpenXRHandPose.h rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/AnimGraphNode_ApplyOpenXRHandPose.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/OpenXRExpansionEditor.h b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/OpenXRExpansionEditor.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/OpenXRExpansionEditor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/OpenXRExpansionEditor.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/AnimNode_ApplyOpenXRHandPose.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/AnimNode_ApplyOpenXRHandPose.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/AnimNode_ApplyOpenXRHandPose.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/AnimNode_ApplyOpenXRHandPose.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp similarity index 86% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp index 89c9aa1..604cf71 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp @@ -163,34 +163,40 @@ void UOpenXRExpansionFunctionLibrary::GetXRMotionControllerType(FString& Trackin bool UOpenXRExpansionFunctionLibrary::GetOpenXRHandPose(FBPOpenXRActionSkeletalData& HandPoseContainer, UOpenXRHandPoseComponent* HandPoseComponent, bool bGetMockUpPose) { - FXRMotionControllerData MotionControllerData; + FXRHandTrackingState HandTrackingData; + FXRMotionControllerState MotionControllerData; if (bGetMockUpPose) { - GetMockUpControllerData(MotionControllerData, HandPoseContainer); + // #TODO 5.7 TEST THIS + UHeadMountedDisplayFunctionLibrary::GetMotionControllerState((UObject*)HandPoseComponent, EXRSpaceType::UnrealWorldSpace, HandPoseContainer.TargetHand == EVRSkeletalHandIndex::EActionHandIndex_Left ? EControllerHand::Left : EControllerHand::Right, HandPoseContainer.PoseType, MotionControllerData); + GetMockUpControllerData(HandTrackingData,MotionControllerData, HandPoseContainer); return true; } - UHeadMountedDisplayFunctionLibrary::GetMotionControllerData((UObject*)HandPoseComponent, HandPoseContainer.TargetHand == EVRSkeletalHandIndex::EActionHandIndex_Left ? EControllerHand::Left : EControllerHand::Right, MotionControllerData); + UHeadMountedDisplayFunctionLibrary::GetHandTrackingState((UObject*)HandPoseComponent, EXRSpaceType::UnrealWorldSpace, HandPoseContainer.TargetHand == EVRSkeletalHandIndex::EActionHandIndex_Left ? EControllerHand::Left : EControllerHand::Right, HandTrackingData); - if (MotionControllerData.bValid) + if (HandTrackingData.bValid) { - HandPoseContainer.SkeletalTransforms.Empty(MotionControllerData.HandKeyPositions.Num()); + HandPoseContainer.SkeletalTransforms.Empty(HandTrackingData.HandKeyLocations.Num()); FTransform ParentTrans = FTransform::Identity; - if (MotionControllerData.DeviceVisualType == EXRVisualType::Controller) + + // #TODO: 5.7 Preview!! + // Might need to restore all of this, have to test with vive + /*if (MotionControllerData.DeviceVisualType == EXRVisualType::Controller) { ParentTrans = FTransform(MotionControllerData.GripRotation, MotionControllerData.GripPosition, FVector(1.f)); } - else // EXRVisualType::Hand visual type + else // EXRVisualType::Hand visual type*/ { - ParentTrans = FTransform(MotionControllerData.HandKeyRotations[(uint8)EHandKeypoint::Palm], MotionControllerData.HandKeyPositions[(uint8)EHandKeypoint::Palm], FVector(1.f)); + ParentTrans = FTransform(HandTrackingData.HandKeyRotations[(uint8)EHandKeypoint::Palm], HandTrackingData.HandKeyLocations[(uint8)EHandKeypoint::Palm], FVector(1.f)); } - for (int i = 0; i < MotionControllerData.HandKeyPositions.Num(); ++i) + for (int i = 0; i < HandTrackingData.HandKeyLocations.Num(); ++i) { // Convert to component space, we convert then to parent space later when applying it - HandPoseContainer.SkeletalTransforms.Add(FTransform(MotionControllerData.HandKeyRotations[i].GetNormalized(), MotionControllerData.HandKeyPositions[i], FVector(1.f)).GetRelativeTransform(ParentTrans)); + HandPoseContainer.SkeletalTransforms.Add(FTransform(HandTrackingData.HandKeyRotations[i].GetNormalized(), HandTrackingData.HandKeyLocations[i], FVector(1.f)).GetRelativeTransform(ParentTrans)); } //if (bGetCurlValues) @@ -233,31 +239,33 @@ bool UOpenXRExpansionFunctionLibrary::GetOpenXRFingerCurlValuesForHand( float& RingCurl, float& PinkyCurl) { - FXRMotionControllerData MotionControllerData; - UHeadMountedDisplayFunctionLibrary::GetMotionControllerData(WorldContextObject, TargetHand, MotionControllerData); + FXRHandTrackingState HandTrackingData; + UHeadMountedDisplayFunctionLibrary::GetHandTrackingState(WorldContextObject, EXRSpaceType::UnrealWorldSpace, TargetHand, HandTrackingData); // Fail if the count is too low - if (MotionControllerData.HandKeyPositions.Num() < EHandKeypointCount) + if (HandTrackingData.HandKeyLocations.Num() < EHandKeypointCount) return false; FTransform ParentTrans = FTransform::Identity; - if (MotionControllerData.DeviceVisualType == EXRVisualType::Controller) + // #TODO: 5.7 + // TEST THIS and restore if we need too + /*if (MotionControllerData.DeviceVisualType == EXRVisualType::Controller) { ParentTrans = FTransform(MotionControllerData.GripRotation, MotionControllerData.GripPosition, FVector(1.f)); } - else // EXRVisualType::Hand visual type + else // EXRVisualType::Hand visual type*/ { - ParentTrans = FTransform(MotionControllerData.HandKeyRotations[(uint8)EHandKeypoint::Palm], MotionControllerData.HandKeyPositions[(uint8)EHandKeypoint::Palm], FVector(1.f)); + ParentTrans = FTransform(HandTrackingData.HandKeyRotations[(uint8)EHandKeypoint::Palm], HandTrackingData.HandKeyLocations[(uint8)EHandKeypoint::Palm], FVector(1.f)); } TArray TransformArray; - TransformArray.AddUninitialized(MotionControllerData.HandKeyPositions.Num()); + TransformArray.AddUninitialized(HandTrackingData.HandKeyLocations.Num()); - for (int i = 0; i < MotionControllerData.HandKeyPositions.Num(); ++i) + for (int i = 0; i < HandTrackingData.HandKeyLocations.Num(); ++i) { // Convert to component space, we convert then to parent space later when applying it - TransformArray[i] = FTransform(MotionControllerData.HandKeyRotations[i].GetNormalized(), MotionControllerData.HandKeyPositions[i], FVector(1.f)).GetRelativeTransform(ParentTrans); + TransformArray[i] = FTransform(HandTrackingData.HandKeyRotations[i].GetNormalized(), HandTrackingData.HandKeyLocations[i], FVector(1.f)).GetRelativeTransform(ParentTrans); } ThumbCurl = GetCurlValueForBoneRoot(TransformArray, EHandKeypoint::ThumbMetacarpal); @@ -436,7 +444,7 @@ void UOpenXRExpansionFunctionLibrary::ConvertHandTransformsSpaceAndBack(TArray HandPositionsClosed = { // Closed palm - Left @@ -561,9 +569,9 @@ void UOpenXRExpansionFunctionLibrary::GetMockUpControllerData(FXRMotionControlle FVector(-1019.778f,-479.842f,203.819f) }; - MotionControllerData.HandKeyPositions = /*SkeletalMappingData.TargetHand != EVRSkeletalHandIndex::EActionHandIndex_Left ? HandPositionsOpen : */HandPositionsClosed; + HandTrackingData.HandKeyLocations = /*SkeletalMappingData.TargetHand != EVRSkeletalHandIndex::EActionHandIndex_Left ? HandPositionsOpen : */HandPositionsClosed; - if (SkeletalMappingData.TargetHand != EVRSkeletalHandIndex::EActionHandIndex_Left) + /*if (SkeletalMappingData.TargetHand != EVRSkeletalHandIndex::EActionHandIndex_Left) { MotionControllerData.GripPosition = FVector(-1018.305f, -478.019f, 209.872f); MotionControllerData.GripRotation = FQuat(-0.116352126f, 0.039430488f, -0.757644236f, 0.641001403f); @@ -572,15 +580,15 @@ void UOpenXRExpansionFunctionLibrary::GetMockUpControllerData(FXRMotionControlle { MotionControllerData.GripPosition = FVector(-1202.619f, -521.077f, 283.076f); MotionControllerData.GripRotation = FQuat(0.040843058f, 0.116659224f, 0.980030060f, -0.155767411f); - } - - MotionControllerData.DeviceName = TEXT("OpenXR"); + }*/ + HandTrackingData.DeviceName = TEXT("OpenXR"); + SkeletalMappingData.SkeletalTransforms.Empty(SkeletalMappingData.SkeletalTransforms.Num()); - FTransform ParentTrans = FTransform(MotionControllerData.GripRotation, MotionControllerData.GripPosition, FVector(1.f)); - for (int i = 0; i < MotionControllerData.HandKeyPositions.Num(); i++) + FTransform ParentTrans = FTransform(MotionControllerData.GripUnrealSpaceRotation, MotionControllerData.GripUnrealSpaceLocation, FVector(1.f)); + for (int i = 0; i < HandTrackingData.HandKeyLocations.Num(); i++) { - SkeletalMappingData.SkeletalTransforms.Add(FTransform(MotionControllerData.HandKeyRotations[i], MotionControllerData.HandKeyPositions[i], FVector(1.f)).GetRelativeTransform(ParentTrans)); + SkeletalMappingData.SkeletalTransforms.Add(FTransform(HandTrackingData.HandKeyRotations[i], HandTrackingData.HandKeyLocations[i], FVector(1.f)).GetRelativeTransform(ParentTrans)); } SkeletalMappingData.bHasValidData = (SkeletalMappingData.SkeletalTransforms.Num() == EHandKeypointCount); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionPlugin.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionPlugin.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionPlugin.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionPlugin.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRHandPoseComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRHandPoseComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRHandPoseComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRHandPoseComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/Serializers/FBPXRSkeletalRepContainerNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/Serializers/FBPXRSkeletalRepContainerNetSerializer.cpp new file mode 100644 index 0000000..f2d0688 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/Serializers/FBPXRSkeletalRepContainerNetSerializer.cpp @@ -0,0 +1,340 @@ +#include "Serializers/FBPXRSkeletalRepContainerNetSerializer.h" +#include "Iris/Serialization/NetSerializerDelegates.h" +#include "Iris/Serialization/NetSerializers.h" +#include "Iris/Serialization/PackedVectorNetSerializers.h" +#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" +#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" + +#include "OpenXRHandPoseComponent.h" + + +namespace UE::Net +{ + + // ----------------------------------------------------------------------------- + // Iris serializer for FBPXRSkeletalRepContainer + // ----------------------------------------------------------------------------- + struct FBPXRSkeletalRepContainerNetSerializer + { + inline static const FVectorNetQuantize100NetSerializerConfig Quantize100SerializerConfig; + + inline static const FNetSerializerConfig* VectorNetQuantizeNetSerializerConfig = &Quantize100SerializerConfig; + inline static const FNetSerializer* VectorNetQuantizeNetSerializer; + + class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates + { + public: + virtual ~FNetSerializerRegistryDelegates(); + + void InitNetSerializer() + { + FBPXRSkeletalRepContainerNetSerializer::VectorNetQuantizeNetSerializer = &UE_NET_GET_SERIALIZER(FVectorNetQuantize100NetSerializer); + } + + private: + virtual void OnPreFreezeNetSerializerRegistry() override; + //virtual void OnPostFreezeNetSerializerRegistry() override; + }; + + inline static FBPXRSkeletalRepContainerNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; + + + /** Version is required. */ + static constexpr uint32 Version = 0; + + struct alignas(8) FSkeletalTransformQuantizedData + { + uint64 Position[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it + uint16 Rotation[3]; + }; + + struct alignas(8) FBPXRSkeletalRepContainerQuantizedData + { + uint8 TargetHand; + uint8 bAllowDeformingMesh; + uint8 bEnableUE4HandRepSavings; + + uint16 ElementCount; + FSkeletalTransformQuantizedData SkeletalTransforms[EHandKeypointCount]; + // List of array data, we know the max elements so we can statically set it to that + // Technically should be -6 since we dont use some but im going to future proof it a bit here + }; + + typedef FBPXRSkeletalRepContainer SourceType; + typedef FBPXRSkeletalRepContainerQuantizedData QuantizedType; + typedef FBPXRSkeletalRepContainerNetSerializerConfig ConfigType; + inline static const ConfigType DefaultConfig; + + /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ + static constexpr bool bUseDefaultDelta = true; + + // Not using delta as this struct is sent on a timer and not changed incrementally + + + static constexpr uint32 ElementSizeBytes = sizeof(FSkeletalTransformQuantizedData); + + // Called to create a "quantized snapshot" of the struct + static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) + { + // Actually do the real quantization step here next instead of just in serialize, will save on memory overall + const SourceType& Source = *reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + Target.TargetHand = (uint8)Source.TargetHand; + Target.bAllowDeformingMesh = Source.bAllowDeformingMesh ? 1 : 0; + Target.bEnableUE4HandRepSavings = Source.bEnableUE4HandRepSavings ? 1 : 0; + + // Free data if non null + Target.ElementCount = 0; + + const uint32 Num = Source.SkeletalTransforms.Num(); + Target.ElementCount = static_cast(Num); + + if (Num > 0) + { + FRotator TargetRot; + FVector TargetLoc; + for (uint16 i = 0; i < Num; ++i) + { + TargetRot = Source.SkeletalTransforms[i].Rotator(); + TargetLoc = Source.SkeletalTransforms[i].GetLocation(); + + Target.SkeletalTransforms[i].Rotation[0] = FRotator::CompressAxisToShort(TargetRot.Pitch); + Target.SkeletalTransforms[i].Rotation[1] = FRotator::CompressAxisToShort(TargetRot.Yaw); + Target.SkeletalTransforms[i].Rotation[2] = FRotator::CompressAxisToShort(TargetRot.Roll); + + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetQuantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&TargetLoc); + MemberArgs.Target = NetSerializerValuePointer(&Target.SkeletalTransforms[i].Position[0]); + Serializer->Quantize(Context, MemberArgs); + } + } + } + + // Called to apply the quantized snapshot back to gameplay memory + static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.TargetHand = (EVRSkeletalHandIndex)Source.TargetHand; + Target.bAllowDeformingMesh = Source.bAllowDeformingMesh != 0; + Target.bEnableUE4HandRepSavings = Source.bEnableUE4HandRepSavings != 0; + + const uint16 Count = Source.ElementCount; + Target.SkeletalTransforms.Reset(); + if (Count > 0) + { + Target.SkeletalTransforms.AddUninitialized(Count); + + const FSkeletalTransformQuantizedData* Data = Source.SkeletalTransforms; + FRotator TargetRot; + FVector TargetLoc; + for (int i = 0; i < Count; ++i) + { + TargetRot.Pitch = FRotator::DecompressAxisFromShort(Data[i].Rotation[0]); + TargetRot.Yaw = FRotator::DecompressAxisFromShort(Data[i].Rotation[1]); + TargetRot.Roll = FRotator::DecompressAxisFromShort(Data[i].Rotation[2]); + TargetRot.Normalize(); + + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetDequantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&TargetLoc); + MemberArgs.Target = NetSerializerValuePointer(&Data[i].Position[0]); + Serializer->Dequantize(Context, MemberArgs); + + Target.SkeletalTransforms[i].SetComponents(TargetRot.Quaternion(), TargetLoc, FVector(1.0f)); + } + } + } + + // Serialize into bitstream + static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); + + // write header bytes (small fields) — do as bytes for compactness + Writer->WriteBits(Source.TargetHand, 8); + Writer->WriteBits(Source.bAllowDeformingMesh, 1); + Writer->WriteBits(Source.bEnableUE4HandRepSavings, 1); + + int32 BoneCountAdjustment = 6 + (Source.bEnableUE4HandRepSavings != 0 ? 4 : 0); + uint8 TransformCount = EHandKeypointCount - BoneCountAdjustment; + + bool bHasValidData = Source.ElementCount >= TransformCount; + + Writer->WriteBits(bHasValidData, 1); + + if (bHasValidData) + { + // write element count (16 bits) + uint32 ElemCount = Source.ElementCount; + + if (ElemCount < 1) + { + // Write nothing + ElemCount = 0; + } + + Writer->WriteBits(ElemCount, 16); + + const FSkeletalTransformQuantizedData* Data = Source.SkeletalTransforms; + for (uint16 i = 0; i < ElemCount; ++i) + { + if (Source.bAllowDeformingMesh) + { + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetSerializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Data[i].Position[0]); + Serializer->Serialize(Context, MemberArgs); + } + + Writer->WriteBits(Data[i].Rotation[0], 16); + Writer->WriteBits(Data[i].Rotation[1], 16); + Writer->WriteBits(Data[i].Rotation[2], 16); + } + } + } + + // Deserialize from bitstream + static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Target); + FNetBitStreamReader* Reader = Context.GetBitStreamReader(); + + // write header bytes (small fields) — do as bytes for compactness + + Target.TargetHand = Reader->ReadBits(8); + Target.bAllowDeformingMesh = Reader->ReadBits(1); + Target.bEnableUE4HandRepSavings = Reader->ReadBits(1); + + int32 BoneCountAdjustment = 6 + (Target.bEnableUE4HandRepSavings != 0 ? 4 : 0); + uint8 TransformCount = EHandKeypointCount - BoneCountAdjustment; + + bool bHasValidData = Reader->ReadBits(1) != 0; + + if (bHasValidData) + { + // write element count (16 bits) + uint32 ElemCount = Reader->ReadBits(16); + + Target.ElementCount = static_cast(ElemCount); + + if (ElemCount > 0) + { + FSkeletalTransformQuantizedData* Data = Target.SkeletalTransforms; + for (uint16 i = 0; i < ElemCount; ++i) + { + if (Target.bAllowDeformingMesh) + { + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetDeserializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Data[i].Position[0]); + Serializer->Deserialize(Context, MemberArgs); + } + + Data[i].Rotation[0] = Reader->ReadBits(16); + Data[i].Rotation[1] = Reader->ReadBits(16); + Data[i].Rotation[2] = Reader->ReadBits(16); + } + } + } + } + + + // Compare two instances to see if they differ + static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) + { + if (Args.bStateIsQuantized) + { + const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); + const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); + return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; + } + else + { + const SourceType& L = *reinterpret_cast(Args.Source0); + const SourceType& R = *reinterpret_cast(Args.Source1); + + + if (L.bAllowDeformingMesh != R.bAllowDeformingMesh) return false; + if (L.bEnableUE4HandRepSavings != R.bEnableUE4HandRepSavings) return false; + if (L.SkeletalTransforms.Num() != R.SkeletalTransforms.Num()) return false; + + // Using L num is valid as we already checked if they are the same count + return FPlatformMemory::Memcmp(L.SkeletalTransforms.GetData(), R.SkeletalTransforms.GetData(), sizeof(FTransform) * L.SkeletalTransforms.Num()) == 0; + } + } + + static void Apply(FNetSerializationContext& Context, const FNetApplyArgs& Args) + { + const SourceType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.bAllowDeformingMesh = Source.bAllowDeformingMesh; + Target.bEnableUE4HandRepSavings = Source.bEnableUE4HandRepSavings; + Target.TargetHand = Source.TargetHand; + + // Copys it over with new allocations + Target.SkeletalTransforms = Source.SkeletalTransforms; + } + + static void CloneDynamicState(FNetSerializationContext& Context, const FNetCloneDynamicStateArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + // copy small fields + Target.TargetHand = Source.TargetHand; + Target.bAllowDeformingMesh = Source.bAllowDeformingMesh; + Target.bEnableUE4HandRepSavings = Source.bEnableUE4HandRepSavings; + + // copy elements + Target.ElementCount = Source.ElementCount; + + const uint32 Count = Target.ElementCount; + if (Count > 0) + { + const SIZE_T Bytes = SIZE_T(Count) * ElementSizeBytes; + FMemory::Memcpy(Target.SkeletalTransforms, Source.SkeletalTransforms, Bytes); + } + } + + static void FreeDynamicState(FNetSerializationContext& Context, const FNetFreeDynamicStateArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Source); + Target.ElementCount = 0; + } + }; + + + static const FName PropertyNetSerializerRegistry_NAME_BPXRSkeletalRepContainer("BPXRSkeletalRepContainer"); + UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPXRSkeletalRepContainer, FBPXRSkeletalRepContainerNetSerializer); + + FBPXRSkeletalRepContainerNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() + { + UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPXRSkeletalRepContainer); + } + + void FBPXRSkeletalRepContainerNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() + { + InitNetSerializer(); + UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPXRSkeletalRepContainer); + } + + UE_NET_IMPLEMENT_SERIALIZER(FBPXRSkeletalRepContainerNetSerializer); +} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/AnimNode_ApplyOpenXRHandPose.h b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/AnimNode_ApplyOpenXRHandPose.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/AnimNode_ApplyOpenXRHandPose.h rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/AnimNode_ApplyOpenXRHandPose.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h similarity index 94% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h index dbac085..9caacc3 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h @@ -93,7 +93,7 @@ public: static void ConvertHandTransformsSpaceAndBack(TArray& OutTransforms, const TArray& WorldTransforms); UFUNCTION(BlueprintCallable, Category = "VRExpansionFunctions|OpenXR", meta = (bIgnoreSelf = "true")) - static void GetMockUpControllerData(FXRMotionControllerData& MotionControllerData, FBPOpenXRActionSkeletalData& SkeletalMappingData, bool bOpenHand = false); + static void GetMockUpControllerData(FXRHandTrackingState& HandTrackingData,FXRMotionControllerState& MotionControllerData, FBPOpenXRActionSkeletalData& SkeletalMappingData, bool bOpenHand = false); // Get a list of all currently tracked devices and their types, index in the array is their device index // Returns failed if the openXR query failed (no interaction profile yet or openXR is not running) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionPlugin.h b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionPlugin.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionPlugin.h rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionPlugin.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h index c064148..232de96 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "UObject/ObjectMacros.h" #include "Kismet/BlueprintFunctionLibrary.h" +#include "HeadMountedDisplayTypes.h" #include "Animation/BoneReference.h" #include "UObject/Object.h" #include "Engine/EngineTypes.h" @@ -97,6 +98,10 @@ public: UPROPERTY(EditAnywhere, NotReplicated, BlueprintReadWrite, Category = Default) EVRSkeletalHandIndex TargetHand; + // Used to select the type of pose to retrieve from OpenXR, default is grip but you will want to use Palm when using the palm source for motion controller + UPROPERTY(EditAnywhere, NotReplicated, BlueprintReadWrite, Category = Default) + EXRControllerPoseType PoseType; + // A world scale override that will replace the engines current value and force into the tracked data if non zero UPROPERTY(EditAnywhere, NotReplicated, BlueprintReadWrite, Category = Default) float WorldScaleOverride; @@ -144,6 +149,7 @@ public: bMirrorLeftRight = false; bEnableUE4HandRepSavings = false; TargetHand = EVRSkeletalHandIndex::EActionHandIndex_Right; + PoseType = EXRControllerPoseType::Grip; bHasValidData = false; LastHandGestureIndex = INDEX_NONE; LastHandGesture = NAME_None; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRHandPoseComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRHandPoseComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRHandPoseComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRHandPoseComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/Serializers/FBPXRSkeletalRepContainerNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/Serializers/FBPXRSkeletalRepContainerNetSerializer.h new file mode 100644 index 0000000..69d281a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/Serializers/FBPXRSkeletalRepContainerNetSerializer.h @@ -0,0 +1,16 @@ +#pragma once + +#include "Iris/Serialization/NetSerializer.h" +#include "FBPXRSkeletalRepContainerNetSerializer.generated.h" + +USTRUCT() +struct FBPXRSkeletalRepContainerNetSerializerConfig : public FNetSerializerConfig +{ + GENERATED_BODY() +}; + +namespace UE::Net +{ + UE_NET_DECLARE_SERIALIZER(FBPXRSkeletalRepContainerNetSerializer, OPENXREXPANSIONPLUGIN_API); + +} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/SPUD b/VIRTUOS_ExpansionPluginTests/Plugins/SPUD index 968fe10..57c25ee 160000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/SPUD +++ b/VIRTUOS_ExpansionPluginTests/Plugins/SPUD @@ -1 +1 @@ -Subproject commit 968fe10c9f08859c64ea88768d5216140fc340d9 +Subproject commit 57c25ee516342f3a4140ca52eb9025580a4f2fd8 diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers b/VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers index d6fbc18..5fe193d 160000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers +++ b/VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers @@ -1 +1 @@ -Subproject commit d6fbc18c862cc9d1e9c8418a16273a8562078403 +Subproject commit 5fe193da6208fbd9626559a66e332c5642496ab3 diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitattributes b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitattributes deleted file mode 100644 index 3373152..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -* text=auto -*.bat eol=crlf \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitignore b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitignore deleted file mode 100644 index 3cdb673..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ - -.hg/ -binaries/ -deriveddatacache/ -.vs/ -build/ -intermediate/ -PACKPLUGIN/ -saved/ -*.orig \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Config/FilterPlugin.ini b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Config/FilterPlugin.ini similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Config/FilterPlugin.ini rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Config/FilterPlugin.ini diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/LICENSE.txt b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/LICENSE.txt deleted file mode 100644 index 986c999..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/LICENSE.txt +++ /dev/null @@ -1,19 +0,0 @@ -Copyright Joshua Statzer - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/README.md b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/README.md deleted file mode 100644 index fa9c46f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/README.md +++ /dev/null @@ -1,48 +0,0 @@ -UE Forums Thread -https://forums.unrealengine.com/development-discussion/vr-ar-development/89050-vr-openvr-expansion-plugin - -Example Template Project -https://github.com/mordentral/VRExpPluginExample - -Website: -www.vreue4.com - -*** - -### Use Of This Plugin ### - -This Plugin is intended to add additional functionality to Open/SteamVR/(All VR now) in UE4. - -### Plugin Website ### -[VREUE4.com](https://vreue4.com) - -### How do I install it? ### - -https://vreue4.com/documentation?section=installation - -**Guides for migrating between different engine versions of the plugin:** - -View the patch notes at www.vreue4.com for migration guides as well. - -**Option 1:** - -Go to www.vreue4.com and downloaded the pre-built binary version for the engine version you are using (not updated with every daily change, only weekly or with large patches). - -Install it into your ProjectName/Plugins Directory (Engine level hasn't worked since 4.25 or so when it stopped letting me reference other plugins when compiling for that). - -**Option 2 (More up to date - preferred if possible):** - -* Clone Or Download Zip and extract this repository to a folder named "VRExpansionPlugin" in your "ProjectName/Plugins" directory, create this directory if it is missing. - -* Add the VRExpansionPlugin to your projects PublicDependencyModuleNames in the projects build.cs if you have c++ code included. - -* IF you do not have c++ code, use the Add New button in the editor and add a blank c++ class to your project. - -* Open up the generated project .SLN file and build the project from the build menu. - -You need to have visual studio installed and follow the UE4 setup guide for it: https://docs.unrealengine.com/latest/INT/Programming/Development/VisualStudioSetup/ - -### How do I use it? ### -### How do I VR? ### - -The template project contains use examples of most of the features of the plugin as well as locomotion modes, interaction methods, and basic multiplayer. diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Resources/Icon128.png b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Resources/Icon128.png similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Resources/Icon128.png rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Resources/Icon128.png diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketComponentDetails.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketComponentDetails.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketComponentDetails.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketComponentDetails.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketVisualizer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketVisualizer.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketVisualizer.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketVisualizer.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRExpansionEditor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRExpansionEditor.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRExpansionEditor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRExpansionEditor.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRGlobalSettingsDetails.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRGlobalSettingsDetails.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRGlobalSettingsDetails.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRGlobalSettingsDetails.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketComponentDetails.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketComponentDetails.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketComponentDetails.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketComponentDetails.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketVisualizer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketVisualizer.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketVisualizer.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketVisualizer.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRExpansionEditor.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRExpansionEditor.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRExpansionEditor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRExpansionEditor.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRGlobalSettingsDetails.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRGlobalSettingsDetails.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRGlobalSettingsDetails.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRGlobalSettingsDetails.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp index bfb4cfe..bc22d09 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp @@ -1257,6 +1257,55 @@ void UGripMotionControllerComponent::SetGripStiffnessAndDamping( } } +void UGripMotionControllerComponent::SetGripAdvancedGripSettings( + const FBPActorGripInformation& Grip, + EBPVRResultSwitch& Result, + uint8 GripPriority, + bool bSetOwnerOnGrip, + bool bDisallowLerping, + bool bDisallowSettingPositionOnClientAuthDrop +) +{ + Result = EBPVRResultSwitch::OnFailed; + int fIndex = GrippedObjects.Find(Grip); + + if (fIndex != INDEX_NONE) + { + GrippedObjects[fIndex].AdvancedGripSettings.GripPriority = GripPriority; + GrippedObjects[fIndex].AdvancedGripSettings.bSetOwnerOnGrip = bSetOwnerOnGrip; + GrippedObjects[fIndex].AdvancedGripSettings.bDisallowLerping = bDisallowLerping; + GrippedObjects[fIndex].AdvancedGripSettings.bDisallowSettingPositionOnClientAuthDrop = bDisallowSettingPositionOnClientAuthDrop; + + DIRTY_GRIPPED_OBJECTS(); + + Result = EBPVRResultSwitch::OnSucceeded; + } + else + { + fIndex = LocallyGrippedObjects.Find(Grip); + + if (fIndex != INDEX_NONE) + { + GrippedObjects[fIndex].AdvancedGripSettings.GripPriority = GripPriority; + GrippedObjects[fIndex].AdvancedGripSettings.bSetOwnerOnGrip = bSetOwnerOnGrip; + GrippedObjects[fIndex].AdvancedGripSettings.bDisallowLerping = bDisallowLerping; + GrippedObjects[fIndex].AdvancedGripSettings.bDisallowSettingPositionOnClientAuthDrop = bDisallowSettingPositionOnClientAuthDrop; + + if (IsLocallyControlled() && !IsServer() && !IsTornOff() && LocallyGrippedObjects[fIndex].GripMovementReplicationSetting == EGripMovementReplicationSettings::ClientSide_Authoritive) + { + FBPActorGripInformation GripInfo = LocallyGrippedObjects[fIndex]; + Server_NotifyLocalGripAddedOrChanged(GripInfo); + } + + DIRTY_LOCALLY_GRIPPED_OBJECTS(); + + Result = EBPVRResultSwitch::OnSucceeded; + } + } + + +} + FTransform UGripMotionControllerComponent::CreateGripRelativeAdditionTransform_BP( const FBPActorGripInformation &GripToSample, const FTransform & AdditionTransform, @@ -7976,7 +8025,17 @@ void UGripMotionControllerComponent::Server_NotifyLocalGripRemoved_Implementatio { if (IsValid(DroppingActor) && TransformAtDrop.IsValid()) { - DroppingActor->SetActorTransform(TransformAtDrop, false, nullptr, ETeleportType::None); + bool bSkipSetTransform = false; + if (DroppingActor->GetClass()->ImplementsInterface(UVRGripInterface::StaticClass())) + { + FBPAdvGripSettings AdvSettings = IVRGripInterface::Execute_AdvancedGripSettings(DroppingActor); + bSkipSetTransform = AdvSettings.bDisallowSettingPositionOnClientAuthDrop; + } + + if (!bSkipSetTransform) + { + DroppingActor->SetActorTransform(TransformAtDrop, false, nullptr, ETeleportType::None); + } } } }break; @@ -7986,7 +8045,17 @@ void UGripMotionControllerComponent::Server_NotifyLocalGripRemoved_Implementatio { if (IsValid(DroppingComp) && TransformAtDrop.IsValid()) { - DroppingComp->SetWorldTransform(TransformAtDrop, false, nullptr, ETeleportType::None); + bool bSkipSetTransform = false; + if (DroppingComp->GetClass()->ImplementsInterface(UVRGripInterface::StaticClass())) + { + FBPAdvGripSettings AdvSettings = IVRGripInterface::Execute_AdvancedGripSettings(DroppingComp); + bSkipSetTransform = AdvSettings.bDisallowSettingPositionOnClientAuthDrop; + } + + if (!bSkipSetTransform) + { + DroppingComp->SetWorldTransform(TransformAtDrop, false, nullptr, ETeleportType::None); + } } } }break; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Default.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Default.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Default.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Default.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_GunTools.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_GunTools.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_GunTools.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_GunTools.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_InteractibleSettings.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_InteractibleSettings.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_InteractibleSettings.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_InteractibleSettings.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_LerpToHand.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_LerpToHand.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_LerpToHand.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_LerpToHand.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Melee.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Melee.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Melee.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Melee.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Physics.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Physics.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Physics.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Physics.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/VRGripScriptBase.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/VRGripScriptBase.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/VRGripScriptBase.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/VRGripScriptBase.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp index 2fcaeff..205e30e 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp @@ -50,7 +50,7 @@ AGrippableActor::AGrippableActor(const FObjectInitializer& ObjectInitializer) // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = false; + bReplicateUsingRegisteredSubObjectList = true; // Setting a minimum of every 3rd frame (VR 90fps) for replication consideration // Otherwise we will get some massive slow downs if the replication is allowed to hit the 2 per second minimum default @@ -756,22 +756,6 @@ void AGrippableActor::BeginDestroy() GripLogicScripts.Empty(); } -void AGrippableActor::GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) -{ - Super::GetSubobjectsWithStableNamesForNetworking(ObjList); - - if (bReplicateGripScripts) - { - for (int32 i = 0; i < GripLogicScripts.Num(); ++i) - { - if (UObject* SubObject = GripLogicScripts[i]) - { - ObjList.Add(SubObject); - } - } - } -} - ///////////////////////////////////////////////// //- Push networking getter / setter functions ///////////////////////////////////////////////// diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp index ec8f05d..0a77bbb 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp @@ -44,7 +44,7 @@ UGrippableBoxComponent::UGrippableBoxComponent(const FObjectInitializer& ObjectI // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = false; + bReplicateUsingRegisteredSubObjectList = true; } void UGrippableBoxComponent::GetLifetimeReplicatedProps(TArray< class FLifetimeProperty > & OutLifetimeProps) const diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp index 9178cb5..937a80c 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp @@ -40,7 +40,7 @@ UGrippableCapsuleComponent::UGrippableCapsuleComponent(const FObjectInitializer& // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = false; + bReplicateUsingRegisteredSubObjectList = true; } void UGrippableCapsuleComponent::GetLifetimeReplicatedProps(TArray< class FLifetimeProperty > & OutLifetimeProps) const diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCharacter.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCharacter.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCharacter.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCharacter.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp similarity index 84% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp index c6be104..3fc573e 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp @@ -5,8 +5,7 @@ #include "GameFramework/Actor.h" - -bool FRepAttachmentWithWeld::NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess) +/*bool FRepAttachmentWithWeld::NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess) { // Our additional weld bit is here Ar.SerializeBits(&bIsWelded, 1); @@ -17,9 +16,9 @@ bool FRepAttachmentWithWeld::NetSerialize(FArchive& Ar, class UPackageMap* Map, Ar << AttachSocket; Ar << AttachComponent; return true; -} +}*/ FRepAttachmentWithWeld::FRepAttachmentWithWeld() { bIsWelded = false; -} \ No newline at end of file +} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp similarity index 97% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp index bf2a9d5..3c8abb9 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp @@ -48,6 +48,7 @@ namespace VRPhysicsReplicationStatics namespace RenderInterpolationCVars { bool bRenderInterpDebugDrawResimTrigger = false; + float RenderInterpDebugDrawResimBoxScale = 1.0f; } namespace PhysicsReplicationCVars @@ -81,6 +82,7 @@ namespace PhysicsReplicationCVars float VelStabilityMultiplier = 0.5f; float AngVelStabilityMultiplier = 0.5f; bool bDrawDebug = false; + float LogOutOfBoundsTimeLimit = 5.0f; // Inside of NetworkPhysicsComponent - UPDATE AS CHANGE int32 RedundantInputs = 2; @@ -92,6 +94,11 @@ namespace PhysicsReplicationCVars bool bCompareInputToTriggerRewind = false; bool bEnableUnreliableFlow = true; bool bEnableReliableFlow = false; + + bool bTriggerResimOnInputReceive = false; + bool bApplyInputDecayOverSetTime = false; + float InputDecaySetTime = 0.15f; + bool bApplyDataInsteadOfMergeData = false; bool bAllowInputExtrapolation = true; bool bValidateDataOnGameThread = false; @@ -542,12 +549,13 @@ bool FPhysicsReplicationVR::ApplyRigidBodyState(float DeltaSeconds, FBodyInstanc bool bCorrectConnectedBodiesFriction = CVarCorrectConnectedBodiesFriction->GetBool(); // Assign per-actor settings from NetworkPhysicSettingsComponent if this actor has one - if (SettingsCurrent.Get()) + if (SettingsCurrent.IsValid()) { - MaxLinearHardSnapDistance = SettingsCurrent.Get()->DefaultReplicationSettings.GetMaxLinearHardSnapDistance(MaxLinearHardSnapDistance); - bHardsnapLegacyInPT = SettingsCurrent.Get()->DefaultReplicationSettings.GetHardsnapDefaultLegacyInPT(); - bCorrectConnectedBodies = SettingsCurrent.Get()->DefaultReplicationSettings.GetCorrectConnectedBodies(); - bCorrectConnectedBodiesFriction = SettingsCurrent.Get()->DefaultReplicationSettings.GetCorrectConnectedBodiesFriction(); + const FNetworkPhysicsSettingsData& SettingsData = SettingsCurrent.Pin()->GetSettings(); + MaxLinearHardSnapDistance = SettingsData.DefaultReplicationSettings.GetMaxLinearHardSnapDistance(MaxLinearHardSnapDistance); + bHardsnapLegacyInPT = SettingsData.DefaultReplicationSettings.GetHardsnapDefaultLegacyInPT(); + bCorrectConnectedBodies = SettingsData.DefaultReplicationSettings.GetCorrectConnectedBodies(); + bCorrectConnectedBodiesFriction = SettingsData.DefaultReplicationSettings.GetCorrectConnectedBodiesFriction(); } // Get Current state @@ -1042,19 +1050,19 @@ void FPhysicsReplicationAsyncVR::OnPhysicsObjectUnregistered_Internal(Chaos::FCo ObjectToSettings.Remove(PhysicsObject); } -void FPhysicsReplicationAsyncVR::RegisterSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject, FNetworkPhysicsSettingsAsync InSettings) +void FPhysicsReplicationAsyncVR::RegisterSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject, TWeakPtr InSettings) { if (PhysicsObject != nullptr) { - FNetworkPhysicsSettingsAsync& Settings = ObjectToSettings.FindOrAdd(PhysicsObject); + TWeakPtr& Settings = ObjectToSettings.FindOrAdd(PhysicsObject); Settings = InSettings; } } void FPhysicsReplicationAsyncVR::FetchObjectSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject) { - FNetworkPhysicsSettingsAsync* CustomSettings = ObjectToSettings.Find(PhysicsObject); - SettingsCurrent = (CustomSettings != nullptr) ? *CustomSettings : SettingsDefault; + TWeakPtr* CustomSettings = ObjectToSettings.Find(PhysicsObject); + SettingsCurrent = (CustomSettings && (*CustomSettings).IsValid()) ? *(*CustomSettings).Pin().Get() : SettingsDefault; } void FPhysicsReplicationAsyncVR::OnPostInitialize_Internal() @@ -1080,6 +1088,8 @@ void FPhysicsReplicationAsyncVR::OnPreSimulate_Internal() Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); check(RigidsSolver); + ResimErrorLogTimer += RigidsSolver->GetAsyncDeltaTime(); + // Early out if this is a resim frame Chaos::FRewindData* RewindData = RigidsSolver->GetRewindData(); const bool bRewindDataExist = RewindData != nullptr; @@ -1215,7 +1225,7 @@ void FPhysicsReplicationAsyncVR::UpdateRewindDataTarget(const FPhysicsRepAsyncIn { // Cache all target states inside RewindData const int32 LocalFrame = Input.ServerFrame - *Input.FrameOffset; - RewindData->SetTargetStateAtFrame(*Handle, LocalFrame, Chaos::FFrameAndPhase::EParticleHistoryPhase::PostPushData, + RewindData->SetTargetStateAtFrame(*Handle, LocalFrame, Chaos::FFrameAndPhase::EParticleHistoryPhase::PrePushData, Input.TargetState.Position, Input.TargetState.Quaternion, Input.TargetState.LinVel, FMath::DegreesToRadians(Input.TargetState.AngVel), (Input.TargetState.Flags & ERigidBodyFlags::Sleeping)); } @@ -1565,8 +1575,28 @@ void FPhysicsReplicationAsyncVR::CheckTargetResimValidity(FReplicatedPhysicsTarg Target.RepMode = EPhysicsReplicationMode::PredictiveInterpolation; } - UE_LOG(LogPhysics, Warning, TEXT("FPhysicsReplication received target frame (%d) out of rewind data bounds (%d, %d) - %s - Target will use EPhysicsReplicationMode: %s"), - LocalFrame, RewindData->GetEarliestFrame_Internal(), RewindData->CurrentFrame(), (LocalFrame < RewindData->GetEarliestFrame_Internal()) ? TEXT("Client is far ahead of the server, server might be dropping frames.") : TEXT("Client is behind the server, client might be dropping frames."), *UEnum::GetValueAsString(Target.RepMode)); + if (ResimOutOfBoundsCounter == 0) + { + UE_LOG(LogPhysics, Warning, TEXT("FPhysicsReplication DESYNCED - received target frame (%d) out of rewind data bounds (%d, %d) - %s - Target will use %s") + , LocalFrame, RewindData->GetEarliestFrame_Internal(), RewindData->CurrentFrame() + , (LocalFrame < RewindData->GetEarliestFrame_Internal()) + ? TEXT("Client is far ahead of the server, server might be dropping frames.") + : TEXT("Client is behind the server, client might be dropping frames."), *UEnum::GetValueAsString(Target.RepMode)); + } + + ResimOutOfBoundsCounter++; + ResimErrorLogTimer = 0; + } + else + { + static const auto CVarLogOutOfBoundsTimeLimit = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.Resim.LogOutOfBoundsTimeLimit")); + + if (ResimOutOfBoundsCounter > 0 && ResimErrorLogTimer > CVarLogOutOfBoundsTimeLimit->GetFloat()) + { + UE_LOG(LogPhysics, Log, TEXT("FPhysicsReplication IN-SYNC - Received targets have now been within rewind data bounds again for at least %f seconds"), ResimErrorLogTimer); + + ResimOutOfBoundsCounter = 0; + } } } @@ -2429,7 +2459,7 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl const bool bShouldSleep = (Target.TargetState.Flags & ERigidBodyFlags::Sleeping) != 0; bool bClearTarget = true; - static constexpr Chaos::FFrameAndPhase::EParticleHistoryPhase RewindPhase = Chaos::FFrameAndPhase::EParticleHistoryPhase::PostPushData; + static constexpr Chaos::FFrameAndPhase::EParticleHistoryPhase RewindPhase = Chaos::FFrameAndPhase::EParticleHistoryPhase::PrePushData; // Get state from locally cached history for frame corresponding to received data const Chaos::FGeometryParticleState PastState = RewindData->GetPastStateAtFrame(*Handle, LocalFrame, RewindPhase); @@ -2515,12 +2545,15 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl static const auto CVarResimDrawDebug = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.Resim.DrawDebug")); static const auto CVarRenderInterpDebugDrawResimTrigger = IConsoleManager::Get().FindConsoleVariable(TEXT("p.RenderInterp.DebugDraw.ResimTrigger")); + static const auto CVarRenderInterpDebugDrawResimBoxScale = IConsoleManager::Get().FindConsoleVariable(TEXT("p.RenderInterp.DebugDraw.ResimBoxScale")); if (CVarResimDrawDebug->GetBool() || CVarRenderInterpDebugDrawResimTrigger->GetBool()) { if (bShouldTriggerResim) { FVector Box = CVarRenderInterpDebugDrawResimTrigger->GetBool() ? FVector(6, 3, 2) : FVector(40, 20, 10); - const float DrawThickness = CVarRenderInterpDebugDrawResimTrigger->GetBool() ? 0.5f : 1.5f; + Box *= CVarRenderInterpDebugDrawResimBoxScale->GetFloat(); + const float DrawThickness = (CVarRenderInterpDebugDrawResimTrigger->GetBool() ? 0.5f : 1.5f) * CVarRenderInterpDebugDrawResimBoxScale->GetFloat(); + static const auto CVarDebugdrawLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); if (CVarRenderInterpDebugDrawResimTrigger->GetBool()) // Resim debug draw extension for render interpolation diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp index 5e39bc3..50f32d9 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp @@ -152,7 +152,7 @@ AGrippableSkeletalMeshActor::AGrippableSkeletalMeshActor(const FObjectInitialize // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = false; + bReplicateUsingRegisteredSubObjectList = true; bAllowIgnoringAttachOnOwner = true; @@ -857,22 +857,6 @@ void AGrippableSkeletalMeshActor::BeginDestroy() GripLogicScripts.Empty(); } -void AGrippableSkeletalMeshActor::GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) -{ - Super::GetSubobjectsWithStableNamesForNetworking(ObjList); - - if (bReplicateGripScripts) - { - for (int32 i = 0; i < GripLogicScripts.Num(); ++i) - { - if (UObject* SubObject = GripLogicScripts[i]) - { - ObjList.Add(SubObject); - } - } - } -} - ///////////////////////////////////////////////// //- Push networking getter / setter functions ///////////////////////////////////////////////// diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp index 78f3fcd..1ac491b 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp @@ -41,7 +41,7 @@ UGrippableSkeletalMeshComponent::UGrippableSkeletalMeshComponent(const FObjectIn // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = false; + bReplicateUsingRegisteredSubObjectList = true; } void UGrippableSkeletalMeshComponent::GetLifetimeReplicatedProps(TArray< class FLifetimeProperty > & OutLifetimeProps) const diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp index 6fca280..4f6fca9 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp @@ -40,7 +40,7 @@ UGrippableSphereComponent::UGrippableSphereComponent(const FObjectInitializer& O // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = false; + bReplicateUsingRegisteredSubObjectList = true; } void UGrippableSphereComponent::GetLifetimeReplicatedProps(TArray< class FLifetimeProperty > & OutLifetimeProps) const diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp index 485ba79..111bca7 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp @@ -97,7 +97,7 @@ AGrippableStaticMeshActor::AGrippableStaticMeshActor(const FObjectInitializer& O // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = false; + bReplicateUsingRegisteredSubObjectList = true; bAllowIgnoringAttachOnOwner = true; @@ -801,22 +801,6 @@ void AGrippableStaticMeshActor::BeginDestroy() GripLogicScripts.Empty(); } -void AGrippableStaticMeshActor::GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) -{ - Super::GetSubobjectsWithStableNamesForNetworking(ObjList); - - if (bReplicateGripScripts) - { - for (int32 i = 0; i < GripLogicScripts.Num(); ++i) - { - if (UObject* SubObject = GripLogicScripts[i]) - { - ObjList.Add(SubObject); - } - } - } -} - ///////////////////////////////////////////////// //- Push networking getter / setter functions ///////////////////////////////////////////////// diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp index 1f6b0bc..5a25a56 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp @@ -39,7 +39,7 @@ UGrippableStaticMeshComponent::UGrippableStaticMeshComponent(const FObjectInitia // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = false; + bReplicateUsingRegisteredSubObjectList = true; } void UGrippableStaticMeshComponent::GetLifetimeReplicatedProps(TArray< class FLifetimeProperty > & OutLifetimeProps) const diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRButtonComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRButtonComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRButtonComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRButtonComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp index d6ec172..739365a 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp @@ -399,7 +399,9 @@ void UVRDialComponent::GetGripStiffnessAndDamping_Implementation(float &GripStif FBPAdvGripSettings UVRDialComponent::AdvancedGripSettings_Implementation() { - return FBPAdvGripSettings(GripPriority); + FBPAdvGripSettings GripSettings(GripPriority); + GripSettings.bDisallowSettingPositionOnClientAuthDrop = true; + return GripSettings; } float UVRDialComponent::GripBreakDistance_Implementation() diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRInteractibleFunctionLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRInteractibleFunctionLibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRInteractibleFunctionLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRInteractibleFunctionLibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp index 44ca29f..2dfff7e 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp @@ -541,7 +541,9 @@ void UVRLeverComponent::GetGripStiffnessAndDamping_Implementation(float &GripSti FBPAdvGripSettings UVRLeverComponent::AdvancedGripSettings_Implementation() { - return FBPAdvGripSettings(GripPriority); + FBPAdvGripSettings GripSettings(GripPriority); + GripSettings.bDisallowSettingPositionOnClientAuthDrop = true; + return GripSettings; } float UVRLeverComponent::GripBreakDistance_Implementation() diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp index 115e95a..3dde8ee 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp @@ -514,7 +514,9 @@ void UVRMountComponent::GetGripStiffnessAndDamping_Implementation(float &GripSti FBPAdvGripSettings UVRMountComponent::AdvancedGripSettings_Implementation() { - return FBPAdvGripSettings(GripPriority); + FBPAdvGripSettings GripSettings(GripPriority); + GripSettings.bDisallowSettingPositionOnClientAuthDrop = true; + return GripSettings; } float UVRMountComponent::GripBreakDistance_Implementation() diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp index acc881d..0e6d8a3 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp @@ -644,7 +644,9 @@ void UVRSliderComponent::GetGripStiffnessAndDamping_Implementation(float &GripSt FBPAdvGripSettings UVRSliderComponent::AdvancedGripSettings_Implementation() { - return FBPAdvGripSettings(GripPriority); + FBPAdvGripSettings GripSettings(GripPriority); + GripSettings.bDisallowSettingPositionOnClientAuthDrop = true; + return GripSettings; } float UVRSliderComponent::GripBreakDistance_Implementation() diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/BucketUpdateSubsystem.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/BucketUpdateSubsystem.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/BucketUpdateSubsystem.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/BucketUpdateSubsystem.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/CollisionIgnoreSubsystem.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/CollisionIgnoreSubsystem.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/CollisionIgnoreSubsystem.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/CollisionIgnoreSubsystem.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VREPhysicalAnimationComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VREPhysicalAnimationComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VREPhysicalAnimationComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VREPhysicalAnimationComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRFullScreenUserWidget.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRFullScreenUserWidget.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRFullScreenUserWidget.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRFullScreenUserWidget.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRLogComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRLogComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRLogComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRLogComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRPlayerStart.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRPlayerStart.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRPlayerStart.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRPlayerStart.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp similarity index 65% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp index 2bc26e8..f1bdf5b 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp @@ -25,6 +25,19 @@ #include "Materials/Material.h" #include "Net/UnrealNetwork.h" +// Iris +#include "Serializers/SerializerHelpers.h" +#include "Iris/Serialization/ObjectNetSerializer.h" +#include "Iris/Core/NetObjectReference.h" +#include "Iris/Serialization/NetSerializerDelegates.h" +#include "Iris/Serialization/NetSerializers.h" +#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" +#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" +#include "Templates/IsPODType.h" + +#include "Iris/Serialization/SoftObjectNetSerializers.h" +#include "Iris/Serialization/NetSerializerArrayStorage.h" + namespace RLE_Funcs { enum RLE_Flags @@ -1741,7 +1754,6 @@ bool FRenderManagerOperation::NetSerialize(FArchive& Ar, class UPackageMap* Map, { bOutSuccess = true; - Ar.SerializeIntPacked(OwnerID); Ar.SerializeBits(&OperationType, 3); @@ -1813,3 +1825,725 @@ bool FRenderManagerOperation::NetSerialize(FArchive& Ar, class UPackageMap* Map, return bOutSuccess; } + +// SERIALIZER SETUP FOR IRIS +namespace UE::Net +{ + struct alignas(8) FQuantizedRenderTargetTextureStoreData + { + uint32 Width; + uint32 Height; + uint32 bIsZipped; + + // I don't think people are going to go over the 512 default generally, and def shouldn't hit 2048 + // We'll accept the slightly larger memory usage as this isn't a common operation + //static constexpr uint32 MaxBlobStorage = 2048; + //, AllocationPolicies::TInlinedElementAllocationPolicy + typedef FNetSerializerArrayStorage DataStorage; + DataStorage Data; + }; +} + +template <> struct TIsPODType { enum { Value = true }; }; + +namespace UE::Net +{ + + // ----------------------------------------------------------------------------- + // Iris serializer for FBPVRReplicatedTextureStore + // ----------------------------------------------------------------------------- + struct FBPVRReplicatedTextureStoreNetSerializer + { + // Version is required. + static constexpr uint32 Version = 0; + + //Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. + static constexpr bool bUseDefaultDelta = true; + // Not doing delta, the majority of the time a single bit (bool) controls the serialization of the entirity + + static constexpr bool bHasDynamicState = true; + + class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates + { + public: + virtual ~FNetSerializerRegistryDelegates(); + + private: + virtual void OnPreFreezeNetSerializerRegistry() override; + //virtual void OnPostFreezeNetSerializerRegistry() override; + }; + + inline static FBPVRReplicatedTextureStoreNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; + + typedef FBPVRReplicatedTextureStore SourceType; + typedef FQuantizedRenderTargetTextureStoreData QuantizedType; + typedef FBPVRReplicatedTextureStoreSerializerConfig ConfigType; + inline static const ConfigType DefaultConfig; + + // Called to create a "quantized snapshot" of the struct + static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) + { + // Actually do the real quantization step here next instead of just in serialize, will save on memory overall + const SourceType& Source = *reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + Target.bIsZipped = Source.bIsZipped ? 1 : 0; + Target.Width = Source.Width; + Target.Height = Source.Height; + + Target.Data.AdjustSize(Context, Source.PackedData.Num()); + + if (Target.Data.Num() > 0) + { + FMemory::Memcpy(Target.Data.GetData(), Source.PackedData.GetData(), Target.Data.Num()); + } + } + + // Called to apply the quantized snapshot back to gameplay memory + static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.bIsZipped = Source.bIsZipped != 0; + Target.Width = Source.Width; + Target.Height = Source.Height; + + //Target.Size = Source.PackedData.Num(); + Target.PackedData.Reset(Source.Data.Num()); + + if (Source.Data.Num() > 0) + { + Target.PackedData.AddUninitialized(Source.Data.Num()); + FMemory::Memcpy(Target.PackedData.GetData(), Source.Data.GetData(), Source.Data.Num()); + } + } + + // Serialize into bitstream + static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); + + Writer->WriteBits(Source.bIsZipped, 1); + Writer->WriteBits(Source.Width, 32); + Writer->WriteBits(Source.Height, 32); + + // Write array size first + uint32 Size = Source.Data.Num(); + Writer->WriteBits(Size, 32); + + if (Size > 0) + { + Writer->WriteBitStream((uint32*)Source.Data.GetData(), 0, Source.Data.Num() * 8); + } + } + + // Deserialize from bitstream + static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Target); + FNetBitStreamReader* Reader = Context.GetBitStreamReader(); + + Target.bIsZipped = Reader->ReadBits(1); + Target.Width = Reader->ReadBits(32); + Target.Height = Reader->ReadBits(32); + + uint32 Size = Reader->ReadBits(32); + Target.Data.AdjustSize(Context, Size); + + if (Size > 0) + { + Reader->ReadBitStream((uint32*)Target.Data.GetData(), Target.Data.Num() * 8); + } + } + + // Compare two instances to see if they differ + static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) + { + // This struct is never stored, it is only packed and sent once to catch a client up + return false; + } + + static void CloneDynamicState(FNetSerializationContext& Context, const FNetCloneDynamicStateArgs& Args) + { + const QuantizedType* Source = reinterpret_cast(Args.Source); + QuantizedType* Target = reinterpret_cast(Args.Target); + + // copy small fields + Target->bIsZipped = Source->bIsZipped; + Target->Width = Source->Width; + Target->Height = Source->Height; + + Target->Data.Clone(Context, Source->Data); + } + + static void FreeDynamicState(FNetSerializationContext& Context, const FNetFreeDynamicStateArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Source); + Target.Data.Free(Context); + } + }; +} + +namespace UE::Net +{ + + struct alignas(8) FQuantizedTriData + { + uint16 P1[2]; + uint16 P2[2]; + uint16 P3[2]; + }; + + // TODO check on this if it changes over time..... + // Really needs to be a macro for getting struct sizes outside of the private files.... + struct FQuantizedSoftObjectRef + { + alignas(8) uint8 Storage[64]; // Iris’ FSoftObjectNetSerializerQuantizedType is 48 bytes + // Keeping some overhead + }; + + struct alignas(8) FQuantizedRenderManagerOperationData + { + uint32 OwnerID; + uint8 OperationType; + uint32 Color; + uint16 P1[2]; + uint16 P2[2]; + uint32 Thickness; + + typedef FNetSerializerArrayStorage TriStorage; + TriStorage Tris; + + //String data + FQuantizedSoftObjectRef Texture; + FQuantizedSoftObjectRef Material; + }; +} + +template <> struct TIsPODType { enum { Value = true }; }; + +namespace UE::Net +{ + + // ----------------------------------------------------------------------------- + // Iris serializer for FRenderManagerOperation + // ----------------------------------------------------------------------------- + struct FRenderManagerOperationNetSerializer + { + inline static const FSoftObjectNetSerializerConfig ObjectPtrNetSerializerConfig; + + inline static const FNetSerializerConfig* FObjectPtrSerializerConfigPtr = &ObjectPtrNetSerializerConfig; + inline static const FNetSerializer* FObjectPtrNetSerializerPtr; + + // Version is required. + static constexpr uint32 Version = 0; + + //Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. + static constexpr bool bUseDefaultDelta = true; + // Not doing delta, the majority of the time a single bit (bool) controls the serialization of the entirity + + static constexpr bool bHasDynamicState = true; + + class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates + { + public: + virtual ~FNetSerializerRegistryDelegates(); + + void InitNetSerializer() + { + FRenderManagerOperationNetSerializer::FObjectPtrNetSerializerPtr = &UE_NET_GET_SERIALIZER(FSoftObjectNetSerializer); + } + + private: + virtual void OnPreFreezeNetSerializerRegistry() override; + //virtual void OnPostFreezeNetSerializerRegistry() override; + }; + + inline static FRenderManagerOperationNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; + + typedef FRenderManagerOperation SourceType; + typedef FQuantizedRenderManagerOperationData QuantizedType; + typedef FRenderManagerOperationSerializerConfig ConfigType; + inline static const ConfigType DefaultConfig; + + // Called to create a "quantized snapshot" of the struct + static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) + { + // Actually do the real quantization step here next instead of just in serialize, will save on memory overall + const SourceType& Source = *reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + Target.OwnerID = Source.OwnerID; + Target.OperationType = (uint8)Source.OperationType; + + + switch ((ERenderManagerOperationType)Source.OperationType) + { + case ERenderManagerOperationType::Op_LineDraw: + { + // Color + uint8* ColorPtr = ((uint8*)&Target.Color); + ColorPtr[0] = Source.Color.R; + ColorPtr[1] = Source.Color.G; + ColorPtr[2] = Source.Color.B; + ColorPtr[3] = Source.Color.A; + + // Thickness + Target.Thickness = Source.Thickness; + + //P 1 1, 20 + //P 2 2, 20 + Target.P1[0] = (uint16)GetCompressedFloat<10000, 16>(Source.P1.X); + Target.P1[1] = (uint16)GetCompressedFloat<10000, 16>(Source.P1.Y); + Target.P2[0] = (uint16)GetCompressedFloat<10000, 16>(Source.P2.X); + Target.P2[1] = (uint16)GetCompressedFloat<10000, 16>(Source.P2.Y); + + }break; + + case ERenderManagerOperationType::Op_TexDraw: + { + // Texture + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.Texture + FNetQuantizeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.Texture); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.Texture); + ObjSerializer->Quantize(Context, MemberArgsObj); + + // P1 1, 20 + Target.P1[0] = (uint16)GetCompressedFloat<10000, 16>(Source.P1.X); + Target.P1[1] = (uint16)GetCompressedFloat<10000, 16>(Source.P1.Y); + + }break; + + case ERenderManagerOperationType::Op_TriDraw: + { + // Color + uint8* ColorPtr = ((uint8*)&Target.Color); + ColorPtr[0] = Source.Color.R; + ColorPtr[1] = Source.Color.G; + ColorPtr[2] = Source.Color.B; + ColorPtr[3] = Source.Color.A; + + // Material + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.Material + FNetQuantizeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.Material); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.Material); + ObjSerializer->Quantize(Context, MemberArgsObj); + + // Tris + Target.Tris.AdjustSize(Context, Source.Tris.Num()); + FQuantizedTriData* TargetTriData = Target.Tris.GetData(); + + if (Target.Tris.Num() > 0) + { + for (uint32 i = 0; i < Target.Tris.Num(); ++i) + { + TargetTriData[i].P1[0] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P1.X); + TargetTriData[i].P1[1] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P1.Y); + TargetTriData[i].P2[0] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P2.X); + TargetTriData[i].P2[1] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P2.Y); + TargetTriData[i].P3[0] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P3.X); + TargetTriData[i].P3[1] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P3.Y); + } + } + + }break; + } + } + + // Called to apply the quantized snapshot back to gameplay memory + static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.OwnerID = Source.OwnerID; + Target.OperationType = (ERenderManagerOperationType)Source.OperationType; + + + switch ((ERenderManagerOperationType)Source.OperationType) + { + case ERenderManagerOperationType::Op_LineDraw: + { + // Color + uint8* ColorPtr = ((uint8*)&Source.Color); + Target.Color.R = ColorPtr[0]; + Target.Color.G = ColorPtr[1]; + Target.Color.B = ColorPtr[2]; + Target.Color.A = ColorPtr[3]; + + // Thickness + Target.Thickness = Source.Thickness; + + //P 1 1, 20 + //P 2 2, 20 + Target.P1.X = GetDecompressedFloat<10000, 16>(Source.P1[0]); + Target.P1.Y = GetDecompressedFloat<10000, 16>(Source.P1[1]); + + Target.P2.X = GetDecompressedFloat<10000, 16>(Source.P2[0]); + Target.P2.Y = GetDecompressedFloat<10000, 16>(Source.P2[1]); + + }break; + + case ERenderManagerOperationType::Op_TexDraw: + { + // Texture + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.Texture + FNetDequantizeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.Texture); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.Texture); + ObjSerializer->Dequantize(Context, MemberArgsObj); + + // P1 1, 20 + Target.P1.X = GetDecompressedFloat<10000, 16>(Source.P1[0]); + Target.P1.Y = GetDecompressedFloat<10000, 16>(Source.P1[1]); + + }break; + + case ERenderManagerOperationType::Op_TriDraw: + { + // Color + uint8* ColorPtr = ((uint8*)&Source.Color); + Target.Color.R = ColorPtr[0]; + Target.Color.G = ColorPtr[1]; + Target.Color.B = ColorPtr[2]; + Target.Color.A = ColorPtr[3]; + + // Material + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.Material + FNetDequantizeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.Material); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.Material); + ObjSerializer->Dequantize(Context, MemberArgsObj); + + // Tris + Target.Tris.Reset(Source.Tris.Num()); + Target.Tris.AddUninitialized(Source.Tris.Num()); + + const FQuantizedTriData* SourceTriData = Source.Tris.GetData(); + + if (Target.Tris.Num() > 0) + { + for (int32 i = 0; i < Target.Tris.Num(); ++i) + { + Target.Tris[i].P1.X = GetDecompressedFloat<10000, 16>(SourceTriData[i].P1[0]); + Target.Tris[i].P1.Y = GetDecompressedFloat<10000, 16>(SourceTriData[i].P1[1]); + Target.Tris[i].P2.X = GetDecompressedFloat<10000, 16>(SourceTriData[i].P2[0]); + Target.Tris[i].P2.Y = GetDecompressedFloat<10000, 16>(SourceTriData[i].P2[1]); + Target.Tris[i].P3.X = GetDecompressedFloat<10000, 16>(SourceTriData[i].P3[0]); + Target.Tris[i].P3.Y = GetDecompressedFloat<10000, 16>(SourceTriData[i].P3[1]); + } + } + + }break; + } + } + + // Serialize into bitstream + static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); + + Writer->WriteBits(Source.OwnerID, 32); + Writer->WriteBits(Source.OperationType, 8); + + switch ((ERenderManagerOperationType)Source.OperationType) + { + case ERenderManagerOperationType::Op_LineDraw: + { + // Color + Writer->WriteBits(Source.Color, 32); + + // Thickness + Writer->WriteBits(Source.Thickness, 32); + + //P 1 1, 20 + //P 2 2, 20 + if (Writer->WriteBool(Source.P1[0] != 0)) {Writer->WriteBits(Source.P1[0], 16);} + if (Writer->WriteBool(Source.P1[1] != 0)) { Writer->WriteBits(Source.P1[1], 16);} + if (Writer->WriteBool(Source.P2[0] != 0)) { Writer->WriteBits(Source.P2[0], 16);} + if (Writer->WriteBool(Source.P2[1] != 0)) { Writer->WriteBits(Source.P2[1], 16);} + + }break; + + case ERenderManagerOperationType::Op_TexDraw: + { + // Texture + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.Texture + FNetSerializeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.Texture); + ObjSerializer->Serialize(Context, MemberArgsObj); + + // P1 1, 20 + if (Writer->WriteBool(Source.P1[0] != 0)) { Writer->WriteBits(Source.P1[0], 16); } + if (Writer->WriteBool(Source.P1[1] != 0)) { Writer->WriteBits(Source.P1[1], 16); } + + }break; + + case ERenderManagerOperationType::Op_TriDraw: + { + // Color + Writer->WriteBits(Source.Color, 32); + + // Material + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.Material + FNetSerializeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.Material); + ObjSerializer->Serialize(Context, MemberArgsObj); + + // Tris + const FQuantizedTriData* TargetTriData = Source.Tris.GetData(); + + uint32 TriSize = Source.Tris.Num(); + Writer->WriteBits(TriSize, 32); + + if (Source.Tris.Num() > 0) + { + for (uint32 i = 0; i < Source.Tris.Num(); ++i) + { + Writer->WriteBits(TargetTriData[i].P1[0], 16); + Writer->WriteBits(TargetTriData[i].P1[1], 16); + Writer->WriteBits(TargetTriData[i].P2[0], 16); + Writer->WriteBits(TargetTriData[i].P2[1], 16); + Writer->WriteBits(TargetTriData[i].P3[0], 16); + Writer->WriteBits(TargetTriData[i].P3[1], 16); + } + //Writer->WriteBitStream((uint32*)TargetTriData, 0, (Source.Tris.Num() * sizeof(FQuantizedTriData)) * 8); + } + + }break; + } + } + + // Deserialize from bitstream + static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Target); + FNetBitStreamReader* Reader = Context.GetBitStreamReader(); + + Target.OwnerID = Reader->ReadBits(32); + Target.OperationType = Reader->ReadBits(8); + + + switch ((ERenderManagerOperationType)Target.OperationType) + { + case ERenderManagerOperationType::Op_LineDraw: + { + // Color + Target.Color = Reader->ReadBits(32); + + // Thickness + Target.Thickness = Reader->ReadBits(32); + + //P 1 1, 20 + //P 2 2, 20 + Target.P1[0] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; + Target.P1[1] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; + Target.P2[0] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; + Target.P2[1] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; + + }break; + + case ERenderManagerOperationType::Op_TexDraw: + { + // Texture + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.Texture + FNetDeserializeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.Texture); + ObjSerializer->Deserialize(Context, MemberArgsObj); + + // P1 1, 20 + Target.P1[0] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; + Target.P1[1] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; + + }break; + + case ERenderManagerOperationType::Op_TriDraw: + { + // Color + Target.Color = Reader->ReadBits(32); + + // Material + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.Material + FNetDeserializeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.Material); + ObjSerializer->Deserialize(Context, MemberArgsObj); + + // Tris + uint32 TriSize = Reader->ReadBits(32); + Target.Tris.AdjustSize(Context, TriSize); + + FQuantizedTriData* TargetTriData = Target.Tris.GetData(); + + if (Target.Tris.Num() > 0) + { + for (uint32 i = 0; i < TriSize; ++i) + { + TargetTriData[i].P1[0] = Reader->ReadBits(16); + TargetTriData[i].P1[1] = Reader->ReadBits(16); + TargetTriData[i].P2[0] = Reader->ReadBits(16); + TargetTriData[i].P2[1] = Reader->ReadBits(16); + TargetTriData[i].P3[0] = Reader->ReadBits(16); + TargetTriData[i].P3[1] = Reader->ReadBits(16); + } + //Reader->ReadBitStream((uint32*)&TargetTriData, (TriSize * sizeof(FQuantizedTriData)) * 8); + } + }break; + } + } + + // Compare two instances to see if they differ + static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) + { + // This struct is never stored, it is only packed and sent once to catch a client up + return false; + } + + static void CloneDynamicState(FNetSerializationContext& Context, const FNetCloneDynamicStateArgs& Args) + { + const QuantizedType* Source = reinterpret_cast(Args.Source); + QuantizedType* Target = reinterpret_cast(Args.Target); + + Target->OwnerID = Source->OwnerID; + Target->OperationType = Source->OperationType; + + + switch ((ERenderManagerOperationType)Target->OperationType) + { + case ERenderManagerOperationType::Op_LineDraw: + { + // Color + Target->Color = Source->Color; + + // Thickness + Target->Thickness = Source->Thickness; + + //P 1 1, 20 + //P 2 2, 20 + Target->P1[0] = Source->P1[0]; + Target->P1[1] = Source->P1[1]; + Target->P2[0] = Source->P2[0]; + Target->P2[1] = Source->P2[1]; + + }break; + + case ERenderManagerOperationType::Op_TexDraw: + { + // Texture + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + FNetCloneDynamicStateArgs ObjMemberArgs = Args; + ObjMemberArgs.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + ObjMemberArgs.Target = NetSerializerValuePointer(&Target->Texture); + ObjMemberArgs.Source = NetSerializerValuePointer(&Source->Texture); + ObjSerializer->CloneDynamicState(Context, ObjMemberArgs); + + // P1 1, 20 + Target->P1[0] = Source->P1[0]; + Target->P1[1] = Source->P1[1]; + + }break; + + case ERenderManagerOperationType::Op_TriDraw: + { + // Color + Target->Color = Source->Color; + + // Material + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + FNetCloneDynamicStateArgs ObjMemberArgs = Args; + ObjMemberArgs.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + ObjMemberArgs.Target = NetSerializerValuePointer(&Target->Material); + ObjMemberArgs.Source = NetSerializerValuePointer(&Source->Material); + ObjSerializer->CloneDynamicState(Context, ObjMemberArgs); + + // Tris + Target->Tris.Clone(Context, Source->Tris); + + }break; + } + } + + static void FreeDynamicState(FNetSerializationContext& Context, const FNetFreeDynamicStateArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Source); + Target.Tris.Free(Context); + } + }; + + + static const FName PropertyNetSerializerRegistry_NAME_BPVRReplicatedTextureStore("BPVRReplicatedTextureStore"); + UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRReplicatedTextureStore, FBPVRReplicatedTextureStoreNetSerializer); + + FBPVRReplicatedTextureStoreNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() + { + UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRReplicatedTextureStore); + } + + void FBPVRReplicatedTextureStoreNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() + { + UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRReplicatedTextureStore); + } + + + UE_NET_IMPLEMENT_SERIALIZER(FBPVRReplicatedTextureStoreNetSerializer); + + + + static const FName PropertyNetSerializerRegistry_NAME_RenderManagerOperation("RenderManagerOperation"); + UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RenderManagerOperation, FRenderManagerOperationNetSerializer); + + FRenderManagerOperationNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() + { + UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RenderManagerOperation); + } + + void FRenderManagerOperationNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() + { + InitNetSerializer(); + + UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RenderManagerOperation); + } + + + UE_NET_IMPLEMENT_SERIALIZER(FRenderManagerOperationNetSerializer); +} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp index d9abaa8..8bba3c3 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp @@ -29,7 +29,7 @@ FLayeredMove_VRMovement::FLayeredMove_VRMovement() DurationMs = -1.0f; } -bool FLayeredMove_VRMovement::IsFinished(float CurrentSimTimeMs) const +bool FLayeredMove_VRMovement::IsFinished(double CurrentSimTimeMs) const { // We never end the VR velocity injection return false; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ParentRelativeAttachmentComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ParentRelativeAttachmentComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ParentRelativeAttachmentComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ParentRelativeAttachmentComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.cpp new file mode 100644 index 0000000..1f16c07 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.cpp @@ -0,0 +1,258 @@ +#include "Serializers/FBPAdvGripPhysicsSettingsNetSerializer.h" +#include "Serializers/SerializerHelpers.h" +#include "Iris/Serialization/NetSerializerDelegates.h" +#include "Iris/Serialization/NetSerializers.h" +#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" +#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" + + +namespace UE::Net +{ + + // ----------------------------------------------------------------------------- + // Iris serializer for FBPAdvGripPhysicsSettings + // ----------------------------------------------------------------------------- + struct FBPAdvGripPhysicsSettingsNetSerializer + { + + class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates + { + public: + virtual ~FNetSerializerRegistryDelegates(); + + private: + virtual void OnPreFreezeNetSerializerRegistry() override; + //virtual void OnPostFreezeNetSerializerRegistry() override; + }; + + inline static FBPAdvGripPhysicsSettingsNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; + + + /** Version is required. */ + static constexpr uint32 Version = 0; + + struct FQuantizedData + { + uint32 bUsePhysicsSettings : 1; + uint32 PhysicsConstraintType : 1; // This only has two elements + uint32 PhysicsGripLocationSettings : 3; // This only has five states + uint32 bTurnOffGravityDuringGrip : 1; + uint32 bSkipSettingSimulating : 1; + uint32 bUseCustomAngularValues : 1; + uint32 Reserved : 25; // pad out to full 32 bits + + // Quantized ranges (0–512 with ~0.01 precision) + uint32 LinearMaxForceCoefficient; + uint32 AngularMaxForceCoefficient; + + float AngularStiffness; + float AngularDamping; + }; + + typedef FBPAdvGripPhysicsSettings SourceType; + typedef FQuantizedData QuantizedType; + typedef FBPAdvGripPhysicsSettingsNetSerializerConfig ConfigType; + inline static const ConfigType DefaultConfig; + + /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ + static constexpr bool bUseDefaultDelta = true; + // Not doing delta, the majority of the time a single bit (bool) controls the serialization of the entirity + + + /** + * Optional. Same as Serialize but where an acked previous state is provided for bitpacking purposes. + * This is implemented by default to do same value optimization, at the cost of a bit. If implemented + * then DeserializeDelta is required. + */ + /*static void SerializeDelta(FNetSerializationContext&, const FNetSerializeDeltaArgs&) + { + + }*/ + + /** + * Optional. Same as Deserialize but where an acked previous state is provided for bitpacking purposes. + * This is implemented by default to do same value optimization, at the cost of a bit. If implemented + * then SerializeDelta is required. + */ + /*static void DeserializeDelta(FNetSerializationContext&, const FNetDeserializeDeltaArgs&) + { + + }*/ + + // Called to create a "quantized snapshot" of the struct + static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) + { + + // Actually do the real quantization step here next instead of just in serialize, will save on memory overall + const SourceType& Source = *reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + // Copy flags + Target.bUsePhysicsSettings = Source.bUsePhysicsSettings; + + if (Target.bUsePhysicsSettings) + { + Target.PhysicsConstraintType = (uint32)Source.PhysicsConstraintType; + Target.PhysicsGripLocationSettings = (uint32)Source.PhysicsGripLocationSettings; + + Target.bTurnOffGravityDuringGrip = Source.bTurnOffGravityDuringGrip; + Target.bSkipSettingSimulating = Source.bSkipSettingSimulating; + + // Quantize forces + Target.LinearMaxForceCoefficient = GetCompressedFloat<512, 17>(Source.LinearMaxForceCoefficient); + Target.AngularMaxForceCoefficient = GetCompressedFloat<512, 17>(Source.AngularMaxForceCoefficient); + + Target.bUseCustomAngularValues = Source.bUseCustomAngularValues; + + if (Target.bUseCustomAngularValues) + { + // Copy angular floats as-is + Target.AngularStiffness = Source.AngularStiffness; + Target.AngularDamping = Source.AngularDamping; + } + } + } + + // Called to apply the quantized snapshot back to gameplay memory + static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.bUsePhysicsSettings = Source.bUsePhysicsSettings != 0; + + if (Source.bUsePhysicsSettings) + { + Target.AngularDamping = Source.AngularDamping; + Target.AngularStiffness = Source.AngularStiffness; + Target.bSkipSettingSimulating = Source.bSkipSettingSimulating != 0; + Target.bTurnOffGravityDuringGrip = Source.bTurnOffGravityDuringGrip != 0; + + + Target.PhysicsConstraintType = (EPhysicsGripConstraintType)Source.PhysicsConstraintType; + Target.PhysicsGripLocationSettings = (EPhysicsGripCOMType)Source.PhysicsGripLocationSettings; + + Target.bUseCustomAngularValues = Source.bUseCustomAngularValues != 0; + + if (Target.bUseCustomAngularValues) + { + Target.AngularMaxForceCoefficient = GetDecompressedFloat<512, 17>(Source.AngularMaxForceCoefficient); + Target.LinearMaxForceCoefficient = GetDecompressedFloat<512, 17>(Source.LinearMaxForceCoefficient); + } + } + } + + // Serialize into bitstream + static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); + + Writer->WriteBool(Source.bUsePhysicsSettings); + + if (Source.bUsePhysicsSettings) + { + Writer->WriteBits(static_cast(Source.PhysicsGripLocationSettings), 3); + Writer->WriteBits(static_cast(Source.PhysicsConstraintType), 1); + Writer->WriteBool(Source.bTurnOffGravityDuringGrip); + Writer->WriteBool(Source.bSkipSettingSimulating); + + // Compressed floats + Writer->WriteBits(Source.LinearMaxForceCoefficient, 17); + Writer->WriteBits(Source.AngularMaxForceCoefficient, 17); + + Writer->WriteBool(Source.bUseCustomAngularValues); + if (Source.bUseCustomAngularValues) + { + Writer->WriteBits(Source.AngularStiffness, 32); + Writer->WriteBits(Source.AngularDamping, 32); + } + } + } + + // Deserialize from bitstream + static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Target); + FNetBitStreamReader* Reader = Context.GetBitStreamReader(); + + Target.bUsePhysicsSettings = Reader->ReadBool(); + + if (Target.bUsePhysicsSettings) + { + Target.PhysicsGripLocationSettings = Reader->ReadBits(3); + Target.PhysicsConstraintType = Reader->ReadBits(1); + Target.bTurnOffGravityDuringGrip = Reader->ReadBool(); + Target.bSkipSettingSimulating = Reader->ReadBool(); + + // Decompress floats + Target.LinearMaxForceCoefficient = Reader->ReadBits(17); + Target.AngularMaxForceCoefficient = Reader->ReadBits(17); + + Target.bUseCustomAngularValues = Reader->ReadBool(); + if (Target.bUseCustomAngularValues) + { + Target.AngularStiffness = Reader->ReadBits(32); + Target.AngularDamping = Reader->ReadBits(32); + } + } + } + + // Compare two instances to see if they differ + static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) + { + if (Args.bStateIsQuantized) + { + const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); + const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); + return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; + } + else + { + const SourceType& L = *reinterpret_cast(Args.Source0); + const SourceType& R = *reinterpret_cast(Args.Source1); + + if (L.bUsePhysicsSettings != R.bUsePhysicsSettings) return false; + if (!L.bUsePhysicsSettings) return true; + + if (L.PhysicsGripLocationSettings != R.PhysicsGripLocationSettings) return false; + if (L.PhysicsConstraintType != R.PhysicsConstraintType) return false; + if (L.bTurnOffGravityDuringGrip != R.bTurnOffGravityDuringGrip) return false; + if (L.bSkipSettingSimulating != R.bSkipSettingSimulating) return false; + + if (!FMath::IsNearlyEqual(L.LinearMaxForceCoefficient, R.LinearMaxForceCoefficient)) return false; + if (!FMath::IsNearlyEqual(L.AngularMaxForceCoefficient, R.AngularMaxForceCoefficient)) return false; + + if (L.bUseCustomAngularValues != R.bUseCustomAngularValues) return false; + + if (L.bUseCustomAngularValues) + { + if (!FMath::IsNearlyEqual(L.AngularStiffness, R.AngularStiffness)) return false; + if (!FMath::IsNearlyEqual(L.AngularDamping, R.AngularDamping)) return false; + } + + return true; + } + } + }; + + + static const FName PropertyNetSerializerRegistry_NAME_BPAdvGripPhysicsSettings("BPAdvGripPhysicsSettings"); + UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPAdvGripPhysicsSettings, FBPAdvGripPhysicsSettingsNetSerializer); + + FBPAdvGripPhysicsSettingsNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() + { + UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPAdvGripPhysicsSettings); + } + + void FBPAdvGripPhysicsSettingsNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() + { + UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPAdvGripPhysicsSettings); + } + + /*void FBPAdvGripPhysicsSettingsNetSerializer::FNetSerializerRegistryDelegates::OnPostFreezeNetSerializerRegistry() + { + }*/ + + UE_NET_IMPLEMENT_SERIALIZER(FBPAdvGripPhysicsSettingsNetSerializer); +} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPSecondaryGripInfoNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPSecondaryGripInfoNetSerializer.cpp new file mode 100644 index 0000000..acd5c09 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPSecondaryGripInfoNetSerializer.cpp @@ -0,0 +1,423 @@ +#include "Serializers/FBPSecondaryGripInfoNetSerializer.h" +#include "Serializers/SerializerHelpers.h" +#include "Iris/Serialization/NetSerializerDelegates.h" +#include "Iris/Serialization/NetSerializers.h" +#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" +#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" +#include "Serializers/FTransformNetQuantizeNetSerializer.h" + + +namespace UE::Net +{ + + // ----------------------------------------------------------------------------- + // Iris serializer for FBPSecondaryGripInfo + // ----------------------------------------------------------------------------- + struct FBPSecondaryGripInfoNetSerializer + { + inline static const FVectorNetQuantize100NetSerializerConfig FTransformQuantizeSerializerConfig; + inline static const FObjectPtrNetSerializerConfig ObjectPtrNetSerializerConfig; + inline static const FNameNetSerializerConfig NameNetSerializerConfig; + + inline static const FNetSerializerConfig* FTransformQuantizeSerializerConfigPtr = &FTransformQuantizeSerializerConfig; + inline static const FNetSerializer* FTransformQuantizeNetSerializerPtr; + + inline static const FNetSerializerConfig* FObjectPtrSerializerConfigPtr = &ObjectPtrNetSerializerConfig; + inline static const FNetSerializer* FObjectPtrNetSerializerPtr; + + inline static const FNetSerializerConfig* FNameSerializerConfigPtr = &NameNetSerializerConfig; + inline static const FNetSerializer* FNameNetSerializerPtr; + + + + class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates + { + public: + virtual ~FNetSerializerRegistryDelegates(); + + void InitNetSerializer() + { + FBPSecondaryGripInfoNetSerializer::FTransformQuantizeNetSerializerPtr = &UE_NET_GET_SERIALIZER(FTransformNetQuantizeNetSerializer); + FBPSecondaryGripInfoNetSerializer::FObjectPtrNetSerializerPtr = &UE_NET_GET_SERIALIZER(FObjectPtrNetSerializer); + FBPSecondaryGripInfoNetSerializer::FNameNetSerializerPtr = &UE_NET_GET_SERIALIZER(FNameNetSerializer); + } + + private: + virtual void OnPreFreezeNetSerializerRegistry() override; + //virtual void OnPostFreezeNetSerializerRegistry() override; + }; + + inline static FBPSecondaryGripInfoNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; + + /** Version is required. */ + static constexpr uint32 Version = 0; + + struct alignas(8) FQuantizedData + { + uint8 bHasSecondaryAttachment; + FObjectNetSerializerQuantizedReferenceStorage SecondaryAttachment; + FTransformNetQuantizeQuantizedData SecondaryRelativeTransform; + + uint8 bIsSlotGrip; + + alignas(8) uint8 SecondarySlotName[GetNameNetSerializerSafeQuantizedSize()]; + + uint16 LerpToRate; + + // Not Replicated + // SecondaryGripDistance + //EGripLerpState GripLerpState; + //float curLerp; + //FVector LastRelativeLocation; + }; + + typedef FBPSecondaryGripInfo SourceType; + typedef FQuantizedData QuantizedType; + typedef FBPSecondaryGripInfoNetSerializerConfig ConfigType; + inline static const ConfigType DefaultConfig; + + // TODO: This is actually a struct that could use some delta serialization implementations. + /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ + static constexpr bool bUseDefaultDelta = true; + static constexpr bool bHasDynamicState = true; + //static constexpr bool bHasCustomNetReference = true; + + // Called to create a "quantized snapshot" of the struct + static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) + { + // Actually do the real quantization step here next instead of just in serialize, will save on memory overall + const SourceType& Source = *reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + Target.bHasSecondaryAttachment = Source.bHasSecondaryAttachment ? 1 : 0; + + if (Target.bHasSecondaryAttachment) + { + // ObjectPtr + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.SecondaryAttachment + FNetQuantizeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.SecondaryAttachment); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.SecondaryAttachment); + ObjSerializer->Quantize(Context, MemberArgsObj); + + + // Transform + const FNetSerializer* TransformSerializer = FTransformQuantizeNetSerializerPtr; + const FNetSerializerConfig* TransformSerializerConfig = FTransformQuantizeSerializerConfigPtr; + + //SecondaryRelativeTransform + FNetQuantizeArgs MemberArgsTransform = Args; + MemberArgsTransform.NetSerializerConfig = NetSerializerConfigParam(TransformSerializerConfig); + MemberArgsTransform.Source = NetSerializerValuePointer(&Source.SecondaryRelativeTransform); + MemberArgsTransform.Target = NetSerializerValuePointer(&Target.SecondaryRelativeTransform); + TransformSerializer->Quantize(Context, MemberArgsTransform); + + Target.bIsSlotGrip = Source.bIsSlotGrip ? 1 : 0; + + // FName + const FNetSerializer* NameSerializer = FNameNetSerializerPtr; + const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; + + //SecondarySlotName + FNetQuantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.SecondarySlotName); + MemberArgs.Target = NetSerializerValuePointer(&Target.SecondarySlotName); + NameSerializer->Quantize(Context, MemberArgs); + } + + // This is 0.0 - 16.0, using compression to get it smaller, 4 bits = max 16 + 1 bit for sign and 7 bits precision for 128 / full 2 digit precision + Target.LerpToRate = GetCompressedFloat<16, 12>(Source.LerpToRate); + } + + // Called to apply the quantized snapshot back to gameplay memory + static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.bHasSecondaryAttachment = Source.bHasSecondaryAttachment != 0; + + if (Target.bHasSecondaryAttachment) + { + // ObjectPtr + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.SecondaryAttachment + FNetDequantizeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.SecondaryAttachment); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.SecondaryAttachment); + ObjSerializer->Dequantize(Context, MemberArgsObj); + + + // Transform + const FNetSerializer* TransformSerializer = FTransformQuantizeNetSerializerPtr; + const FNetSerializerConfig* TransformSerializerConfig = FTransformQuantizeSerializerConfigPtr; + + //SecondaryRelativeTransform + FNetDequantizeArgs MemberArgsTransform = Args; + MemberArgsTransform.NetSerializerConfig = NetSerializerConfigParam(TransformSerializerConfig); + MemberArgsTransform.Source = NetSerializerValuePointer(&Source.SecondaryRelativeTransform); + MemberArgsTransform.Target = NetSerializerValuePointer(&Target.SecondaryRelativeTransform); + TransformSerializer->Dequantize(Context, MemberArgsTransform); + + Target.bIsSlotGrip = Source.bIsSlotGrip != 0; + + // FName + const FNetSerializer* NameSerializer = FNameNetSerializerPtr; + const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; + + //SecondarySlotName + FNetDequantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.SecondarySlotName); + MemberArgs.Target = NetSerializerValuePointer(&Target.SecondarySlotName); + NameSerializer->Dequantize(Context, MemberArgs); + } + + // This is 0.0 - 16.0, using compression to get it smaller, 4 bits = max 16 + 1 bit for sign and 7 bits precision for 128 / full 2 digit precision + Target.LerpToRate = GetDecompressedFloat<16, 12>(Source.LerpToRate); + } + + // Serialize into bitstream + static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); + + Writer->WriteBits(static_cast(Source.bHasSecondaryAttachment), 1); + + if (Source.bHasSecondaryAttachment != 0) + { + // ObjectPtr + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.SecondaryAttachment + FNetSerializeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.SecondaryAttachment); + ObjSerializer->Serialize(Context, MemberArgsObj); + + + // Transform + const FNetSerializer* TransformSerializer = FTransformQuantizeNetSerializerPtr; + const FNetSerializerConfig* TransformSerializerConfig = FTransformQuantizeSerializerConfigPtr; + + //SecondaryRelativeTransform + FNetSerializeArgs MemberArgsTransform = Args; + MemberArgsTransform.NetSerializerConfig = NetSerializerConfigParam(TransformSerializerConfig); + MemberArgsTransform.Source = NetSerializerValuePointer(&Source.SecondaryRelativeTransform); + TransformSerializer->Serialize(Context, MemberArgsTransform); + + Writer->WriteBits(static_cast(Source.bIsSlotGrip), 1); + + // FName + const FNetSerializer* NameSerializer = FNameNetSerializerPtr; + const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; + + //SecondarySlotName + FNetSerializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.SecondarySlotName); + NameSerializer->Serialize(Context, MemberArgs); + } + + // This is 0.0 - 16.0, using compression to get it smaller, 4 bits = max 16 + 1 bit for sign and 7 bits precision for 128 / full 2 digit precision + Writer->WriteBits(static_cast(Source.LerpToRate), 12); + } + + // Deserialize from bitstream + static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Target); + FNetBitStreamReader* Reader = Context.GetBitStreamReader(); + + Target.bHasSecondaryAttachment = Reader->ReadBits(1); + + if (Target.bHasSecondaryAttachment != 0) + { + // ObjectPtr + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //Target.SecondaryAttachment + FNetDeserializeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.SecondaryAttachment); + ObjSerializer->Deserialize(Context, MemberArgsObj); + + + // Transform + const FNetSerializer* TransformSerializer = FTransformQuantizeNetSerializerPtr; + const FNetSerializerConfig* TransformSerializerConfig = FTransformQuantizeSerializerConfigPtr; + + //SecondaryRelativeTransform + FNetDeserializeArgs MemberArgsTransform = Args; + MemberArgsTransform.NetSerializerConfig = NetSerializerConfigParam(TransformSerializerConfig); + MemberArgsTransform.Target = NetSerializerValuePointer(&Target.SecondaryRelativeTransform); + TransformSerializer->Deserialize(Context, MemberArgsTransform); + + Target.bIsSlotGrip = Reader->ReadBits(1); + + // FName + const FNetSerializer* NameSerializer = FNameNetSerializerPtr; + const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; + + //SecondarySlotName + FNetDeserializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Target.SecondarySlotName); + NameSerializer->Deserialize(Context, MemberArgs); + } + + // This is 0.0 - 16.0, using compression to get it smaller, 4 bits = max 16 + 1 bit for sign and 7 bits precision for 128 / full 2 digit precision + Target.LerpToRate = Reader->ReadBits(12); + } + + // Compare two instances to see if they differ + static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) + { + if (Args.bStateIsQuantized) + { + const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); + const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); + return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; + } + else + { + const SourceType& L = *reinterpret_cast(Args.Source0); + const SourceType& R = *reinterpret_cast(Args.Source1); + + if (L.bHasSecondaryAttachment != R.bHasSecondaryAttachment) return false; + + if (L.bHasSecondaryAttachment) + { + if (L.SecondaryAttachment != R.SecondaryAttachment) return false; + if (!L.SecondaryRelativeTransform.Equals(R.SecondaryRelativeTransform)) return false; + if (L.bIsSlotGrip != R.bIsSlotGrip) return false; + if (L.SecondarySlotName != R.SecondarySlotName) return false; + } + + if (L.LerpToRate != R.LerpToRate) return false; + + return true; + } + } + + static void CloneDynamicState(FNetSerializationContext& Context, const FNetCloneDynamicStateArgs& Args) + { + const QuantizedType* Source = reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + const FNetSerializer* NameSerializer = FNameNetSerializerPtr; + const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; + + FNetCloneDynamicStateArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Target.SecondarySlotName); + MemberArgs.Source = NetSerializerValuePointer(&Source->SecondarySlotName); + NameSerializer->CloneDynamicState(Context, MemberArgs); + + + + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + FNetCloneDynamicStateArgs ObjMemberArgs = Args; + ObjMemberArgs.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + ObjMemberArgs.Target = NetSerializerValuePointer(&Target.SecondaryAttachment); + ObjMemberArgs.Source = NetSerializerValuePointer(&Source->SecondaryAttachment); + ObjSerializer->CloneDynamicState(Context, MemberArgs); + } + + static void FreeDynamicState(FNetSerializationContext& Context, const FNetFreeDynamicStateArgs& Args) + { + QuantizedType& Source = *reinterpret_cast(Args.Source); + + const FNetSerializer* NameSerializer = FNameNetSerializerPtr; + const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; + + FNetFreeDynamicStateArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.SecondarySlotName); + NameSerializer->FreeDynamicState(Context, MemberArgs); + + + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + FNetFreeDynamicStateArgs ObjMemberArgs = Args; + ObjMemberArgs.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + ObjMemberArgs.Source = NetSerializerValuePointer(&Source.SecondaryAttachment); + ObjSerializer->FreeDynamicState(Context, MemberArgs); + } + + static void Apply(FNetSerializationContext&, const FNetApplyArgs& Args) + { + const SourceType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.bHasSecondaryAttachment = Source.bHasSecondaryAttachment; + + if (Target.bHasSecondaryAttachment) + { + Target.SecondaryAttachment = Source.SecondaryAttachment; + Target.SecondaryRelativeTransform = Source.SecondaryRelativeTransform; + Target.bIsSlotGrip = Source.bIsSlotGrip; + Target.SecondarySlotName = Source.SecondarySlotName; + } + else + { + // Clear non repped values + Target.SecondaryAttachment = nullptr; + Target.SecondaryRelativeTransform = FTransform::Identity; + Target.bIsSlotGrip = false; + Target.SecondarySlotName = NAME_None; + } + + Target.LerpToRate = Source.LerpToRate; + + // Not Replicated + // SecondaryGripDistance + //EGripLerpState GripLerpState; + //float curLerp; + //FVector LastRelativeLocation; + } + + /*static void CollectNetReferences(FNetSerializationContext& Context, const FNetCollectReferencesArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + FNetCollectReferencesArgs CollectNetReferencesArgs = Args; + CollectNetReferencesArgs.NetSerializerConfig = FObjectPtrSerializerConfigPtr; + CollectNetReferencesArgs.Source = NetSerializerValuePointer(&Source.SecondaryAttachment); + ObjSerializer->CollectNetReferences(Context, CollectNetReferencesArgs); + }*/ + }; + + + static const FName PropertyNetSerializerRegistry_NAME_BPSecondaryGripInfo("BPSecondaryGripInfo"); + UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPSecondaryGripInfo, FBPSecondaryGripInfoNetSerializer); + + FBPSecondaryGripInfoNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() + { + UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPSecondaryGripInfo); + } + + void FBPSecondaryGripInfoNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() + { + InitNetSerializer(); + UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPSecondaryGripInfo); + } + + UE_NET_IMPLEMENT_SERIALIZER(FBPSecondaryGripInfoNetSerializer); +} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPVRComponentPosRepNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPVRComponentPosRepNetSerializer.cpp new file mode 100644 index 0000000..0543b4c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPVRComponentPosRepNetSerializer.cpp @@ -0,0 +1,277 @@ +#include "Serializers/FBPVRComponentPosRepNetSerializer.h" +#include "Serializers/SerializerHelpers.h" +#include "Iris/Serialization/NetSerializerDelegates.h" +#include "Iris/Serialization/NetSerializers.h" +#include "Iris/Serialization/PackedVectorNetSerializers.h" +#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" +#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" + + +namespace UE::Net +{ + + // ----------------------------------------------------------------------------- + // Iris serializer for FBPVRComponentPosRep + // ----------------------------------------------------------------------------- + struct FBPVRComponentPosRepNetSerializer + { + + inline static const FVectorNetQuantize10NetSerializerConfig Quantize10SerializerConfig; + inline static const FVectorNetQuantize100NetSerializerConfig Quantize100SerializerConfig; + + inline static const FNetSerializerConfig* VectorNetQuantizeNetSerializerConfigs[2] = { &Quantize10SerializerConfig, &Quantize100SerializerConfig}; + inline static const FNetSerializer* VectorNetQuantizeNetSerializers[2] = {}; + + + class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates + { + public: + virtual ~FNetSerializerRegistryDelegates(); + + void InitNetSerializer() + { + FBPVRComponentPosRepNetSerializer::VectorNetQuantizeNetSerializers[0] = &UE_NET_GET_SERIALIZER(FVectorNetQuantize10NetSerializer); + FBPVRComponentPosRepNetSerializer::VectorNetQuantizeNetSerializers[1] = &UE_NET_GET_SERIALIZER(FVectorNetQuantize100NetSerializer); + } + + private: + virtual void OnPreFreezeNetSerializerRegistry() override; + //virtual void OnPostFreezeNetSerializerRegistry() override; + }; + + inline static FBPVRComponentPosRepNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; + + + /** Version is required. */ + static constexpr uint32 Version = 0; + + struct alignas(8) FQuantizedData + { + uint64 Position[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it + uint16 Rotation[3]; + + uint8 QuantizationLevel : 1; + uint8 RotationQuantizationLevel : 1; + }; + + typedef FBPVRComponentPosRep SourceType; + typedef FQuantizedData QuantizedType; + typedef FBPVRComponentPosRepNetSerializerConfig ConfigType; + inline static const ConfigType DefaultConfig; + + /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ + static constexpr bool bUseDefaultDelta = true; + // Not doing delta, the majority of the time a single bit (bool) controls the serialization of the entirity + + /** + * Optional. Same as Serialize but where an acked previous state is provided for bitpacking purposes. + * This is implemented by default to do same value optimization, at the cost of a bit. If implemented + * then DeserializeDelta is required. + */ + /*static void SerializeDelta(FNetSerializationContext&, const FNetSerializeDeltaArgs&) + { + + }*/ + + /** + * Optional. Same as Deserialize but where an acked previous state is provided for bitpacking purposes. + * This is implemented by default to do same value optimization, at the cost of a bit. If implemented + * then SerializeDelta is required. + */ + /*static void DeserializeDelta(FNetSerializationContext&, const FNetDeserializeDeltaArgs&) + { + + }*/ + + // Called to create a "quantized snapshot" of the struct + static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) + { + // Actually do the real quantization step here next instead of just in serialize, will save on memory overall + const SourceType& Source = *reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + Target.QuantizationLevel = (uint8)Source.QuantizationLevel; + Target.RotationQuantizationLevel = (uint8)Source.RotationQuantizationLevel; + + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializers[Target.QuantizationLevel] ; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfigs[Target.QuantizationLevel] ; + + FNetQuantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.Position); + MemberArgs.Target = NetSerializerValuePointer(&Target.Position[0]); + Serializer->Quantize(Context, MemberArgs); + + // Manually quantize these + switch (Source.RotationQuantizationLevel) + { + case EVRRotationQuantization::RoundTo10Bits: + { + Target.Rotation[0] = FBPVRComponentPosRep::CompressAxisTo10BitShort(Source.Rotation.Pitch); + Target.Rotation[1] = FBPVRComponentPosRep::CompressAxisTo10BitShort(Source.Rotation.Yaw); + Target.Rotation[2] = FBPVRComponentPosRep::CompressAxisTo10BitShort(Source.Rotation.Roll); + }break; + + case EVRRotationQuantization::RoundToShort: + { + Target.Rotation[0] = FRotator::CompressAxisToShort(Source.Rotation.Pitch); + Target.Rotation[1] = FRotator::CompressAxisToShort(Source.Rotation.Yaw); + Target.Rotation[2] = FRotator::CompressAxisToShort(Source.Rotation.Roll); + }break; + } + } + + // Called to apply the quantized snapshot back to gameplay memory + static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.QuantizationLevel = (EVRVectorQuantization)Source.QuantizationLevel; + Target.RotationQuantizationLevel = (EVRRotationQuantization)Source.RotationQuantizationLevel; + + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializers[Source.QuantizationLevel]; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfigs[Source.QuantizationLevel]; + + FNetDequantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.Position[0]); + MemberArgs.Target = NetSerializerValuePointer(&Target.Position); + Serializer->Dequantize(Context, MemberArgs); + + // Manually quantize these + switch (Target.RotationQuantizationLevel) + { + case EVRRotationQuantization::RoundTo10Bits: + { + Target.Rotation.Pitch = FBPVRComponentPosRep::DecompressAxisFrom10BitShort(Source.Rotation[0]); + Target.Rotation.Yaw = FBPVRComponentPosRep::DecompressAxisFrom10BitShort(Source.Rotation[1]); + Target.Rotation.Roll = FBPVRComponentPosRep::DecompressAxisFrom10BitShort(Source.Rotation[2]); + }break; + + case EVRRotationQuantization::RoundToShort: + { + Target.Rotation.Pitch = FRotator::DecompressAxisFromShort(Source.Rotation[0]); + Target.Rotation.Yaw = FRotator::DecompressAxisFromShort(Source.Rotation[1]); + Target.Rotation.Roll = FRotator::DecompressAxisFromShort(Source.Rotation[2]); + }break; + } + } + + // Serialize into bitstream + static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); + + Writer->WriteBits(static_cast(Source.QuantizationLevel), 1); + Writer->WriteBits(static_cast(Source.RotationQuantizationLevel), 1); + + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializers[Source.QuantizationLevel] ; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfigs[Source.QuantizationLevel]; + + FNetSerializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.Position[0]); + Serializer->Serialize(Context, MemberArgs); + + switch ((EVRRotationQuantization)Source.RotationQuantizationLevel) + { + case EVRRotationQuantization::RoundTo10Bits: + { + Writer->WriteBits(static_cast(Source.Rotation[0]), 10); + Writer->WriteBits(static_cast(Source.Rotation[1]), 10); + Writer->WriteBits(static_cast(Source.Rotation[2]), 10); + }break; + + case EVRRotationQuantization::RoundToShort: + { + Writer->WriteBits(static_cast(Source.Rotation[0]), 16); + Writer->WriteBits(static_cast(Source.Rotation[1]), 16); + Writer->WriteBits(static_cast(Source.Rotation[2]), 16); + }break; + } + + } + + // Deserialize from bitstream + static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Target); + FNetBitStreamReader* Reader = Context.GetBitStreamReader(); + + Target.QuantizationLevel = Reader->ReadBits(1); + Target.RotationQuantizationLevel = Reader->ReadBits(1); + + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializers[Target.QuantizationLevel] ; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfigs[Target.QuantizationLevel]; + + FNetDeserializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Target.Position[0]); + Serializer->Deserialize(Context, MemberArgs); + + switch ((EVRRotationQuantization)Target.RotationQuantizationLevel) + { + case EVRRotationQuantization::RoundTo10Bits: + { + Target.Rotation[0] = Reader->ReadBits(10); + Target.Rotation[1] = Reader->ReadBits(10); + Target.Rotation[2] = Reader->ReadBits(10); + }break; + + case EVRRotationQuantization::RoundToShort: + { + Target.Rotation[0] = Reader->ReadBits(16); + Target.Rotation[1] = Reader->ReadBits(16); + Target.Rotation[2] = Reader->ReadBits(16); + }break; + } + } + + // Compare two instances to see if they differ + static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) + { + if (Args.bStateIsQuantized) + { + const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); + const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); + return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; + } + else + { + const SourceType& L = *reinterpret_cast(Args.Source0); + const SourceType& R = *reinterpret_cast(Args.Source1); + + if (L.QuantizationLevel != R.QuantizationLevel) return false; + if (L.RotationQuantizationLevel != R.RotationQuantizationLevel) return false; + + if (!L.Position.Equals(R.Position)) return false; + if (!L.Rotation.Equals(R.Rotation)) return false; + + return true; + } + } + }; + + + static const FName PropertyNetSerializerRegistry_NAME_BPVRComponentPosRep("BPVRComponentPosRep"); + UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRComponentPosRep, FBPVRComponentPosRepNetSerializer); + + FBPVRComponentPosRepNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() + { + UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRComponentPosRep); + } + + void FBPVRComponentPosRepNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() + { + InitNetSerializer(); + UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRComponentPosRep); + } + + /*void FBPVRComponentPosRepNetSerializer::FNetSerializerRegistryDelegates::OnPostFreezeNetSerializerRegistry() + { + }*/ + + UE_NET_IMPLEMENT_SERIALIZER(FBPVRComponentPosRepNetSerializer); +} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FRepMovementVRNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FRepMovementVRNetSerializer.cpp new file mode 100644 index 0000000..9d5261e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FRepMovementVRNetSerializer.cpp @@ -0,0 +1,402 @@ +#include "Serializers/FRepMovementVRNetSerializer.h" +#include "Serializers/SerializerHelpers.h" +#include "Iris/Serialization/NetSerializerDelegates.h" +#include "Iris/Serialization/NetSerializers.h" +#include "Iris/Serialization/PackedVectorNetSerializers.h" +#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" +#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" + +#include "VRBaseCharacter.h" +#include "RepMovementNetSerializer.h" + + +namespace UE::Net +{ + + // ----------------------------------------------------------------------------- + // Iris serializer for FRepMovementVRCharacter + // ----------------------------------------------------------------------------- + struct FRepMovementVRCharacterNetSerializer + { + inline static const FVectorNetQuantize100NetSerializerConfig Quantize100SerializerConfig; + inline static const FRepMovementNetSerializerConfig RepMovementPtrNetSerializerConfig; + + inline static const FNetSerializerConfig* VectorNetQuantizeNetSerializerConfig = &Quantize100SerializerConfig; + inline static const FNetSerializer* VectorNetQuantizeNetSerializer; + + inline static const FNetSerializerConfig* FRepMovementNetSerializerConfig = &RepMovementPtrNetSerializerConfig; + inline static const FNetSerializer* FRepMovementNetSerializer; + + class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates + { + public: + virtual ~FNetSerializerRegistryDelegates(); + + void InitNetSerializer() + { + FRepMovementVRCharacterNetSerializer::VectorNetQuantizeNetSerializer = &UE_NET_GET_SERIALIZER(FVectorNetQuantize100NetSerializer); + FRepMovementVRCharacterNetSerializer::FRepMovementNetSerializer = &UE_NET_GET_SERIALIZER(FRepMovementNetSerializer); + } + + private: + virtual void OnPreFreezeNetSerializerRegistry() override; + //virtual void OnPostFreezeNetSerializerRegistry() override; + }; + + inline static FRepMovementVRCharacterNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; + + + /** Version is required. */ + static constexpr uint32 Version = 0; + + // TODO: Keep up to date with the source struct + // Copy of the rep movement quant data struct, needs to be kept up to date with engine changes + struct FRepMovementQuantizedDataCopy + { + uint64 AngularVelocity[4]; + uint64 LinearVelocity[4]; + uint64 Location[4]; + uint16 Rotation[4]; + uint64 Acceleration[4]; + int32 ServerFrame; + int32 ServerPhysicsHandle; + + uint16 Flags : 4; + uint16 VelocityQuantizationLevel : 2; + uint16 LocationQuantizationLevel : 2; + uint16 RotationQuantizationLevel : 1; + uint16 RepAcceleration : 1; + uint16 Unused : 6; + uint16 Padding[3]; + }; + + struct alignas(8) FRepMovementVRCharacterQuantizedData + { + uint8 bJustTeleported; + uint8 bJustTeleportedGrips; + uint8 bPausedTracking; + uint64 PausedTrackingLoc[4]; + uint16 PausedTrackingRot; + + // Not Replicated, is stored as a reference + //FObjectNetSerializerQuantizedReferenceStorage Owner; + + FRepMovementQuantizedDataCopy RepMovementData; + }; + + typedef FRepMovementVRCharacter SourceType; + typedef FRepMovementVRCharacterQuantizedData QuantizedType; + typedef FRepMovementVRCharacterNetSerializerConfig ConfigType; + inline static const ConfigType DefaultConfig; + + /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ + static constexpr bool bUseDefaultDelta = true; + + // Should likely handle delta custom eventually + + // Called to create a "quantized snapshot" of the struct + static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) + { + // Actually do the real quantization step here next instead of just in serialize, will save on memory overall + const SourceType& Source = *reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + Target.bJustTeleported = Source.bJustTeleported ? 1 : 0; + Target.bJustTeleportedGrips = Source.bJustTeleportedGrips ? 1 : 0; + + Target.bPausedTracking = Source.bPausedTracking ? 1 : 0; + + if (Source.bPausedTracking) + { + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetQuantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.PausedTrackingLoc); + MemberArgs.Target = NetSerializerValuePointer(&Target.PausedTrackingLoc[0]); + Serializer->Quantize(Context, MemberArgs); + + Target.PausedTrackingRot = FRotator::CompressAxisToShort(Source.PausedTrackingRot); + } + + // FRepMovementQuantizedDataCopy RepMovementData; + const FNetSerializer* Serializer = FRepMovementNetSerializer; + const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; + + FNetQuantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source); + MemberArgs.Target = NetSerializerValuePointer(&Target.RepMovementData); + Serializer->Quantize(Context, MemberArgs); + } + + // Called to apply the quantized snapshot back to gameplay memory + static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.bJustTeleported = Source.bJustTeleported != 0; + Target.bJustTeleportedGrips = Source.bJustTeleportedGrips != 0; + + Target.bPausedTracking = Source.bPausedTracking != 0; + + if (Target.bPausedTracking) + { + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetDequantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.PausedTrackingLoc[0]); + MemberArgs.Target = NetSerializerValuePointer(&Target.PausedTrackingLoc); + Serializer->Dequantize(Context, MemberArgs); + + Target.PausedTrackingRot = FRotator::DecompressAxisFromShort(Source.PausedTrackingRot); + } + + // FRepMovementQuantizedDataCopy RepMovementData; + const FNetSerializer* Serializer = FRepMovementNetSerializer; + const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; + + FNetDequantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.RepMovementData); + MemberArgs.Target = NetSerializerValuePointer(&Target); + Serializer->Dequantize(Context, MemberArgs); + } + + // Serialize into bitstream + static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); + + Writer->WriteBits(static_cast(Source.bJustTeleported), 1); + Writer->WriteBits(static_cast(Source.bJustTeleportedGrips), 1); + + Writer->WriteBits(static_cast(Source.bPausedTracking), 1); + + if (Source.bPausedTracking != 0) + { + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetSerializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.PausedTrackingLoc[0]); + Serializer->Serialize(Context, MemberArgs); + + Writer->WriteBits(static_cast(Source.PausedTrackingRot), 16); + } + + // FRepMovementQuantizedDataCopy RepMovementData; + const FNetSerializer* Serializer = FRepMovementNetSerializer; + const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; + + FNetSerializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.RepMovementData); + Serializer->Serialize(Context, MemberArgs); + } + + // Deserialize from bitstream + static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Target); + FNetBitStreamReader* Reader = Context.GetBitStreamReader(); + + Target.bJustTeleported = Reader->ReadBits(1); + Target.bJustTeleportedGrips = Reader->ReadBits(1); + + Target.bPausedTracking = Reader->ReadBits(1); + + if (Target.bPausedTracking != 0) + { + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetDeserializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Target.PausedTrackingLoc[0]); + Serializer->Deserialize(Context, MemberArgs); + + Target.PausedTrackingRot = Reader->ReadBits(16); + } + + // FRepMovementQuantizedDataCopy RepMovementData; + const FNetSerializer* Serializer = FRepMovementNetSerializer; + const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; + + FNetDeserializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Target.RepMovementData); + Serializer->Deserialize(Context, MemberArgs); + } + + static void SerializeDelta(FNetSerializationContext& Context, const FNetSerializeDeltaArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); + + Writer->WriteBits(static_cast(Source.bJustTeleported), 1); + Writer->WriteBits(static_cast(Source.bJustTeleportedGrips), 1); + + Writer->WriteBits(static_cast(Source.bPausedTracking), 1); + + if (Source.bPausedTracking != 0) + { + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetSerializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.PausedTrackingLoc[0]); + Serializer->Serialize(Context, MemberArgs); + + Writer->WriteBits(static_cast(Source.PausedTrackingRot), 16); + } + + // FRepMovementQuantizedDataCopy RepMovementData; + const FNetSerializer* Serializer = FRepMovementNetSerializer; + const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; + + FNetSerializeDeltaArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.RepMovementData); + Serializer->SerializeDelta(Context, MemberArgs); + + } + + static void DeserializeDelta(FNetSerializationContext& Context, const FNetDeserializeDeltaArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Target); + FNetBitStreamReader* Reader = Context.GetBitStreamReader(); + + Target.bJustTeleported = Reader->ReadBits(1); + Target.bJustTeleportedGrips = Reader->ReadBits(1); + + Target.bPausedTracking = Reader->ReadBits(1); + + if (Target.bPausedTracking != 0) + { + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetDeserializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Target.PausedTrackingLoc[0]); + Serializer->Deserialize(Context, MemberArgs); + + Target.PausedTrackingRot = Reader->ReadBits(16); + } + + // FRepMovementQuantizedDataCopy RepMovementData; + const FNetSerializer* Serializer = FRepMovementNetSerializer; + const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; + + FNetDeserializeDeltaArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Target.RepMovementData); + Serializer->DeserializeDelta(Context, MemberArgs); + } + + // Compare two instances to see if they differ + static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) + { + if (Args.bStateIsQuantized) + { + const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); + const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); + return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; + } + else + { + const SourceType& L = *reinterpret_cast(Args.Source0); + const SourceType& R = *reinterpret_cast(Args.Source1); + + if (L.bJustTeleported != R.bJustTeleported) return false; + if (L.bJustTeleportedGrips != R.bJustTeleportedGrips) return false; + if (L.bPausedTracking != R.bPausedTracking) return false; + + if (L.bPausedTracking) + { + if (!L.PausedTrackingLoc.Equals(R.PausedTrackingLoc)) return false; + if (!FMath::IsNearlyEqual(L.PausedTrackingRot, R.PausedTrackingRot)) return false; + } + + const FNetSerializer* Serializer = FRepMovementNetSerializer; + const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; + + FNetIsEqualArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source0 = NetSerializerValuePointer(&L); + MemberArgs.Source1 = NetSerializerValuePointer(&R); + return Serializer->IsEqual(Context, MemberArgs); + } + } + + static bool Validate(FNetSerializationContext& Context, const FNetValidateArgs& Args) + { + const SourceType& Source = *reinterpret_cast(Args.Source); + + const FNetSerializer* Serializer = FRepMovementNetSerializer; + const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; + + FNetValidateArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source); + return Serializer->Validate(Context, MemberArgs); + } + + static void Apply(FNetSerializationContext& Context, const FNetApplyArgs& Args) + { + const SourceType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + + Target.bJustTeleported = Source.bJustTeleported; + Target.bJustTeleportedGrips = Source.bJustTeleportedGrips; + + Target.bPausedTracking = Source.bPausedTracking; + + if (Target.bPausedTracking) + { + Target.PausedTrackingLoc = Source.PausedTrackingLoc; + Target.PausedTrackingRot = Source.PausedTrackingRot; + } + else + { + Target.PausedTrackingLoc = FVector::ZeroVector; + Target.PausedTrackingRot = 0.0f; + } + + const FNetSerializer* Serializer = FRepMovementNetSerializer; + const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; + + FNetApplyArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source); + MemberArgs.Target = NetSerializerValuePointer(&Target); + Serializer->Apply(Context, MemberArgs); + } + }; + + + static const FName PropertyNetSerializerRegistry_NAME_RepMovementVRCharacter("RepMovementVRCharacter"); + UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RepMovementVRCharacter, FRepMovementVRCharacterNetSerializer); + + FRepMovementVRCharacterNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() + { + UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RepMovementVRCharacter); + } + + void FRepMovementVRCharacterNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() + { + InitNetSerializer(); + UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RepMovementVRCharacter); + } + + UE_NET_IMPLEMENT_SERIALIZER(FRepMovementVRCharacterNetSerializer); +} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FTransformNetQuantizeNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FTransformNetQuantizeNetSerializer.cpp new file mode 100644 index 0000000..9da40bd --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FTransformNetQuantizeNetSerializer.cpp @@ -0,0 +1,250 @@ +#include "Serializers/FTransformNetQuantizeNetSerializer.h" +#include "Serializers/SerializerHelpers.h" +#include "Iris/Serialization/NetSerializerDelegates.h" +#include "Iris/Serialization/NetSerializers.h" +#include "Iris/Serialization/PackedVectorNetSerializers.h" +#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" +#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" + +#include "VRBPDatatypes.h" + + +namespace UE::Net +{ + + // ----------------------------------------------------------------------------- + // Iris serializer for FTransformNetQuantize + // ----------------------------------------------------------------------------- + struct FTransformNetQuantizeNetSerializer + { + inline static const FVectorNetQuantize100NetSerializerConfig Quantize100SerializerConfig; + + inline static const FNetSerializerConfig* VectorNetQuantizeNetSerializerConfig = &Quantize100SerializerConfig; + inline static const FNetSerializer* VectorNetQuantizeNetSerializer; + + + class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates + { + public: + virtual ~FNetSerializerRegistryDelegates(); + + void InitNetSerializer() + { + FTransformNetQuantizeNetSerializer::VectorNetQuantizeNetSerializer = &UE_NET_GET_SERIALIZER(FVectorNetQuantize100NetSerializer); + } + + private: + virtual void OnPreFreezeNetSerializerRegistry() override; + //virtual void OnPostFreezeNetSerializerRegistry() override; + }; + + inline static FTransformNetQuantizeNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; + + + /** Version is required. */ + static constexpr uint32 Version = 0; + + /*struct alignas(8) FQuantizedData + { + uint64 Position[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it + uint16 Rotation[3]; + uint64 Scale[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it + uint8 UseHighPrecision : 1; + };*/ + + typedef FTransform_NetQuantize SourceType; + typedef FTransformNetQuantizeQuantizedData QuantizedType; + typedef FTransformNetQuantizeNetSerializerConfig ConfigType; + inline static const ConfigType DefaultConfig; + + /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ + static constexpr bool bUseDefaultDelta = true; + + // Should likely handle delta custom eventually + + // Called to create a "quantized snapshot" of the struct + static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) + { + // Actually do the real quantization step here next instead of just in serialize, will save on memory overall + const SourceType& Source = *reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + static const auto CVarRepHighPrecisionTransforms = IConsoleManager::Get().FindConsoleVariable(TEXT("vrexp.RepHighPrecisionTransforms")); + bool bUseHighPrecision = CVarRepHighPrecisionTransforms->GetBool(); + Target.UseHighPrecision = bUseHighPrecision; + + FVector rTranslation = Source.GetTranslation(); + FVector rScale3D = Source.GetScale3D(); + FRotator rRotation = Source.Rotator(); + + if (bUseHighPrecision) + { + Target.Position[0] = rTranslation.X; + Target.Position[1] = rTranslation.Y; + Target.Position[2] = rTranslation.Z; + + Target.Scale[0] = rScale3D.X; + Target.Scale[1] = rScale3D.Y; + Target.Scale[2] = rScale3D.Z; + + Target.Rotation[0] = FRotator::CompressAxisToShort(rRotation.Pitch); + Target.Rotation[1] = FRotator::CompressAxisToShort(rRotation.Yaw); + Target.Rotation[2] = FRotator::CompressAxisToShort(rRotation.Roll); + } + else + { + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetQuantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&rTranslation); + MemberArgs.Target = NetSerializerValuePointer(&Target.Position[0]); + Serializer->Quantize(Context, MemberArgs); + + MemberArgs.Source = NetSerializerValuePointer(&rScale3D); + MemberArgs.Target = NetSerializerValuePointer(&Target.Scale[0]); + Serializer->Quantize(Context, MemberArgs); + + Target.Rotation[0] = FRotator::CompressAxisToShort(rRotation.Pitch); + Target.Rotation[1] = FRotator::CompressAxisToShort(rRotation.Yaw); + Target.Rotation[2] = FRotator::CompressAxisToShort(rRotation.Roll); + } + } + + // Called to apply the quantized snapshot back to gameplay memory + static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + bool bUseHighPrecision = Source.UseHighPrecision != 0; + + FVector rTranslation; + FVector rScale3D; + FRotator rRotation; + + if (bUseHighPrecision) + { + rTranslation.X = Source.Position[0]; + rTranslation.Y = Source.Position[1]; + rTranslation.Z = Source.Position[2]; + + rScale3D.X = Source.Scale[0]; + rScale3D.Y = Source.Scale[1]; + rScale3D.Z = Source.Scale[2]; + + rRotation.Pitch = FRotator::DecompressAxisFromShort(Source.Rotation[0]); + rRotation.Yaw = FRotator::DecompressAxisFromShort(Source.Rotation[1]); + rRotation.Roll = FRotator::DecompressAxisFromShort(Source.Rotation[2]); + } + else + { + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetDequantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.Position[0]); + MemberArgs.Target = NetSerializerValuePointer(&rTranslation); + Serializer->Dequantize(Context, MemberArgs); + + MemberArgs.Source = NetSerializerValuePointer(&Source.Scale[0]); + MemberArgs.Target = NetSerializerValuePointer(&rScale3D); + Serializer->Dequantize(Context, MemberArgs); + + rRotation.Pitch = FRotator::DecompressAxisFromShort(Source.Rotation[0]); + rRotation.Yaw = FRotator::DecompressAxisFromShort(Source.Rotation[1]); + rRotation.Roll = FRotator::DecompressAxisFromShort(Source.Rotation[2]); + } + + Target.SetComponents(rRotation.Quaternion(), rTranslation, rScale3D); + Target.NormalizeRotation(); + } + + // Serialize into bitstream + static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); + + Writer->WriteBits(static_cast(Source.UseHighPrecision), 1); + + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetSerializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.Position[0]); + Serializer->Serialize(Context, MemberArgs); + + MemberArgs.Source = NetSerializerValuePointer(&Source.Scale[0]); + Serializer->Serialize(Context, MemberArgs); + + Writer->WriteBits(static_cast(Source.Rotation[0]), 16); + Writer->WriteBits(static_cast(Source.Rotation[1]), 16); + Writer->WriteBits(static_cast(Source.Rotation[2]), 16); + } + + // Deserialize from bitstream + static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Target); + FNetBitStreamReader* Reader = Context.GetBitStreamReader(); + + Target.UseHighPrecision = Reader->ReadBits(1) != 0; + + const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; + const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; + + FNetDeserializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Target.Position[0]); + Serializer->Deserialize(Context, MemberArgs); + + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Target.Scale[0]); + Serializer->Deserialize(Context, MemberArgs); + + Target.Rotation[0] = Reader->ReadBits(16); + Target.Rotation[1] = Reader->ReadBits(16); + Target.Rotation[2] = Reader->ReadBits(16); + } + + // Compare two instances to see if they differ + static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) + { + if (Args.bStateIsQuantized) + { + const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); + const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); + return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; + } + else + { + const SourceType& L = *reinterpret_cast(Args.Source0); + const SourceType& R = *reinterpret_cast(Args.Source1); + + if (!L.Equals(R)) return false; + return true; + } + } + }; + + + static const FName PropertyNetSerializerRegistry_NAME_TransformNetQuantize("Transform_NetQuantize"); + UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_TransformNetQuantize, FTransformNetQuantizeNetSerializer); + + FTransformNetQuantizeNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() + { + UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_TransformNetQuantize); + } + + void FTransformNetQuantizeNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() + { + InitNetSerializer(); + UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_TransformNetQuantize); + } + + UE_NET_IMPLEMENT_SERIALIZER(FTransformNetQuantizeNetSerializer); +} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRAIController.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRAIController.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRAIController.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRAIController.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp similarity index 71% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp index e0b200b..381319d 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp @@ -16,6 +16,16 @@ #include "XRMotionControllerBase.h" #include "NavFilters/NavigationQueryFilter.h" #include "Misc/EngineNetworkCustomVersion.h" + + +#include "Serializers/SerializerHelpers.h" +#include "Iris/Serialization/NetSerializerDelegates.h" +#include "Iris/Serialization/NetSerializers.h" +#include "Iris/Serialization/PackedVectorNetSerializers.h" +#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" +#include "Serializers/FTransformNetQuantizeNetSerializer.h" +//#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" + //#include "Runtime/Engine/Private/EnginePrivate.h" #if WITH_PUSH_MODEL @@ -1354,4 +1364,441 @@ bool FRepMovementVRCharacter::NetSerialize(FArchive& Ar, class UPackageMap* Map, } return true; -} \ No newline at end of file +} + + +// IRIS NET SERIALIZERS + +namespace UE::Net +{ + + // ----------------------------------------------------------------------------- + // Iris serializer for FVRReplicatedCapsuleHeight + // ----------------------------------------------------------------------------- + struct FVRReplicatedCapsuleHeightNetSerializer + { + + class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates + { + public: + virtual ~FNetSerializerRegistryDelegates(); + + private: + virtual void OnPreFreezeNetSerializerRegistry() override; + //virtual void OnPostFreezeNetSerializerRegistry() override; + }; + + inline static FVRReplicatedCapsuleHeightNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; + + + /** Version is required. */ + static constexpr uint32 Version = 0; + + struct alignas(8) FQuantizedData + { + uint32 CompressedFloat; + }; + + typedef FVRReplicatedCapsuleHeight SourceType; + typedef FQuantizedData QuantizedType; + typedef FVRReplicatedCapsuleHeightNetSerializerConfig ConfigType; + inline static const ConfigType DefaultConfig; + + /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ + static constexpr bool bUseDefaultDelta = true; + // Not doing delta, the majority of the time a single bit (bool) controls the serialization of the entirity + + // Called to create a "quantized snapshot" of the struct + static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) + { + // Actually do the real quantization step here next instead of just in serialize, will save on memory overall + const SourceType& Source = *reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + Target.CompressedFloat = GetCompressedFloat<1024, 18>(Source.CapsuleHeight); + } + + // Called to apply the quantized snapshot back to gameplay memory + static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.CapsuleHeight = GetDecompressedFloat<1024, 18>(Source.CompressedFloat); + } + + // Serialize into bitstream + static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); + + Writer->WriteBits(static_cast(Source.CompressedFloat), 18); + + } + + // Deserialize from bitstream + static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Target); + FNetBitStreamReader* Reader = Context.GetBitStreamReader(); + + Target.CompressedFloat = Reader->ReadBits(18); + } + + // Compare two instances to see if they differ + static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) + { + if (Args.bStateIsQuantized) + { + const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); + const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); + return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; + } + else + { + const SourceType& L = *reinterpret_cast(Args.Source0); + const SourceType& R = *reinterpret_cast(Args.Source1); + + return FMath::IsNearlyEqual(L.CapsuleHeight, R.CapsuleHeight); + } + } + }; + + + static const FName PropertyNetSerializerRegistry_NAME_FVRReplicatedCapsuleHeight("VRReplicatedCapsuleHeight"); + UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRReplicatedCapsuleHeight, FVRReplicatedCapsuleHeightNetSerializer); + + FVRReplicatedCapsuleHeightNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() + { + UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRReplicatedCapsuleHeight); + } + + void FVRReplicatedCapsuleHeightNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() + { + UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRReplicatedCapsuleHeight); + } + + UE_NET_IMPLEMENT_SERIALIZER(FVRReplicatedCapsuleHeightNetSerializer); + + + // ----------------------------------------------------------------------------- +// Iris serializer for FVRSeatedCharacterInfo +// ----------------------------------------------------------------------------- + struct FVRSeatedCharacterInfoNetSerializer + { + inline static const FVectorNetQuantize100NetSerializerConfig FTransformQuantizeSerializerConfig; + inline static const FObjectPtrNetSerializerConfig ObjectPtrNetSerializerConfig; + + inline static const FNetSerializerConfig* FTransformQuantizeSerializerConfigPtr = &FTransformQuantizeSerializerConfig; + inline static const FNetSerializer* FTransformQuantizeNetSerializerPtr; + + inline static const FNetSerializerConfig* FObjectPtrSerializerConfigPtr = &ObjectPtrNetSerializerConfig; + inline static const FNetSerializer* FObjectPtrNetSerializerPtr; + + class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates + { + public: + virtual ~FNetSerializerRegistryDelegates(); + + void InitNetSerializer() + { + FVRSeatedCharacterInfoNetSerializer::FTransformQuantizeNetSerializerPtr = &UE_NET_GET_SERIALIZER(FTransformNetQuantizeNetSerializer); + FVRSeatedCharacterInfoNetSerializer::FObjectPtrNetSerializerPtr = &UE_NET_GET_SERIALIZER(FObjectPtrNetSerializer); + } + + private: + virtual void OnPreFreezeNetSerializerRegistry() override; + //virtual void OnPostFreezeNetSerializerRegistry() override; + }; + + inline static FVRSeatedCharacterInfoNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; + + + // Version is required. + static constexpr uint32 Version = 0; + + struct alignas(8) FQuantizedData + { + uint8 bSitting : 1; + uint8 bZeroToHead : 1; + + FTransformNetQuantizeQuantizedData StoredTargetTransform; + FObjectNetSerializerQuantizedReferenceStorage SeatParent; + uint8 PostSeatedMovementMode; + + // Only if bSitting is true + FTransformNetQuantizeQuantizedData InitialRelCameraTransform; + uint32 AllowedRadius; // Flt 256, 16 + uint32 AllowedRadiusThreshold; // Flt 256, 16 + + //uint8 bIsOverThreshold : 1; // Not Replicated + //uint32 CurrentThresholdScaler; // Not Replicated + }; + + typedef FVRSeatedCharacterInfo SourceType; + typedef FQuantizedData QuantizedType; + typedef FVRSeatedCharacterInfoNetSerializerConfig ConfigType; + inline static const ConfigType DefaultConfig; + + // Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. + static constexpr bool bUseDefaultDelta = true; + // TODO: This is actually a struct that could use some delta serialization implementations. + + // Called to create a "quantized snapshot" of the struct + static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) + { + // Actually do the real quantization step here next instead of just in serialize, will save on memory overall + const SourceType& Source = *reinterpret_cast(Args.Source); + QuantizedType& Target = *reinterpret_cast(Args.Target); + + Target.bSitting = Source.bSitting; + Target.bZeroToHead = Source.bZeroToHead; + + const FNetSerializer* Serializer = FTransformQuantizeNetSerializerPtr; + const FNetSerializerConfig* SerializerConfig = FTransformQuantizeSerializerConfigPtr; + + //FTransformNetQuantizeQuantizedData StoredTargetTransform; + FNetQuantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.StoredTargetTransform); + MemberArgs.Target = NetSerializerValuePointer(&Target.StoredTargetTransform); + Serializer->Quantize(Context, MemberArgs); + + + // Only if bSitting is true + //FTransformNetQuantizeQuantizedData InitialRelCameraTransform; + //uint32 AllowedRadius; // Flt 256, 16 + //uint32 AllowedRadiusThreshold; // Flt 256, 16 + + if (Source.bSitting) + { + // Initial relative transform doesn't need to be touched or set if not bsitting + MemberArgs.Source = NetSerializerValuePointer(&Source.InitialRelCameraTransform); + MemberArgs.Target = NetSerializerValuePointer(&Target.InitialRelCameraTransform); + Serializer->Quantize(Context, MemberArgs); + + Target.AllowedRadius = GetCompressedFloat<256,16>(Source.AllowedRadius); + Target.AllowedRadiusThreshold = GetCompressedFloat<256, 16>(Source.AllowedRadiusThreshold); + } + + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //FObjectNetSerializerQuantizedReferenceStorage SeatParent; + FNetQuantizeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.SeatParent); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.SeatParent); + ObjSerializer->Quantize(Context, MemberArgsObj); + + // Store full 8 bits + Target.PostSeatedMovementMode = (uint8)Source.PostSeatedMovementMode; + } + + // Called to apply the quantized snapshot back to gameplay memory + static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.bSitting = Source.bSitting != 0; + Target.bZeroToHead = Source.bZeroToHead != 0; + + const FNetSerializer* Serializer = FTransformQuantizeNetSerializerPtr; + const FNetSerializerConfig* SerializerConfig = FTransformQuantizeSerializerConfigPtr; + + //FTransformNetQuantizeQuantizedData StoredTargetTransform; + FNetDequantizeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.StoredTargetTransform); + MemberArgs.Target = NetSerializerValuePointer(&Target.StoredTargetTransform); + Serializer->Dequantize(Context, MemberArgs); + + + // Only if bSitting is true + //FTransformNetQuantizeQuantizedData InitialRelCameraTransform; + //uint32 AllowedRadius; // Flt 256, 16 + //uint32 AllowedRadiusThreshold; // Flt 256, 16 + + if (Target.bSitting != 0) + { + // Initial relative transform doesn't need to be touched or set if not bsitting + MemberArgs.Source = NetSerializerValuePointer(&Source.InitialRelCameraTransform); + MemberArgs.Target = NetSerializerValuePointer(&Target.InitialRelCameraTransform); + Serializer->Dequantize(Context, MemberArgs); + + Target.AllowedRadius = GetDecompressedFloat<256, 16>(Source.AllowedRadius); + Target.AllowedRadiusThreshold = GetDecompressedFloat<256, 16>(Source.AllowedRadiusThreshold); + } + + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //FObjectNetSerializerQuantizedReferenceStorage SeatParent; + FNetDequantizeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.SeatParent); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.SeatParent); + ObjSerializer->Dequantize(Context, MemberArgsObj); + + // Store full 8 bits + Target.PostSeatedMovementMode = (EVRConjoinedMovementModes)Source.PostSeatedMovementMode; + } + + // Serialize into bitstream + static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) + { + const QuantizedType& Source = *reinterpret_cast(Args.Source); + FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); + + Writer->WriteBits(static_cast(Source.bSitting), 1); + Writer->WriteBits(static_cast(Source.bZeroToHead), 1); + + const FNetSerializer* Serializer = FTransformQuantizeNetSerializerPtr; + const FNetSerializerConfig* SerializerConfig = FTransformQuantizeSerializerConfigPtr; + + //FTransformNetQuantizeQuantizedData StoredTargetTransform; + FNetSerializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.StoredTargetTransform); + Serializer->Serialize(Context, MemberArgs); + + + if (Source.bSitting != 0) + { + // Initial relative transform doesn't need to be touched or set if not bsitting + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Source = NetSerializerValuePointer(&Source.InitialRelCameraTransform); + Serializer->Serialize(Context, MemberArgs); + + Writer->WriteBits(static_cast(Source.AllowedRadius), 16); + Writer->WriteBits(static_cast(Source.AllowedRadiusThreshold), 16); + } + + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //FObjectNetSerializerQuantizedReferenceStorage SeatParent; + FNetSerializeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Source = NetSerializerValuePointer(&Source.SeatParent); + ObjSerializer->Serialize(Context, MemberArgsObj); + + Writer->WriteBits(static_cast(Source.PostSeatedMovementMode), 8); + } + + // Deserialize from bitstream + static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) + { + QuantizedType& Target = *reinterpret_cast(Args.Target); + FNetBitStreamReader* Reader = Context.GetBitStreamReader(); + + Target.bSitting = Reader->ReadBits(1) != 0; + Target.bZeroToHead = Reader->ReadBits(1) != 0; + + const FNetSerializer* Serializer = FTransformQuantizeNetSerializerPtr; + const FNetSerializerConfig* SerializerConfig = FTransformQuantizeSerializerConfigPtr; + + //FTransformNetQuantizeQuantizedData StoredTargetTransform; + FNetDeserializeArgs MemberArgs = Args; + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Target.StoredTargetTransform); + Serializer->Deserialize(Context, MemberArgs); + + + if (Target.bSitting != 0) + { + // Initial relative transform doesn't need to be touched or set if not bsitting + MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); + MemberArgs.Target = NetSerializerValuePointer(&Target.InitialRelCameraTransform); + Serializer->Deserialize(Context, MemberArgs); + + Target.AllowedRadius = Reader->ReadBits(16); + Target.AllowedRadiusThreshold = Reader->ReadBits(16); + } + + const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; + const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; + + //FObjectNetSerializerQuantizedReferenceStorage SeatParent; + FNetDeserializeArgs MemberArgsObj = Args; + MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); + MemberArgsObj.Target = NetSerializerValuePointer(&Target.SeatParent); + ObjSerializer->Deserialize(Context, MemberArgsObj); + + Target.PostSeatedMovementMode = Reader->ReadBits(8); + } + + // Compare two instances to see if they differ + static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) + { + if (Args.bStateIsQuantized) + { + const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); + const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); + return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; + } + else + { + const SourceType& L = *reinterpret_cast(Args.Source0); + const SourceType& R = *reinterpret_cast(Args.Source1); + + if (L.bSitting != R.bSitting) return false; + if (L.SeatParent != R.SeatParent) return false; + if(!FMath::IsNearlyEqual(L.AllowedRadius, R.AllowedRadius)) return false; + if (!FMath::IsNearlyEqual(L.AllowedRadiusThreshold, R.AllowedRadiusThreshold)) return false; + if (L.bZeroToHead != R.bZeroToHead) return false; + if (!L.StoredTargetTransform.Equals(R.StoredTargetTransform)) return false; + + if (L.bSitting && !L.InitialRelCameraTransform.Equals(R.InitialRelCameraTransform)) return false; + + return true; + } + } + + static void Apply(FNetSerializationContext&, const FNetApplyArgs& Args) + { + const SourceType& Source = *reinterpret_cast(Args.Source); + SourceType& Target = *reinterpret_cast(Args.Target); + + Target.bSitting = Source.bSitting; + Target.bZeroToHead = Source.bZeroToHead; + Target.StoredTargetTransform = Source.StoredTargetTransform; + + if (Target.bSitting) + { + Target.InitialRelCameraTransform = Source.InitialRelCameraTransform; + Target.AllowedRadius = Source.AllowedRadius; + Target.AllowedRadiusThreshold = Source.AllowedRadiusThreshold; + } + else + { + // Clear non repped values + Target.InitialRelCameraTransform = FTransform::Identity; + Target.AllowedRadius = 0.0f; + Target.AllowedRadiusThreshold = 0.0f; + } + + Target.SeatParent = Source.SeatParent; + Target.PostSeatedMovementMode = Source.PostSeatedMovementMode; + } + }; + + + static const FName PropertyNetSerializerRegistry_NAME_FVRSeatedCharacterInfo("VRSeatedCharacterInfo"); + UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRSeatedCharacterInfo, FVRSeatedCharacterInfoNetSerializer); + + FVRSeatedCharacterInfoNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() + { + UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRSeatedCharacterInfo); + } + + void FVRSeatedCharacterInfoNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() + { + InitNetSerializer(); + UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRSeatedCharacterInfo); + } + + UE_NET_IMPLEMENT_SERIALIZER(FVRSeatedCharacterInfoNetSerializer); +} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacter.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacter.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacter.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacter.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp index 4ca1ff7..c32c9e5 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp @@ -919,6 +919,12 @@ void UVRCharacterMovementComponent::PhysWalking(float deltaTime, int32 Iteration const float timeTick = GetSimulationTimeStep(remainingTime, Iterations); remainingTime -= timeTick; +#if UE_WITH_REMOTE_OBJECT_HANDLE + //Scale down impact force if CharacterMoveComponent is taking multiple substeps. + const float LastFrameDt = GetWorld()->GetDeltaSeconds(); + PhysicsForceSubsteppingFactor = timeTick / LastFrameDt; +#endif + // Save current values UPrimitiveComponent * const OldBase = GetMovementBase(); const FVector PreviousBaseLocation = (OldBase != NULL) ? OldBase->GetComponentLocation() : FVector::ZeroVector; @@ -3223,8 +3229,8 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat Acceleration = ProjectToGravityFloor(Acceleration); //if (!HasRootMotion()) //{ - CalcVelocity(deltaTime, GroundFriction, false, BrakingDecelerationWalking); - devCodeVR(ensureMsgf(!Velocity.ContainsNaN(), TEXT("PhysNavWalking: Velocity contains NaN after CalcVelocity (%s)\n%s"), *GetPathNameSafe(this), *Velocity.ToString())); + CalcVelocity(deltaTime, GroundFriction, false, BrakingDecelerationWalking); + devCodeVR(ensureMsgf(!Velocity.ContainsNaN(), TEXT("PhysNavWalking: Velocity contains NaN after CalcVelocity (%s)\n%s"), *GetPathNameSafe(this), *Velocity.ToString())); //} ApplyRootMotionToVelocity(deltaTime); @@ -3270,7 +3276,7 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat if (bDeltaMoveNearlyZero && bSameNavLocation) { - if (const INavigationDataInterface * NavData = GetNavData()) + if (const INavigationDataInterface* NavData = GetNavData()) { if (!NavData->IsNodeRefValid(CachedNavLocation.NodeRef)) { @@ -3281,6 +3287,7 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat } } + if (bDeltaMoveNearlyZero && bSameNavLocation) { DestNavLocation = CachedNavLocation; @@ -3298,9 +3305,51 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat SetGravitySpaceZ(AdjustedDest, GetGravitySpaceZ(CachedNavLocation.Location)); } - // Find the point on the NavMesh - const bool bHasNavigationData = FindNavFloor(AdjustedDest, DestNavLocation); - if (!bHasNavigationData) + bool bFoundPointOnNavMesh = false; + if (bSlideAlongNavMeshEdge) + { + if (const INavigationDataInterface* NavDataInterface = GetNavData()) + { + const IPathFollowingAgentInterface* PathFollowingAgent = GetPathFollowingAgent(); + const bool bIsOnNavLink = PathFollowingAgent && PathFollowingAgent->IsFollowingNavLink(); + + if (!bIsOnNavLink) + { + FNavLocation StartingNavFloorLocation; + bool bHasValidCachedNavLocation = NavDataInterface->IsNodeRefValid(CachedNavLocation.NodeRef); + + // If we don't have a valid CachedNavLocation lets try finding the NavFloor where we're currently at and use that + if (!bHasValidCachedNavLocation) + { + bHasValidCachedNavLocation = FindNavFloor(OldLocation, OUT StartingNavFloorLocation); + } + else + { + StartingNavFloorLocation = CachedNavLocation; + } + + if (bHasValidCachedNavLocation) + { + bFoundPointOnNavMesh = NavDataInterface->FindMoveAlongSurface(StartingNavFloorLocation, AdjustedDest, OUT DestNavLocation); + + if (bFoundPointOnNavMesh) + { + AdjustedDest = ProjectToGravityFloor(DestNavLocation.Location) + GetGravitySpaceComponentZ(AdjustedDest); + } + } + } + else + { + bFoundPointOnNavMesh = FindNavFloor(AdjustedDest, DestNavLocation); + } + } + } + else + { + bFoundPointOnNavMesh = FindNavFloor(AdjustedDest, DestNavLocation); + } + + if (!bFoundPointOnNavMesh) { RestorePreAdditiveVRMotionVelocity(); SetMovementMode(MOVE_Walking); @@ -3329,7 +3378,7 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat // 4.16 UNCOMMENT FHitResult HitResult; SafeMoveUpdatedComponent(AdjustedDelta, UpdatedComponent->GetComponentQuat(), bSweepWhileNavWalking, HitResult); - + /* 4.16 Delete*/ //const bool bSweep = UpdatedPrimitive ? UpdatedPrimitive->bGenerateOverlapEvents : false; //FHitResult HitResult; @@ -3354,6 +3403,7 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat RestorePreAdditiveVRMotionVelocity(); } + void UVRCharacterMovementComponent::PhysSwimming(float deltaTime, int32 Iterations) { if (deltaTime < MIN_TICK_TIME) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPlugin.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPlugin.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPlugin.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPlugin.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPluginPrivatePCH.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPluginPrivatePCH.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPluginPrivatePCH.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPluginPrivatePCH.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGlobalSettings.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGlobalSettings.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGlobalSettings.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGlobalSettings.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGripInterface.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGripInterface.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGripInterface.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGripInterface.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPlayerController.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPlayerController.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPlayerController.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPlayerController.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp index adda839..226f4df 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp @@ -1374,7 +1374,7 @@ bool UVRRootComponent::UpdateOverlapsImpl(const TOverlapArrayView* NewPendingOve const bool bCheckOverlapFlags = false; // Already checked above if (!ShouldIgnoreOverlapResult(MyWorld, MyActor, *this, Result.OverlapObjectHandle.FetchActor(), *HitComp, bCheckOverlapFlags)) { - OverlapMultiResult.Emplace(HitComp, Result.ItemIndex); // don't need to add unique unless the overlap check can return dupes + OverlapMultiResult.Emplace(HitComp, Result.GetItemIndex()); // don't need to add unique unless the overlap check can return dupes } } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp index cd82855..1decbd7 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp @@ -728,6 +728,15 @@ void UVRStereoWidgetComponent::TickComponent(float DeltaTime, enum ELevelTick Ti }*/ } + // Implement the correct facing stereo layers cvar option + static const auto CVarXRUseLegacyFacing = IConsoleManager::Get().FindConsoleVariable(TEXT("XR.StereoLayers.UseLegacyFacing")); + if (!CVarXRUseLegacyFacing->GetBool()) + { + // The default Open Xr Stereo layer object faces the camera at no rotation where as the unreal object faces away from it at zero rotation + LayerDsec.Transform.SetRotation(Transform.GetRotation() * FQuat(0., 0., 1., 0.)); + } + + if (RenderTarget) { // TODO 5.7 need to figure out how to replace this in some way that isn't so fing slow @@ -888,7 +897,7 @@ public: if (MaterialInstance) { - MaterialRelevance = MaterialInstance->GetRelevance(GetScene().GetFeatureLevel()); + MaterialRelevance = MaterialInstance->GetRelevance(GetScene().GetShaderPlatform()); } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRTrackedParentInterface.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRTrackedParentInterface.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRTrackedParentInterface.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRTrackedParentInterface.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/CharacterMovementCompTypes.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/CharacterMovementCompTypes.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/CharacterMovementCompTypes.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/CharacterMovementCompTypes.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h index 2cb7d90..516305f 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h @@ -1207,6 +1207,18 @@ public: float NewStiffness, float NewDamping, bool bAlsoSetAngularValues = false, float OptionalAngularStiffness = 0.0f, float OptionalAngularDamping = 0.0f ); + // Set the grips advanced settings, may need to recreate grip locally if altering something important (non owning clients will always re-create the grip) + // Can check HasGripAuthority to decide if callable locally + UFUNCTION(BlueprintCallable, Category = "GripMotionController", meta = (ExpandEnumAsExecs = "Result")) + void SetGripAdvancedGripSettings( + const FBPActorGripInformation& Grip, + EBPVRResultSwitch& Result, + uint8 GripPriority = 0, + bool bSetOwnerOnGrip = true, + bool bDisallowLerping = false, + bool bDisallowSettingPositionOnClientAuthDrop = false + ); + // Used to convert an offset transform to grip relative, useful for storing an initial offset and then lerping back to 0 without re-calculating every tick UFUNCTION(BlueprintPure, Category = "GripMotionController", meta = (DisplayName = "CreateGripRelativeAdditionTransform")) FTransform CreateGripRelativeAdditionTransform_BP( diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Default.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Default.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Default.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Default.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_GunTools.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_GunTools.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_GunTools.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_GunTools.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_InteractibleSettings.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_InteractibleSettings.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_InteractibleSettings.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_InteractibleSettings.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_LerpToHand.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_LerpToHand.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_LerpToHand.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_LerpToHand.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Melee.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Melee.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Melee.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Melee.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Physics.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Physics.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Physics.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Physics.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/VRGripScriptBase.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/VRGripScriptBase.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/VRGripScriptBase.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/VRGripScriptBase.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h index 75df06f..9419b0e 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h @@ -56,7 +56,6 @@ public: TArray>& GetGripLogicScripts(); bool ReplicateSubobjects(UActorChannel* Channel, class FOutBunch *Bunch, FReplicationFlags *RepFlags) override; - virtual void GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) override; // Sets the Deny Gripping variable on the FBPInterfaceSettings struct UFUNCTION(BlueprintCallable, Category = "VRGripInterface") diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableBoxComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableBoxComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableBoxComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableBoxComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCapsuleComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCapsuleComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCapsuleComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCapsuleComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCharacter.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCharacter.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCharacter.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCharacter.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h similarity index 81% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h index 53d3216..00fccca 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h @@ -17,12 +17,13 @@ public: UPROPERTY() bool bIsWelded; - bool NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess); + // Not really needed, removing it makes sure Iris will just work + //bool NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess); FRepAttachmentWithWeld(); }; -template<> +/*template<> struct TStructOpsTypeTraits< FRepAttachmentWithWeld > : public TStructOpsTypeTraitsBase2 { enum @@ -31,3 +32,4 @@ struct TStructOpsTypeTraits< FRepAttachmentWithWeld > : public TStructOpsTypeTra //WithNetSharedSerialization = true, }; }; +*/ diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h similarity index 96% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h index 7cd101f..af202ca 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h @@ -57,20 +57,23 @@ class FPhysicsReplicationAsyncVR : public IPhysicsReplicationAsync, virtual bool ResimulationReplication(Chaos::FPBDRigidParticleHandle* Handle, FReplicatedPhysicsTargetAsync& Target, const float DeltaSeconds); public: - virtual void RegisterSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject, FNetworkPhysicsSettingsAsync InSettings) override; + virtual void RegisterSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject, TWeakPtr InSettings) override; private: float LatencyOneWay; FRigidBodyErrorCorrection ErrorCorrectionDefault; - FNetworkPhysicsSettingsAsync SettingsCurrent; - FNetworkPhysicsSettingsAsync SettingsDefault; + FNetworkPhysicsSettingsData SettingsCurrent; + FNetworkPhysicsSettingsData SettingsDefault; TMap ObjectToTarget; - TMap ObjectToSettings; + TMap> ObjectToSettings; TArray ResimIslands; TArray ResimIslandsParticles; TArray ParticlesInResimIslands; TArray ReplicatedParticleIDs; + int32 ResimOutOfBoundsCounter = 0; + float ResimErrorLogTimer = 0.0f; + private: FReplicatedPhysicsTargetAsync* AddObjectToReplication(Chaos::FConstPhysicsObjectHandle PhysicsObject); void RemoveObjectFromReplication(Chaos::FConstPhysicsObjectHandle PhysicsObject); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h index 85e87a6..b3bad64 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h @@ -79,12 +79,12 @@ public: void SetReplicateGripScripts(bool NewReplicateGripScripts); inline bool GetReplicateGripScripts() { return bReplicateGripScripts; }; + // Get the grip script array, will automatically dirty it if they are replicated as it is assumed if you are directly accessing it you are altering it TArray>& GetGripLogicScripts(); bool ReplicateSubobjects(UActorChannel* Channel, class FOutBunch* Bunch, FReplicationFlags* RepFlags) override; - virtual void GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) override; // Sets the Deny Gripping variable on the FBPInterfaceSettings struct UFUNCTION(BlueprintCallable, Category = "VRGripInterface") diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSphereComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSphereComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSphereComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSphereComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h index 986c521..f330a39 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h @@ -80,7 +80,6 @@ public: TArray>& GetGripLogicScripts(); bool ReplicateSubobjects(UActorChannel* Channel, class FOutBunch *Bunch, FReplicationFlags *RepFlags) override; - virtual void GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) override; // Sets the Deny Gripping variable on the FBPInterfaceSettings struct UFUNCTION(BlueprintCallable, Category = "VRGripInterface") diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRButtonComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRButtonComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRButtonComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRButtonComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRDialComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRDialComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRDialComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRDialComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRInteractibleFunctionLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRInteractibleFunctionLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRInteractibleFunctionLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRInteractibleFunctionLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRLeverComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRLeverComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRLeverComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRLeverComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRMountComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRMountComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRMountComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRMountComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRSliderComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRSliderComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRSliderComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRSliderComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/BucketUpdateSubsystem.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/BucketUpdateSubsystem.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/BucketUpdateSubsystem.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/BucketUpdateSubsystem.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/CollisionIgnoreSubsystem.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/CollisionIgnoreSubsystem.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/CollisionIgnoreSubsystem.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/CollisionIgnoreSubsystem.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/OptionalRepSkeletalMeshActor.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/OptionalRepSkeletalMeshActor.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/OptionalRepSkeletalMeshActor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/OptionalRepSkeletalMeshActor.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRAIPerceptionOverrides.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRAIPerceptionOverrides.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRAIPerceptionOverrides.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRAIPerceptionOverrides.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicalAnimationComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicalAnimationComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicalAnimationComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicalAnimationComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicsConstraintComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicsConstraintComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicsConstraintComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicsConstraintComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRFullScreenUserWidget.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRFullScreenUserWidget.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRFullScreenUserWidget.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRFullScreenUserWidget.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h index 970d987..cc483d4 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h @@ -67,7 +67,8 @@ public: bIsDirty = false; MaxStoredMessages = 1000; GLog->AddOutputDevice(this); - GLog->SerializeBacklog(this); + // Deprecated. Do nothing because AddOutputDevice now serializes the backlog. + //GLog->SerializeBacklog(this); } ~FVROutputLogHistory() diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRPlayerStart.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRPlayerStart.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRPlayerStart.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRPlayerStart.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h similarity index 95% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h index 696817e..de6fcff 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h @@ -3,6 +3,7 @@ #include "GameFramework/Actor.h" #include "Components/ActorComponent.h" #include "Containers/Queue.h" +#include "Iris/Serialization/NetSerializer.h" #include "VRRenderTargetManager.generated.h" class UVRRenderTargetManager; @@ -385,3 +386,22 @@ protected: TQueue RenderDataQueue; }; + + +USTRUCT() +struct FBPVRReplicatedTextureStoreSerializerConfig : public FNetSerializerConfig +{ + GENERATED_BODY() +}; + +USTRUCT() +struct FRenderManagerOperationSerializerConfig : public FNetSerializerConfig +{ + GENERATED_BODY() +}; + +namespace UE::Net +{ + UE_NET_DECLARE_SERIALIZER(FBPVRReplicatedTextureStoreNetSerializer, VREXPANSIONPLUGIN_API); + UE_NET_DECLARE_SERIALIZER(FRenderManagerOperationNetSerializer, VREXPANSIONPLUGIN_API); +} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h index 687b613..575ebaf 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h @@ -36,7 +36,7 @@ struct VREXPANSIONPLUGIN_API FLayeredMove_VRMovement : public FLayeredMoveBase uint8 SettingsFlags; // Never finish this movement - virtual bool IsFinished(float CurrentSimTimeMs) const; + virtual bool IsFinished(double CurrentSimTimeMs) const; // Generate a movement virtual bool GenerateMove(const FMoverTickStartData& StartState, const FMoverTimeStep& TimeStep, const UMoverComponent* MoverComp, UMoverBlackboard* SimBlackboard, FProposedMove& OutProposedMove) override; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ParentRelativeAttachmentComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ParentRelativeAttachmentComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ParentRelativeAttachmentComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ParentRelativeAttachmentComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ReplicatedVRCameraComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ReplicatedVRCameraComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ReplicatedVRCameraComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ReplicatedVRCameraComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.h new file mode 100644 index 0000000..5808874 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.h @@ -0,0 +1,17 @@ +#pragma once + +#include "Iris/Serialization/NetSerializer.h" +#include "VRBPDatatypes.h" + +#include "FBPAdvGripPhysicsSettingsNetSerializer.generated.h" + +USTRUCT() +struct FBPAdvGripPhysicsSettingsNetSerializerConfig : public FNetSerializerConfig +{ + GENERATED_BODY() +}; + +namespace UE::Net +{ + UE_NET_DECLARE_SERIALIZER(FBPAdvGripPhysicsSettingsNetSerializer, VREXPANSIONPLUGIN_API); +} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPSecondaryGripInfoNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPSecondaryGripInfoNetSerializer.h new file mode 100644 index 0000000..2d43145 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPSecondaryGripInfoNetSerializer.h @@ -0,0 +1,17 @@ +#pragma once + +#include "Iris/Serialization/NetSerializer.h" +#include "VRBPDatatypes.h" + +#include "FBPSecondaryGripInfoNetSerializer.generated.h" + +USTRUCT() +struct FBPSecondaryGripInfoNetSerializerConfig : public FNetSerializerConfig +{ + GENERATED_BODY() +}; + +namespace UE::Net +{ + UE_NET_DECLARE_SERIALIZER(FBPSecondaryGripInfoNetSerializer, VREXPANSIONPLUGIN_API); +} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPVRComponentPosRepNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPVRComponentPosRepNetSerializer.h new file mode 100644 index 0000000..a009509 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPVRComponentPosRepNetSerializer.h @@ -0,0 +1,17 @@ +#pragma once + +#include "Iris/Serialization/NetSerializer.h" +#include "VRBPDatatypes.h" + +#include "FBPVRComponentPosRepNetSerializer.generated.h" + +USTRUCT() +struct FBPVRComponentPosRepNetSerializerConfig : public FNetSerializerConfig +{ + GENERATED_BODY() +}; + +namespace UE::Net +{ + UE_NET_DECLARE_SERIALIZER(FBPVRComponentPosRepNetSerializer, VREXPANSIONPLUGIN_API); +} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FRepMovementVRNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FRepMovementVRNetSerializer.h new file mode 100644 index 0000000..35b001e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FRepMovementVRNetSerializer.h @@ -0,0 +1,17 @@ +#pragma once + +#include "Iris/Serialization/NetSerializer.h" + +#include "FRepMovementVRNetSerializer.generated.h" + +USTRUCT() +struct FRepMovementVRCharacterNetSerializerConfig : public FNetSerializerConfig +{ + GENERATED_BODY() +}; + +namespace UE::Net +{ + UE_NET_DECLARE_SERIALIZER(FRepMovementVRCharacterNetSerializer, VREXPANSIONPLUGIN_API); + +} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FTransformNetQuantizeNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FTransformNetQuantizeNetSerializer.h new file mode 100644 index 0000000..58f6a4d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FTransformNetQuantizeNetSerializer.h @@ -0,0 +1,26 @@ +#pragma once + +#include "Iris/Serialization/NetSerializer.h" +#include "VRBPDatatypes.h" + +#include "FTransformNetQuantizeNetSerializer.generated.h" + +USTRUCT() +struct FTransformNetQuantizeNetSerializerConfig : public FNetSerializerConfig +{ + GENERATED_BODY() +}; + +namespace UE::Net +{ + UE_NET_DECLARE_SERIALIZER(FTransformNetQuantizeNetSerializer, VREXPANSIONPLUGIN_API); + + + struct alignas(8) FTransformNetQuantizeQuantizedData + { + uint64 Position[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it + uint16 Rotation[3]; + uint64 Scale[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it + uint8 UseHighPrecision : 1; + }; +} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/SerializerHelpers.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/SerializerHelpers.h new file mode 100644 index 0000000..2fdebcf --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/SerializerHelpers.h @@ -0,0 +1,144 @@ +#pragma once + +#include "CoreMinimal.h" +#include "Engine/NetSerialization.h" + +// Helpers for Iris serialization + + + + +namespace UE::Net +{ + // ----------------------------------------------------------------------------- + // Fixed-compression helpers for 0–MaxValue floats with BitCount precision + // Epic doesn't have per float compression helpers yet for Iris serializers + // ----------------------------------------------------------------------------- + + // Based on Epics FixedCompressionFloat functions for std archives + + template + uint32 GetCompressedFloat(const float Value) + { + using Details = TFixedCompressedFloatDetails; + + bool clamp = false; + int64 ScaledValue; + if (MaxValue > Details::MaxBitValue) + { + // We have to scale this down + const float Scale = float(Details::MaxBitValue) / MaxValue; + ScaledValue = FMath::TruncToInt(Scale * Value); + } + else + { + // We will scale up to get extra precision. But keep is a whole number preserve whole values + constexpr int32 Scale = Details::MaxBitValue / MaxValue; + ScaledValue = FMath::RoundToInt(Scale * Value); + } + + uint32 Delta = static_cast(ScaledValue + Details::Bias); + + if (Delta > Details::MaxDelta) + { + clamp = true; + Delta = static_cast(Delta) > 0 ? Details::MaxDelta : 0; + } + + return Delta; + } + + template + float GetDecompressedFloat(uint32 Delta) + { + using Details = TFixedCompressedFloatDetails; + + float Value = 0.0f; + + float UnscaledValue = static_cast(static_cast(Delta) - Details::Bias); + + if constexpr (MaxValue > Details::MaxBitValue) + { + // We have to scale down, scale needs to be a float: + constexpr float InvScale = MaxValue / (float)Details::MaxBitValue; + Value = UnscaledValue * InvScale; + } + else + { + constexpr int32 Scale = Details::MaxBitValue / MaxValue; + constexpr float InvScale = float(1) / (float)Scale; + + Value = UnscaledValue * InvScale; + } + + return Value; + } + + template + bool WritePackedIrisFloat2(float X, float Y, FNetBitStreamWriter* Ar) // Note Value is intended to not be a reference since we are scaling it before serializing! + { + FVector2D Value(X, Y); + + // Scale vector by quant factor first + Value[0] *= ScaleFactor; + Value[1] *= ScaleFactor; + + float MinV = -1073741824.0f; + float MaxV = 1073741760.0f; + + // Some platforms have RoundToInt implementations that essentially reduces the allowed inputs to 2^31. + const FVector2D ClampedValue = FVector2D(FMath::Clamp(Value.X, MinV, MaxV), FMath::Clamp(Value.Y, MinV, MaxV)); + bool bClamp = ClampedValue != Value; + + // Do basically FVector::SerializeCompressed + int32 IntX = FMath::RoundToInt(ClampedValue.X); + int32 IntY = FMath::RoundToInt(ClampedValue.Y); + + uint32 Bits = FMath::Clamp(FMath::CeilLogTwo(1 + FMath::Max(FMath::Abs(IntX), FMath::Abs(IntY))), 1, MaxBitsPerComponent) - 1; + + // Serialize how many bits each component will have + Ar->WriteBits(Bits, MaxBitsPerComponent); + //Ar.SerializeInt(Bits, MaxBitsPerComponent); + + int32 Bias = 1 << (Bits + 1); + uint32 Max = 1 << (Bits + 2); + uint32 DX = IntX + Bias; + uint32 DY = IntY + Bias; + + if (DX >= Max) { bClamp = true; DX = static_cast(DX) > 0 ? Max - 1 : 0; } + if (DY >= Max) { bClamp = true; DY = static_cast(DY) > 0 ? Max - 1 : 0; } + + Ar->WriteBits(DX, Max); + Ar->WriteBits(DY, Max); + + return !bClamp; + } + + template + bool ReadPackedIrisFloat2(float &X, float &Y, FNetBitStreamReader* Ar) + { + uint32 Bits = 0; + + // Serialize how many bits each component will have + Bits = Ar->ReadBits(MaxBitsPerComponent); + //Ar.SerializeInt(Bits, MaxBitsPerComponent); + + int32 Bias = 1 << (Bits + 1); + uint32 Max = 1 << (Bits + 2); + uint32 DX = 0; + uint32 DY = 0; + + DX = Ar->ReadBits(Max); + DY = Ar->ReadBits(Max); + //Ar.SerializeInt(DX, Max); + //Ar.SerializeInt(DY, Max); + + + float fact = (float)ScaleFactor; + + X = (float)(static_cast(DX) - Bias) / fact; + Y = (float)(static_cast(DY) - Bias) / fact; + + return true; + } +} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRAIController.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRAIController.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRAIController.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRAIController.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h index f04ed78..0e3284a 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h @@ -770,14 +770,14 @@ public: UPROPERTY(EditDefaultsOnly, Category = Replication, AdvancedDisplay) EVRRotationQuantization RotationQuantizationLevel; - FORCEINLINE uint16 CompressAxisTo10BitShort(float Angle) + FORCEINLINE static uint16 CompressAxisTo10BitShort(float Angle) { // map [0->360) to [0->1024) and mask off any winding return FMath::RoundToInt(Angle * 1024.f / 360.f) & 0xFFFF; } - FORCEINLINE float DecompressAxisFrom10BitShort(uint16 Angle) + FORCEINLINE static float DecompressAxisFrom10BitShort(uint16 Angle) { // map [0->1024) to [0->360) return (Angle * 360.f / 1024.f); @@ -1243,19 +1243,25 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "AdvancedGripSettings") bool bDisallowLerping; + // If true, we will not set the position on grip release of a client auth grip + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "AdvancedGripSettings") + bool bDisallowSettingPositionOnClientAuthDrop; + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "AdvancedGripSettings") FBPAdvGripPhysicsSettings PhysicsSettings; FBPAdvGripSettings() : GripPriority(1), bSetOwnerOnGrip(1), - bDisallowLerping(0) + bDisallowLerping(0), + bDisallowSettingPositionOnClientAuthDrop(0) {} FBPAdvGripSettings(int GripPrio) : GripPriority(GripPrio), bSetOwnerOnGrip(1), - bDisallowLerping(0) + bDisallowLerping(0), + bDisallowSettingPositionOnClientAuthDrop(0) {} }; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h index c63ef91..d34d935 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h @@ -7,6 +7,9 @@ #include "ReplicatedVRCameraComponent.h" #include "GameFramework/Character.h" #include "Navigation/PathFollowingComponent.h" + +#include "Iris/Serialization/NetSerializer.h" + #include "VRBaseCharacter.generated.h" class AVRPlayerController; @@ -179,6 +182,7 @@ public: CapsuleHeight(0.0f) {} + /** Network serialization */ bool NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess) { @@ -590,4 +594,29 @@ public: UFUNCTION(BlueprintCallable, Category = "VRBaseCharacter|Navigation") bool GetCurrentNavigationPathPoints(TArray& NavigationPointList); -}; \ No newline at end of file +}; + + + +USTRUCT() +struct FVRReplicatedCapsuleHeightNetSerializerConfig : public FNetSerializerConfig +{ + GENERATED_BODY() +}; + +namespace UE::Net +{ + UE_NET_DECLARE_SERIALIZER(FVRReplicatedCapsuleHeightNetSerializer, VREXPANSIONPLUGIN_API); +} + + +USTRUCT() +struct FVRSeatedCharacterInfoNetSerializerConfig : public FNetSerializerConfig +{ + GENERATED_BODY() +}; + +namespace UE::Net +{ + UE_NET_DECLARE_SERIALIZER(FVRSeatedCharacterInfoNetSerializer, VREXPANSIONPLUGIN_API); +} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacterMovementComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacterMovementComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacterMovementComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacterMovementComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacter.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacter.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacter.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacter.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacterMovementComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacterMovementComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacterMovementComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacterMovementComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionPlugin.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionPlugin.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionPlugin.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionPlugin.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGestureComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGestureComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGestureComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGestureComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGlobalSettings.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGlobalSettings.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGlobalSettings.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGlobalSettings.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGripInterface.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGripInterface.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGripInterface.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGripInterface.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPathFollowingComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPathFollowingComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPathFollowingComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPathFollowingComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPlayerController.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPlayerController.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPlayerController.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPlayerController.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRRootComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRRootComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRRootComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRRootComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRTrackedParentInterface.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRTrackedParentInterface.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRTrackedParentInterface.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRTrackedParentInterface.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/VRExpansionPlugin.uplugin b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin.uplugin similarity index 95% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/VRExpansionPlugin.uplugin rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin.uplugin index cb68065..f7e3843 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/VRExpansionPlugin.uplugin +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, - "Version": 5.4, - "VersionName": "5.4", + "Version": 5.7, + "VersionName": "5.7", "FriendlyName": "VRExpansionPlugin", "Description": "Adds several new VR features & components to UE4", "Category": "VRExpansion", diff --git a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject index 0670cf6..350eb11 100644 --- a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject +++ b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.6", + "EngineAssociation": "5.7", "Category": "", "Description": "", "Modules": [ From 6e27871a85e1f25abbde1287dca5078b69b00741 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Fri, 21 Nov 2025 16:31:04 +0100 Subject: [PATCH 56/56] Added possiblity fo Multiple Molecules in Gas Simulation, fixed Recorder Cassette instant resocketing --- VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini | 2 +- .../Content/Development/Gas_Volume/BP_GasSimulation.uasset | 4 ++-- .../Content/Development/Gas_Volume/NS_GasMolecule.uasset | 4 ++-- .../Development/StarterContent/Materials/M_Basic_Wall.uasset | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap | 4 ++-- .../Content/Maps/Map_Room_Kitchen.umap | 4 ++-- VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap | 4 ++-- .../Content/VRE/Misc/Meshes/CubeMaterial.uasset | 4 ++-- .../Interactibles/Electrical/Recorder/BP_Cassette.uasset | 4 ++-- .../Interactibles/Electrical/Recorder/BP_Recorder.uasset | 4 ++-- .../World/Interactibles/Electrical/Recorder/lambert2.uasset | 4 ++-- .../Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini index 1961395..e47a497 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini @@ -33,7 +33,7 @@ ConfiguredInternetSpeed=15000 ConfiguredLanSpeed=20000 [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/Maps/MotionControllerMap.MotionControllerMap +EditorStartupMap=/Game/Maps/Map_Gameworld.Map_Gameworld LocalMapOptions= TransitionMap= bUseSplitscreen=False diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/BP_GasSimulation.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/BP_GasSimulation.uasset index 1e1492c..aaea58f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/BP_GasSimulation.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/BP_GasSimulation.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd61996e84432b5330c09cdbc787570e9b9d79aeb2230f9bfa63ad4ef0523ff5 -size 188830 +oid sha256:dcafe50b316766443d3bc3e2e6dc7206a97db00e65206d19d26a33d769264003 +size 184312 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset index 73af1b0..24b2cb9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd437421278119b256089f916247bc49c109dd871a341feacdbd499924ebb510 -size 1076452 +oid sha256:d4b1b55adfa0da546cd8734ac4fd3e9726931a3fd3ffe9cab853ca50db384b01 +size 1195538 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Materials/M_Basic_Wall.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Materials/M_Basic_Wall.uasset index cdb1333..097a230 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Materials/M_Basic_Wall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Materials/M_Basic_Wall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:919c4baee1f3f43cbf9c24f8bdafdd0b9e8a75df33334289fbf54c41df3ead5b -size 10666 +oid sha256:67ae7b5db4a19280b5d8f61fc6cf278ad2927f83c9b4bda6bbbe918a58605827 +size 10834 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 5d4cc47..7544b9a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fde1912607584bc937fd78604b0a79cbf3763465ebc7b7ba398784b167f39fbb -size 5208597 +oid sha256:b4d0ad5d2f0a8a953095a3582fd9a576238759f270f998f1f8d88d11bb7f9bab +size 5223816 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index faa2092..e145a22 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b49e5c73638e0819992d9a105c72d12582d42cb9306399ffa415a5ad2c90dcbd -size 113742 +oid sha256:49252178c08a3d2a1fb90c6fc64832b3b7951c13f00b32060bd57238cb3299cb +size 154114 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 8b158de..6c95134 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3042ed3c68d29a64875927b42caa7e0bb8a4d2125eb25165470c019b36987468 -size 224870 +oid sha256:ada1a6252a8be3899d81330cd959410ff27843090204052ac780c4149757b1c3 +size 206649 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Misc/Meshes/CubeMaterial.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Misc/Meshes/CubeMaterial.uasset index 0f7734f..636ef09 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Misc/Meshes/CubeMaterial.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Misc/Meshes/CubeMaterial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dd4694fe989e2d99ce8e2711f4e21f693f637f892a577ad6ed2c85b7cd11222 -size 9758 +oid sha256:821b47b596a8504a5ec3575960ad04a3d64776404a01acd292dc6cd062e7fb2f +size 9926 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset index a241a95..737edb7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4ac84d845865f14502e6c17ad27aec503111bd9d782ee0ab7f91c09f9a44d52 -size 44106 +oid sha256:3a368ce33994c1d48403c6702ce1c09d37c43cd5e1382b355c7c7d8989d16320 +size 96396 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset index 4e2b2b9..76b3595 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:858a3e2c34e0bd47f1eaa8d551a3ef27cb3d05509ad3789f55fa38e0f253aa42 -size 447714 +oid sha256:5f4234dac7525dbfafe93f936fdff323d3aba033ab449c0dc2f9996f8511dda9 +size 465240 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/lambert2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/lambert2.uasset index 035ac75..cd9e88d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/lambert2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/lambert2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56cf73229be96ef550ac8572e63e6e884d3485a76b895abd85d1a2f8abbcfbd4 -size 25346 +oid sha256:685dcfb7b47361e62239072beb6c8f0642df009652acca2e11b987d184a69c10 +size 25061 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset index c7c65db..ab0f448 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:511e1783556469bdd20aac67909cfd19a9a0eb0b56acdab618ae8b3624f29bf6 -size 63276 +oid sha256:bbfa33606256d82415e4307709ec66d40805853acf010070907de70efdb41e03 +size 65301