Merge endless-sky master to experimental, resolving Ship.cpp differences from refactor of Ship::Move#28
Merged
Zitchas merged 107 commits intoendless-sky:experimentalfrom UnorderedSigh:experimental-update-to-masterJul 3, 2023
+6,336-3,780
Commits
Commits on May 10, 2023
Commits on May 11, 2023
feat(AI): "lingering" personality tells ships to stay in a system for a while even if they have nothing to do (endless-sky#8125)
authoredfix(outfitter): Properly check license requirements when buying an outfit that is also in storage (endless-sky#8749)
authoredfeat(conversation text): Conversation text can include formatted condition values (endless-sky#8421)
authored
Commits on May 12, 2023
Commits on May 14, 2023
Commits on May 22, 2023
Commits on May 27, 2023
Commits on May 29, 2023
- authored
- authored
- authored
- authored
Commits on May 31, 2023
- authored
- authored
- authored
- authored
- authored
Commits on Jun 2, 2023
Commits on Jun 3, 2023
Commits on Jun 4, 2023
- authored
- authored
- authored
- authored
- authored
- authored
Commits on Jun 5, 2023
Commits on Jun 8, 2023
Commits on Jun 13, 2023
- authored
fix(AI): Prevent a corner case in AI::DoScatter that can cause ships to "lock together" (endless-sky#8858)
authored- authored
- authored
- authored
- authored
- authored
- authored
- authored
- authored
- authored
feat(content): Properly account for suspension from the FW militia in FW Diplomacy 1 (endless-sky#8884)
authoredfeat(content): Make the missions that trigger the Kestrel available events fail instead of persisting (endless-sky#8849)
Commits on Jun 14, 2023
- authored
- authored
- authored
- authored
- authored
- authored
- authored
fix(content): Remnant broken jump drive deliveries no longer select planets with the "remnant station" attribute as destinations (endless-sky#8897)
authored- authored
- authored
feat(content): Make the local Quarg instantly don't like you if you attack the Gegno (endless-sky#8782)
authored
Commits on Jun 15, 2023
- authored
- authored
- authored
fix(content): Refer to an existing named phrase instead of reproducing all its combinations in a new item (endless-sky#8910)
authoredfix(content): Prevent "financial analyst" news from appearing on human worlds while they are occupied by the Pug (endless-sky#8912)
authored- authored
Commits on Jun 17, 2023
Commits on Jun 18, 2023
fix/refactor(Ship): Refactor Ship::Move to prevent a bug where some destroyed ships with high hull regeneration are improperly handled (endless-sky#8855)
fix(NPC): Create NPCAction that wraps MissionAction for NPCs and records usage to prevent crash (endless-sky#8881)
authoredfix(AI): Allow a ship that is currently targeting an asteroid to consider targeting another ship (endless-sky#8915)
authoredfix(content): Ensure that Unfettered escorts in HR A13-A are not erroneously hostile to the player (endless-sky#8791)
authored- authored
feat(content): Add a mission chain about rescuing the crew of a downed Efreti vessel (endless-sky#8763)
Commits on Jun 19, 2023
Commits on Jun 22, 2023
- committed
- committed
- committed
- committed
- committed
- authored
- authored
feat(content): Add text reminding the player to hail Greenrock in "Deal Change 2" (endless-sky#8933)
authoredfeat(ai): Make motherships and carried ships recharge each other from battery power (endless-sky#8385)
authored
