Merge maintenance branch into the master branch #170
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
with only 10 shares, the last 10 shares get deleted even though they might be owned by a player. This stems from the fact that findcertificate() returns the certificates within rails 2.0 in a different order than previous releases.
with only 10 shares, the last 10 shares get deleted even though they might be owned by a player. This stems from the fact that findcertificate() returns the certificates within rails 2.0 in a different order than previous releases.
Share conversion CGR
Rails 2 maintenance
Changing Version Identifier
Rails 2 maintenance
company if the route was blocked by a token of another major company. This has been corrected
1830 & 1889 Fixes the Issue #37
Rails 2 maintenance
Implementing the mapHex block for private companies and the phase 4 tile blocks for upper italy.
Fixing Map coordinates Implementing Change to Stockmarket
Dont Merge Minors if the Corresponding Major has been sold out. Final Oversight for K2 in Startpackage..
Fixing Hungarian Private Certificates Count Fixing Hungarian U1 and U3 starting cash
Company Treasury Incomes. This is needed for a seperate income during the OR not tied to the private company income but stemming from the additional revenue coming from special trains (Coal Trains in 1837) or special powers like a Mail Contract.
Company Treasury Incomes. This is needed for a seperate income during the OR not tied to the private company income but stemming from the additional revenue coming from special trains (Coal Trains in 1837) or special powers like a Mail Contract.
preset Company Treasury income.
preset Company Treasury income.
first work on revenue recognition for Coal Mines
https://github.com/neutronc/Rails-1.git into rails_2_maintenance Conflicts: src/main/resources/data/1837/Game.xml
the Startpackets to not be choosen. Whitespace in Variant Options are dangerous
This reverts commit 1daa1bb.
they have been upgraded already. Might need some additional work in the future if theres the rare case a company doesnt touch its reserved hex.
Rails 2 maintenance
Preparation of Step 2 OR Round Checks
Adding new mechanism to direct correct handling of OR and SR fter CoalexchangeRounds
Previously it wasnt possible to dump x shares containing the presidency. Now it is. Befoire this fix you had to sell twice shares from the company with the president in your hand. Now the correct amount is available on the first sell. Bug reported by Peter De Boer, December 2019
…ls-1.git into rails_2_maintenance
split sell shares..
…llowed to split sell shares.." This reverts commit b392b6d.
split sell shares..
handling for the President Share Selling
being allowed to split director shares.
testcase. All other testcases report clear handling sofar.
Rails 2 maintenance
emergency buy and wasnt declared bancrupt. Now the player is declared bancrupt and the game endswith bancruptcy if it should end.
Fixing Bug reported by Peter De Boer: Player cant sell any shares in
Rails 2 maintenance
…ncement/merge-maintenance
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.
This PR merges the
maintenancebranch into themasterbranch.While doing this I tried to change the
masterbranch as little as possible to make this PR readable.