Implemented equipping hardpoints

2024-09-26 14:59:27 -05:00
parent f6b3b90376
commit 6106f5610a
24 changed files with 51 additions and 29 deletions
--- 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
--- a/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset
+++ b/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset
--- a/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset
+++ b/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset
--- a/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset
+++ b/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset
--- a/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset
+++ b/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset
--- a/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_Hardpoints.uasset
+++ b/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_Hardpoints.uasset
--- a/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_WeaponUpgrades.uasset
+++ b/Content/ModularShipSystem/Demo/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_WeaponUpgrades.uasset
--- a/Content/ModularShipSystem/Demo/Materials/MI_SpaceStation.uasset
+++ b/Content/ModularShipSystem/Demo/Materials/MI_SpaceStation.uasset
--- a/Content/ModularShipSystem/Demo/Materials/M_BasicColor.uasset
+++ b/Content/ModularShipSystem/Demo/Materials/M_BasicColor.uasset
--- a/Content/ModularShipSystem/Demo/Meshes/Hardpoints/CrappyTurret.uasset
+++ b/Content/ModularShipSystem/Demo/Meshes/Hardpoints/CrappyTurret.uasset
--- a/Content/ModularShipSystem/Demo/Meshes/Hardpoints/CrappyTurret_Skeleton.uasset
+++ b/Content/ModularShipSystem/Demo/Meshes/Hardpoints/CrappyTurret_Skeleton.uasset
--- a/Content/ModularShipSystem/Demo/Meshes/Ships/CrappyShip.uasset
+++ b/Content/ModularShipSystem/Demo/Meshes/Ships/CrappyShip.uasset
--- a/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset
+++ b/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset
--- a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset
+++ b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset
--- a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset
+++ b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset
--- a/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset
+++ b/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset
--- a/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset
+++ b/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset
--- a/Content/ModularShipSystem/Structs/S_BaseShipInformation.uasset
+++ b/Content/ModularShipSystem/Structs/S_BaseShipInformation.uasset
--- a/Content/ModularShipSystem/Structs/ShopStructs/S_HardpointShopInfo.uasset
+++ b/Content/ModularShipSystem/Structs/ShopStructs/S_HardpointShopInfo.uasset
--- a/Content/ExternalActors/ThirdPerson/Maps/ThirdPersonMap/3/OP/YLCCW4C4V38C1Q4RGRBAIM.uasset
+++ b/Content/ExternalActors/ThirdPerson/Maps/ThirdPersonMap/3/OP/YLCCW4C4V38C1Q4RGRBAIM.uasset
--- a/ProjectZIP.zip
+++ b/ProjectZIP.zip
--- a/SourceAssets/CrappyShip.blend
+++ b/SourceAssets/CrappyShip.blend
--- a/SourceAssets/CrappyShip.blend1
+++ b/SourceAssets/CrappyShip.blend1
--- a/SourceAssets/CrappyTurret.fbx
+++ b/SourceAssets/CrappyTurret.fbx