diff --git a/.gitattributes b/.gitattributes index c5a80de..3332f8d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -29,6 +29,7 @@ *.[xX][cC][fF] filter=lfs diff=lfs merge=lfs -text *.[tT][iI][fF] filter=lfs diff=lfs merge=lfs -text *.[tT][iI][fF][fF] filter=lfs diff=lfs merge=lfs -text +*.[zZ][iI][pP] filter=lfs diff=lfs merge=lfs -text # Other supported formats: *.[hH][dD][rR] filter=lfs diff=lfs merge=lfs -text diff --git a/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset b/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset new file mode 100644 index 0000000..4f76e0b --- /dev/null +++ b/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b775e8fc48cd965bedcf727568ddbf44d4f4f3561f107bd6ed10bc91f97e80df +size 33849 diff --git a/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset b/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset index f1cadae..fb884c0 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:314db3bb9530f7ba87da4ecd1730b769ef2ef2aa898bdba035835d1c218e0b5f -size 147858 +oid sha256:2dbc11370b4be75c8693f430af0d4d34b27ca7e95cd339038fa1a9641a7b92ac +size 158316 diff --git a/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset b/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset index df961e0..75c29f9 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:4e101c88f2ee54ec1aa254589da5b9e713435c6014e38a35f5321f9ac70898c4 -size 46638 +oid sha256:ca8e466b991723437dc048b7c5c3b727d749b45766a690eb49c5dc9b0e0f87aa +size 55560 diff --git a/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset b/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset index 8a49179..a5c4a1b 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:90ea9526f82663660ad7913401321940cd46e345ca959cf732cdb18dcb0d2b21 -size 292164 +oid sha256:2153290a90d0c8e7357d727bc555fe8ee3c99a0089e4ea4fddc78f4448d4053c +size 300808 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 435b409..198c179 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:7d23bff3690b4bfa9bb8a4d27a7af3c4e5c96c412275282f486f9937b0914aea -size 8864 +oid sha256:44d6eb2deee910694a29172f37f411d629a3cd79bde4f05d4adaa595f3492693 +size 8763 diff --git a/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_WeaponUpgrades.uasset b/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_WeaponUpgrades.uasset index 1962b17..76875eb 100644 --- a/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_WeaponUpgrades.uasset +++ b/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_WeaponUpgrades.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2df64f079532b534b71e672404981b5e0fddc2302baa4c3ad1fdbea756ee81e3 -size 9402 +oid sha256:1f46c1c7c94fc1e24b3491d8bd2bff4ae79a1956d46aa893ec52c6bfe0ce97fe +size 8967 diff --git a/Content/ModularShipSystem/Demo/Materials/MI_SpaceStation.uasset b/Content/ModularShipSystem/Demo/Materials/MI_SpaceStation.uasset index a32da49..b3b6066 100644 --- a/Content/ModularShipSystem/Demo/Materials/MI_SpaceStation.uasset +++ b/Content/ModularShipSystem/Demo/Materials/MI_SpaceStation.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24909812eb7c911964dad3b1b2f076aa745ebd0a9e1190aed2f400b20df179e1 -size 9991 +oid sha256:e737ebac1b4a131a7ff463dfe90785d2fc228187ed8084b6b5266338abd8b149 +size 10089 diff --git a/Content/ModularShipSystem/Demo/Materials/M_BasicColor.uasset b/Content/ModularShipSystem/Demo/Materials/M_BasicColor.uasset index 775a887..71aa79c 100644 --- a/Content/ModularShipSystem/Demo/Materials/M_BasicColor.uasset +++ b/Content/ModularShipSystem/Demo/Materials/M_BasicColor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49dddcd04a393e16ee895b6218da613a9889ac7a7b81c029ddcb96e31907de3b -size 13502 +oid sha256:353f35ec3502ee7e9fede7a663ceb986dd8dc9a7e7bf3170321268af89085e2c +size 13733 diff --git a/Content/ModularShipSystem/Demo/Meshes/Hardpoints/CrappyTurret.uasset b/Content/ModularShipSystem/Demo/Meshes/Hardpoints/CrappyTurret.uasset new file mode 100644 index 0000000..c53a996 --- /dev/null +++ b/Content/ModularShipSystem/Demo/Meshes/Hardpoints/CrappyTurret.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3edffceee7dfd6aefe430e3eaa038f2aa1ff9466b813b3045d18b06a8b0d0ebb +size 890765 diff --git a/Content/ModularShipSystem/Demo/Meshes/Hardpoints/CrappyTurret_Skeleton.uasset b/Content/ModularShipSystem/Demo/Meshes/Hardpoints/CrappyTurret_Skeleton.uasset new file mode 100644 index 0000000..0b25166 --- /dev/null +++ b/Content/ModularShipSystem/Demo/Meshes/Hardpoints/CrappyTurret_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2889ffafdfc8387d4407b5bfbf275ee5574936f73c14f27aca7836777ab966ab +size 7531 diff --git a/Content/ModularShipSystem/Demo/Meshes/Ships/CrappyShip.uasset b/Content/ModularShipSystem/Demo/Meshes/Ships/CrappyShip.uasset index b4f8ab4..d14cd82 100644 --- a/Content/ModularShipSystem/Demo/Meshes/Ships/CrappyShip.uasset +++ b/Content/ModularShipSystem/Demo/Meshes/Ships/CrappyShip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecd6078a658a3bfc3036012fdcbf7bcc9adbf9c2f0de05affc0e3b0a1603052d -size 50600 +oid sha256:7377b294b87d3c152b6e1e1f71bfa5f8948f3573a747eeadd5c533a2637d995d +size 50787 diff --git a/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset b/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset index 82e0952..045189c 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:63db3984fa9ad814abbeea4491998706af646df44c396af5eeaf5e2d43dda3e6 -size 469383 +oid sha256:6776dcda31054e03a6354b25b5451143eacc15b8d33e962059b8f7906fb967dc +size 493318 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset new file mode 100644 index 0000000..0be1c26 --- /dev/null +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d74e67d3d0c1d8925ca8ebcf9d51bd0c38f134d75d8ec6e215892e16fe8ff0fa +size 75387 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset new file mode 100644 index 0000000..b7de439 --- /dev/null +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:899bbf3cf71bccbf57d59afb0ca50b023332d96fe75722748df741db20b1145b +size 96938 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset index e223b0f..b6fa5b3 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:aaa3313d1eb2920338d9c26e28c3ce81fefdfae22c44e5612ea05bbcf022e271 +oid sha256:0b5e773297aff58b5eb10fde56955fb55db11412888663c1d5dead96771a9d3b size 61290 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset index e47dee0..3554ce5 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:16509b750ab9fb8779d828dec0a9c6516b9de83afa8a8846eca426cf74ecafe9 -size 941583 +oid sha256:89939baea834f76836f1afeccb01559d8f73f5cfb03ee080341f397fa9f13393 +size 1016759 diff --git a/Content/ModularShipSystem/Structs/S_BaseShipInformation.uasset b/Content/ModularShipSystem/Structs/S_BaseShipInformation.uasset index 58c6365..f102584 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:e5d3b8b5753252c173deef2cf95b5ddcd793b3d85bc42b7e8427bf126450f45d -size 7584 +oid sha256:ea349283f9671a632f2362813b00ebab7e147148322191556ce7fec4152d4c34 +size 8753 diff --git a/Content/ModularShipSystem/Structs/ShopStructs/S_HardpointShopInfo.uasset b/Content/ModularShipSystem/Structs/ShopStructs/S_HardpointShopInfo.uasset index 1c460dd..52292eb 100644 --- a/Content/ModularShipSystem/Structs/ShopStructs/S_HardpointShopInfo.uasset +++ b/Content/ModularShipSystem/Structs/ShopStructs/S_HardpointShopInfo.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:973a1253d01a23086c741d429e1be9bab5d3635690c9015ca8772e043e87991d -size 7856 +oid sha256:7a5a91b7da5163f4bad6019770739b3d89aa6a473e800a69d2a9c7d5ca97600f +size 7883 diff --git a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/OP/YLCCW4C4V38C1Q4RGRBAIM.uasset b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/OP/YLCCW4C4V38C1Q4RGRBAIM.uasset index 2d623c2..240b46d 100644 --- a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/OP/YLCCW4C4V38C1Q4RGRBAIM.uasset +++ b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/OP/YLCCW4C4V38C1Q4RGRBAIM.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec26c67a55dd5be866cbd290b8110ffd8c0db1b8b17340696b6dce65fa11b31e -size 12669 +oid sha256:ca4b6bfc9ed52725a81bd33e13380f9941ebb09fe539d1ad8c5b29eb8ecc2fdf +size 12689 diff --git a/ProjectZIP.zip b/ProjectZIP.zip new file mode 100644 index 0000000..c9e96b2 --- /dev/null +++ b/ProjectZIP.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7b17962d1cc5a842ff24b5930c29c1517dd1b01e6dca7266d1636e8067a69af +size 340106982 diff --git a/SourceAssets/CrappyShip.blend b/SourceAssets/CrappyShip.blend index d528961..066bfc9 100644 --- a/SourceAssets/CrappyShip.blend +++ b/SourceAssets/CrappyShip.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85242cc135b5109bf42598e08c797397d3eb2221ae5924ad38f26dc2f4d5c09d -size 2122114 +oid sha256:6c4addde2a43c6c7de0a4b97ec47647fad275c8b45ab3818c7c4b891561e1032 +size 2385694 diff --git a/SourceAssets/CrappyShip.blend1 b/SourceAssets/CrappyShip.blend1 index 9c5e94e..1338871 100644 Binary files a/SourceAssets/CrappyShip.blend1 and b/SourceAssets/CrappyShip.blend1 differ diff --git a/SourceAssets/CrappyTurret.fbx b/SourceAssets/CrappyTurret.fbx new file mode 100644 index 0000000..b0230d9 --- /dev/null +++ b/SourceAssets/CrappyTurret.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc98afbebd613c736f4735a495f597ef4511877e495626049b5a1b4ca64c58b4 +size 67004