Permalink
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
...
- 2 commits
- 13 files changed
- 4 contributors
Commits on Apr 26, 2024
-
Next major step for rubik's third mission (#73221)
* Ask the teamster if they've seen the exodii warehouse * Finish off the talk and the code, add to Smokes as well * move responses to a common file and add scrap trader * lint * Update exodii_merchant_missions.json * Update common_talk.json * thanks for the proofread qrox Co-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com> * lintylinty * give John Bailey a chance to answer * Ask refugee A about it * You can ask the camper van traveler * The lumbermill logger might know * Update common_talk.json * errors caught on playtest includes an incidental punctuation fix. * remove accidentally committed playtest info * some cleanup on rubik's dialogue * playtest fixes * Update exodii_merchant_talk.json * Update common_talk.json --------- Co-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>
-
Fixed segfault when an NPC completes a pickup after a player has alre…
…ady taken it (#73275) Co-authored-by: Levitator <125339844+Levitator0@users.noreply.github.com>
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff cdda-experimental-2024-04-26-1727...cdda-experimental-2024-04-26-2043