-
Notifications
You must be signed in to change notification settings - Fork 37
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Cleanup 3rd set of outstanding PRs #189
Merged
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
Contributor
jt-traub
commented
May 7, 2024
•
edited
Loading
edited
- Too few trade goods causes infinite loop
- Pull in the work from PR No trade items bugfix #54
- Avoid an infinite loop when we have less than 4 trade items.
- Pull in the work from PR No trade items bugfix #54
- Clean up food item cost display in rules
- Pull in work from PR Rules say no fractional food #120
- Remove an extraneous comma
- Add text saying partial food is lost.
- Update rules snapshots with changes.
- Pull in work from PR Rules say no fractional food #120
- Update rules to explain order of maintenance costs
- Pulled in changes from PR Added clarification on how maintenance fee is paid #111
- Added section to rules showing order of maintenance payments.
- Updated snapshots to reflect changes.
- Pulled in changes from PR Added clarification on how maintenance fee is paid #111
- Fix longstanding economy bug
- Pulled in changes from PR Update economy.cpp #8
- economic improvement never counted users selling trade goods to a city/town
- Fix logical bug in world generation code
- Pulls in changes from PR Fix using assignation instead of compare #53
- All games except neworigins and standard had this bug - it had been previously fixed (partially) in those 2 codebases, but added parens to make sure comparison was correct.
- Small code quality cleanups on delete[] vs delete
- Pulls changes for PR Use of non-array delete #16
- While these didn't cause any errors/warnings during compile they are technically more correct code.
- Updated CREDITS file with some names that I was able to find that weren't already recorded.
* This pulls in the work from PR #54 to avoid an infinite loop when we have less than 4 trade items.
This was referenced May 7, 2024
Closed
* Code pulled in from PR#8 * Trade items in sell markets (where the player sells to the city) were never counted toward economic improvement. They will be now.
Closed
* Pulls in changes from PR#53 * All games except neworigins and standard had this bug - it had been previously fixed (partially) in those 2 codebases, but added parens to make sure comparison was correct.
673cd39
to
d955009
Compare
* Pulls changes for PR #16 * While these didn't cause any errors/warnings during compile they are technically more correct code.
Closed
valdisz
previously approved these changes
May 8, 2024
valdisz
approved these changes
May 8, 2024
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.