From 0ac80971b38a5198da9f098e034150180fafa47f Mon Sep 17 00:00:00 2001 From: Kyle Austad Date: Mon, 30 Sep 2024 12:19:31 -0500 Subject: [PATCH] Hardpoints fully implemented --- Content/ModularShipSystem/Blueprints/BPFL_ShipSystem.uasset | 3 +++ Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset | 4 ++-- Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset | 4 ++-- .../Blueprints/Interfaces/BPI_ShipCore.uasset | 4 ++-- .../ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset | 4 ++-- .../DT_WatchtowerStation_Hardpoints.uasset | 4 ++-- .../ModularShipSystem/Demo/Input/MyInputMappingContext.uasset | 2 +- Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset | 4 ++-- Content/ModularShipSystem/Demo/Widgets/WBP_BaseUI.uasset | 4 ++-- Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset | 4 ++-- .../ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset | 4 ++-- .../ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset | 4 ++-- .../ModularShipSystem/Demo/Widgets/WBP_OutfittingMenu.uasset | 4 ++-- .../Demo/Widgets/WBP_OutfittingSelectionMenu.uasset | 3 +++ .../Demo/Widgets/WBP_OutfittingSlotSingle.uasset | 3 +++ .../ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset | 4 ++-- .../ModularShipSystem/Demo/Widgets/WBP_UndockPrompt.uasset | 4 ++-- .../ModularShipSystem/Structs/S_AttachActorVariables.uasset | 4 ++-- .../ModularShipSystem/Structs/S_BaseShipInformation.uasset | 4 ++-- ProjectZIP.zip | 4 ++-- 20 files changed, 42 insertions(+), 33 deletions(-) create mode 100644 Content/ModularShipSystem/Blueprints/BPFL_ShipSystem.uasset create mode 100644 Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingSelectionMenu.uasset create mode 100644 Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingSlotSingle.uasset diff --git a/Content/ModularShipSystem/Blueprints/BPFL_ShipSystem.uasset b/Content/ModularShipSystem/Blueprints/BPFL_ShipSystem.uasset new file mode 100644 index 0000000..48e28ca --- /dev/null +++ b/Content/ModularShipSystem/Blueprints/BPFL_ShipSystem.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56400072903570231f67b0318e3f3a04547c9db31869ffeb3579cadd50659f27 +size 100581 diff --git a/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset b/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset index 423d0c1..d993589 100644 --- a/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset +++ b/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c8e325a4c3524ff171e8e364f21bbedae9584d045450b112adebbcc040a02a9 -size 83335 +oid sha256:d8bb49bd92bd5d89b4d37c03afd20198d0a947bfdcb434083667cb377cbeacdf +size 87519 diff --git a/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset b/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset index 9091a79..d3a3286 100644 --- a/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset +++ b/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e180ccbe50658fae2c0678e10c8892352b49d784c37ed7c3c60de670e6c61b9 -size 166911 +oid sha256:8309f9481b22413877847b2a55e1c1fda92c525648c94f269679bf37fce347c3 +size 196944 diff --git a/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset b/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset index 6b76b5f..b0af198 100644 --- a/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset +++ b/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a78b523d5bb8329150bbceceb6a6249e92508cdd691fa1b86ec821825fe2b8bc -size 78146 +oid sha256:83ba38649339eb789558d44cc7f276303cdb019301737772ca23790253d8eb31 +size 79814 diff --git a/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset b/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset index c54adba..475e7ce 100644 --- a/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset +++ b/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcea0de25b1caab16c09406fca1f8e7a6b7488228816db07ff3f344ac8409c91 -size 283469 +oid sha256:3bc55f6b1e7d49459a203639de4c0d504be25686789753bd43602ecc71e29463 +size 297153 diff --git a/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_Hardpoints.uasset b/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_Hardpoints.uasset index 198c179..00a50d2 100644 --- a/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_Hardpoints.uasset +++ b/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_Hardpoints.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44d6eb2deee910694a29172f37f411d629a3cd79bde4f05d4adaa595f3492693 -size 8763 +oid sha256:37901e03aa47101e7c89c3db457d3869f80e249f8bcf56ec1895ed3df741d2ad +size 8804 diff --git a/Content/ModularShipSystem/Demo/Input/MyInputMappingContext.uasset b/Content/ModularShipSystem/Demo/Input/MyInputMappingContext.uasset index 494eb62..c5b5707 100644 --- a/Content/ModularShipSystem/Demo/Input/MyInputMappingContext.uasset +++ b/Content/ModularShipSystem/Demo/Input/MyInputMappingContext.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e641ef94df847cbb73e53d4a10df9387c354a31f6b7c5594c305263ba9a6a216 +oid sha256:1d31cc27588554584ab429e8fba4374e32e44c11317be96e7c5b652f1c3ac384 size 6468 diff --git a/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset b/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset index 245f1d5..c0a478b 100644 --- a/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset +++ b/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8500cd6565da36ad078c08e4ea5cdfe4783b04ebb7ae22e0096214980f58bb9 -size 880927 +oid sha256:eb0cfb2c5da6cd82bd0de12614d1e109c5ebf49af9424d4bb3204df25bab4b37 +size 1073692 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_BaseUI.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_BaseUI.uasset index f3d7864..4178472 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_BaseUI.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_BaseUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:374732e61ae44483c9d94bc9b822859c0e9c1ca28140104634f4446dcfe97abb -size 27130 +oid sha256:251c9cf9d26a056ef07c44f067102487c03ca9d61d81faf4085744de55d7d598 +size 76145 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset index 5a7eb10..5372efa 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d805b637ba4488264741bb38db808d7c06374b2fca8f7f36e2bedcc314f993f -size 74930 +oid sha256:7f2687818b027a5fe7976b68864e07edc7c2370a4727602b06e4e8af953a0e64 +size 74992 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset index 0f5d09d..7514854 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6a49459ce3054d9886d36e3942c987f742dc929db3736b3e00f7970a706e3bb -size 628142 +oid sha256:6fdb1752d9946e0ff618453299dcf6308732b4f01d1e6a468b7104ef42a1db55 +size 303547 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset index 5099531..8a13400 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2fd39f0a3a1de51866c195d950254eb3ffba0dcb6741f2a50af96294604dd08 -size 61290 +oid sha256:1c995350fd091c23c7e61ec8f16c8ae484ffb3e9a8ce68cd1c96d248c67a494a +size 61325 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingMenu.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingMenu.uasset index 1db4264..f02a1e1 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingMenu.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16d971d47b60868b9cf5eb61b5a71ed885b80d2514c01dbf1c0a24f95c31a3b7 -size 60820 +oid sha256:a3fe8671c2ecb4869e32cfc0c584bab386af1a46df9941647b0b8569d6554cc7 +size 370520 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingSelectionMenu.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingSelectionMenu.uasset new file mode 100644 index 0000000..233cae8 --- /dev/null +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingSelectionMenu.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a65f810a4aedd1a86fbf474faeda0f34d76f363dd3473a92231c2a06b497d00 +size 107875 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingSlotSingle.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingSlotSingle.uasset new file mode 100644 index 0000000..ab5c489 --- /dev/null +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingSlotSingle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4267e594989a58130bdeee7924ba6aba0e6ecfb8215e55418a9124afbd4ef512 +size 499930 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset index 5c64b49..3cc73ed 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:736e45e442eb0541beae720149ddc47cdd28d8a149596cbd6d167c9963209b7d -size 1111805 +oid sha256:3dd48617e2b9297d69ef7e0b4454697145297fc225fbd67aa2f3d7b6044d47aa +size 1163170 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_UndockPrompt.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_UndockPrompt.uasset index 9b4e4a0..57b6ce2 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_UndockPrompt.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_UndockPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe175e465e84981567447529e6ade7021d7ba4809e497c5c9c56f99115e29d59 -size 30427 +oid sha256:f91fd819d3c50483abf438c8709af823f8b09663eaf9098c7dc25ec411d0805d +size 34005 diff --git a/Content/ModularShipSystem/Structs/S_AttachActorVariables.uasset b/Content/ModularShipSystem/Structs/S_AttachActorVariables.uasset index 5a9cf4d..7107e8e 100644 --- a/Content/ModularShipSystem/Structs/S_AttachActorVariables.uasset +++ b/Content/ModularShipSystem/Structs/S_AttachActorVariables.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b84f06141db02bfd26f9f61d08f38a06975ec01d847c016c659339095deb404 -size 16652 +oid sha256:7ac85b16475f2948386bc26ce44faf1656e76a2795d5e3eb82caaa3855512d3a +size 18636 diff --git a/Content/ModularShipSystem/Structs/S_BaseShipInformation.uasset b/Content/ModularShipSystem/Structs/S_BaseShipInformation.uasset index f102584..2ba8e94 100644 --- a/Content/ModularShipSystem/Structs/S_BaseShipInformation.uasset +++ b/Content/ModularShipSystem/Structs/S_BaseShipInformation.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea349283f9671a632f2362813b00ebab7e147148322191556ce7fec4152d4c34 -size 8753 +oid sha256:f1bdb5c448a370bfd35b7e094d69e7bd9e4be53380c4f1fb58face464752e1b6 +size 9673 diff --git a/ProjectZIP.zip b/ProjectZIP.zip index c9e96b2..6a0c003 100644 --- a/ProjectZIP.zip +++ b/ProjectZIP.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7b17962d1cc5a842ff24b5930c29c1517dd1b01e6dca7266d1636e8067a69af -size 340106982 +oid sha256:69516767a159d75171c1df6b21b1501fb6d8f27e97933aff83f709d15b4c8c07 +size 340485830