Updating from upstream 2024 05 18 #152
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: quyykk <quyykk@protonmail.com>
…llow their government travel restrictions (endless-sky#9412)
…player has visited (endless-sky#6127)
…ing between differently sized rows (endless-sky#9617)
…dless-sky#9622) Ser -> Captain `<destination>` -> `<stopovers>` in a mission dialog.
… the trading panel (endless-sky#9623)
…ore helpful (endless-sky#10017) Co-authored-by: mOctave <73318970+mOctave@users.noreply.github.com>
…nlocked outfits (endless-sky#9819) Co-authored-by: Quantumshark <thedup.adg@gmail.com>
…lant 5 point to the right npc (endless-sky#10036)
Co-authored-by: EjoThims <JEIPH@MAC.COM>
…Mystery and Cognizance (endless-sky#10028)
…less-sky#7025) Co-authored-by: EjoThims <JEIPH@MAC.COM> Co-Authored-By: Nick <85879619+quyykk@users.noreply.github.com> Co-authored-by: Peter van der Meer <peter.vd.meer@gmail.com> Co-authored-by: TomGoodIdea <108272452+TomGoodIdea@users.noreply.github.com> Co-authored-by: warp-core <warp-core@users.noreply.github.com> Co-authored-by: Zitchas <32169904+Zitchas@users.noreply.github.com>
"cloaking shield" -> "cloaking shields"
…#9961) Co-authored-by: bene_dictator <benstaples8068@gmail.com>
* Introduce a capability to limit the rotation of a turret. Co-authored-by: Hurleveur <94366726+Hurleveur@users.noreply.github.com> Co-authored-by: oo13 <ooyooxei+gh@gmail.com> Co-authored-by: OOTA, Masato <ooyooxei+gh@gmail.com> Co-authored-by: Rising Leaf <85687254+RisingLeaf@users.noreply.github.com> Co-authored-by: tehhowch <tehhowch@users.noreply.github.com> Co-authored-by: tibetiroka <68112292+tibetiroka@users.noreply.github.com> Co-authored-by: TomGoodIdea <108272452+TomGoodIdea@users.noreply.github.com>
…sitioning (endless-sky#10059) Co-authored-by: Rising Leaf <85687254+RisingLeaf@users.noreply.github.com>
… completed the missions after it (endless-sky#10056)
…9740) * "Drug Running" missions are now "infiltrating"; * Added (and used) generic aborted phrases for pirate slave jobs; * Failing or aborting a pirate slave job causes a reduction in reputation with the "Pirate" government; * Many jobs now have a minimum travel distance of 4, instead of 3, to prevent them from involving travelling between the Men system and a CCOR world, as this route does not involve any territory hostile to pirates. Affected jobs: * "Cargo Smuggling", "Bulk", and "Stealth (South)" variations, * "Drug Running", and "Stealth (South)" variation, * "Slave Transport", and "Bulk" variation, * "Escort Illegal Cargo" South variation, and * "Escort Stolen Vessel" South variation; * The targets NPCs in "Eliminating Law Enforcement" jobs have been given the "marked" personality; * Alphabetized the list of personalities for the target NPCs in "Eliminating Competition" jobs; * Various jobs will only place NPCs in systems neighbored by a non-Pirate system. Affected jobs are: * "Eliminating Law Enforcement" Core and South variations, * "Raid on Merchants" North and South variations, and * "Cargo Theft (South)"; and * Various jobs will only offer from systems neighbored by a non-Pirate system (that is, they will no longer offer from CCOR worlds). Affected jobs are: * "Eliminating Law Enforcement (South)", * "Southern Pirate Defense", * "Cargo Theft (South)", and * "FW Assassination".
…pstream-2024-05-18
Zitchas
merged commit c82ea01
into
f(d)-Delta-Additional-Zoom-Levels
16 of 18 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Exactly what the name says: Updating the zoom levels PR with all the changes since then.