Closed littae2 closed 2 years ago
Fixed the issue of version pulled from main rather than dev as it was more up to date, which i think are the issue of the merge conflicts.
Files/Folders changed: Content/:
Content/Characters:
Content/Characters/Ship:
Content/GUI/assets: Reduced assets folder to only ones i use
Content/GUI/Blueprints: i havent programed for twinsticks controls, but can do
Content/StringTableCSV:
Content/Maps:
Video of GUI in action (tab for Crew info and Enter for shop UI): https://user-images.githubusercontent.com/61172610/173566319-680b3642-3fe2-4a32-9d70-5e368831628f.mp4
Changes to SirenLeg:
Fixed the issue of version pulled from main rather than dev as it was more up to date, which i think are the issue of the merge conflicts.
Files/Folders changed: Content/:
Content/Characters:
Content/Characters/Ship:
Content/GUI/assets: Reduced assets folder to only ones i use
Content/GUI/Blueprints: i havent programed for twinsticks controls, but can do
Content/StringTableCSV:
Content/Maps:
Video of GUI in action (tab for Crew info and Enter for shop UI): https://user-images.githubusercontent.com/61172610/173566319-680b3642-3fe2-4a32-9d70-5e368831628f.mp4
Changes to SirenLeg:
