Menu
▾
▴
[Rails-commits] Changes to 'rails2.0_merge'
|
From: Stefan F. <ste...@us...> - 2012-09-21 10:37:53
|
New branch 'rails2.0_merge' available with the following commits:
commit b2c2bf637cadcd9c261e6e99521410dfd5b19813
Author: Erik Vos <eri...@xs...>
Date: Thu Nov 24 22:09:55 2011 +0100
Fixed offering special token lays where that is not actually allowed.
Cases:
- Company has no tokens.
- Company already has token on target location
- Target location is blocked (e.g. another home token is not yet placed).
==> THIS FIX MAY BREAK EXISTING SAVED FILES.
Three test cases had to be withdrawn because of this fix.(cherry picked from commit 50a81714eb68f951868feb7d0f3d7d32241ae648)
Conflicts:
src/rails/game/OperatingRound.java
src/test/data/test/1835_NatDoubleShare.rails
src/test/data/test/1835_NatDoubleShare.report
src/test/data/test/1835_NatSingleShare.rails
src/test/data/test/1835_NatSingleShare.report
commit c2f0fc99db1c395ac33988d3af8c848ec01202a1
Author: Erik Vos <eri...@xs...>
Date: Wed Nov 23 17:20:57 2011 +0100
Fixed PR train discarding bugs.
PR did not discard excess trains after forced merge at first 5-train,
and would (probably) never discard more than one train, even if
having two or more excess trains.(cherry picked from commit 7f688a6ee82a52d57e6909303f91103016a29b24)
commit 0e2099f181fb6574ef4aff74ea4f34338575afde
Author: Erik Vos <eri...@xs...>
Date: Wed Nov 23 00:36:27 2011 +0100
Restored removed field numberSold from SellShares action.
This proved necessary for backwards compatibility.
Refreshed the related new test cases.(cherry picked from commit 5183cc7a7d798f17479525d466fbc4fcc82e149f)
commit b3eb348c4bcc15b03a0885b6a00320170cc4f3cf
Author: Erik Vos <eri...@xs...>
Date: Wed Nov 23 00:14:38 2011 +0100
Fix: BA home token is now laid in its first OR.
This fixes the problem that, if the BA has floated but not yet operated,
its home token is already on the map and must find a place when another
player lays a green XX tile on the BA home hex.
In this case, the wrong player was asked for that place.(cherry picked from commit 92e0d2c13973185cb85ede8b9a83250c1295a610)
commit 6814dc74a5b760d6736df3b70a6b97e2a8b82865
Author: Erik Vos <eri...@xs...>
Date: Tue Nov 22 14:14:22 2011 +0100
Added five test cases and fixed two.
The new test cases check recently fixed 1835 omissions with nationalisation and share selling.
The fixed test cases 18GA_A and 18EU_A have failed for some time because of earlier fixes.(cherry picked from commit 13bd6bb91c38ffa428902c7798859fb00f06f31c)
Conflicts:
src/test/data/real/18EU_A.report
commit 6e7b730bf23c57818ffda93cc93e940d0ab42d80
Author: Erik Vos <eri...@xs...>
Date: Mon Nov 21 17:40:58 2011 +0100
Fixed presidency dumping issues after previous commit.
Added 5 test cases for share selling and nationalisation issues.(cherry picked from commit cd74aa6bf8943b56ce719db283e90fa0bac4e275)
Conflicts:
src/rails/game/StockRound.java
commit f6e4baf421b5e56f2d06514f9c75f183ad86708f
Author: Erik Vos <eri...@xs...>
Date: Sat Nov 19 10:35:35 2011 +0100
Fixes for 1835: Nationalisation rewritten to handle mixed shares.
Rewrote nationalisation to make it able to handle both 10% and 20% shares.
The nationalisation code has also been refactored into setBuyableCerts().
Suppressed empty share field tooltips.
Moved the SHARES update key from ShareModel to ViewUpdate, where the other keys are.(cherry picked from commit 605008e5a969b1f3fe46a584a5ab86a32176e639)
Conflicts:
rails/game/model/ShareModel.java
src/rails/game/model/ViewUpdate.java
src/rails/game/specific/_1835/StockRound_1835.java
src/rails/ui/swing/elements/Field.java
commit 693c9e5ff1345d49d65978ad1f7e37701b146478
Author: Erik Vos <eri...@xs...>
Date: Sun Nov 20 17:37:39 2011 +0100
1835 fix: allow dumped president's share to be exchanged against a 20% share.(cherry picked from commit eaa0aa5957c29448c317bcdec0edb0fc28bebdc8)
Conflicts:
rails/game/Portfolio.java
src/rails/game/PublicCompany.java
src/rails/game/ShareSellingRound.java
src/rails/game/StockRound.java
src/rails/game/TreasuryShareRound.java
src/rails/game/action/SellShares.java
src/rails/game/specific/_1856/CGRFormationRound.java
commit fa68d86848aed54b806136e7eddd6603c7e9203c
Author: Erik Vos <eri...@xs...>
Date: Sat Nov 19 09:35:58 2011 +0100
Fixes for 1835:
Rewrote nationalisation to make it able to handle both 10% and 20% shares.
The nationalisation code has also been refactored into setBuyableCerts().
Suppressed empty share field tooltips.
Moved the SHARES update key from ShareModel to ViewUpdate, joining with the other keys.(cherry picked from commit 9f97d651984b68e5c9dd68ddfb7361a7151a083f)
Conflicts:
rails/game/model/ShareModel.java
src/rails/game/model/ViewUpdate.java
src/rails/game/specific/_1835/StockRound_1835.java
src/rails/ui/swing/elements/Field.java
commit 8a79a819215aba2679f8ad6e173f247baaada5f1
Author: Erik Vos <eri...@xs...>
Date: Wed Nov 16 23:05:48 2011 +0100
Added tooltips to Game Status share fields to display portfolio composition.(cherry picked from commit 902cac06c959dc53ef89aec36cdedb9db2cce2ac)
Fixed the ViewUpdate and other modfications.
Conflicts:
rails/game/model/ShareModel.java
src/rails/ui/swing/elements/Field.java
commit d31d1814abbcdfb923c899845df54a5d5fe9ff33
Author: Stefan Frey <ste...@we...>
Date: Wed Nov 16 12:25:21 2011 +0100
added 18AL map converted from 18AL gamekit by John David Galt (used with his permission)
(cherry picked from commit 73f7d400b1be00a4b9fe9574f9fb25e180f5f8b1)
commit 1ad02bcad97aaddba673d5252ef243499c3241ab
Author: Erik Vos <eri...@xs...>
Date: Sun Nov 13 20:37:38 2011 +0100
1835 declared "fully playable"(cherry picked from commit 280f9cca14585646c93a981d7e2426d93f419f41)
commit 7d6564981cf191e59badfb72a4e4b3f0ff8e26f3
Author: Erik Vos <eri...@xs...>
Date: Sun Nov 13 14:35:29 2011 +0100
Fixed two 18AL bugs.
1. (reported by Thomas Wall Hannaford):
Green tile #25 was not upgradeable to #45 and #46.
This fix also applies to 1870 and 18Kaas.
2. (reported by Hildebrand Tigelaar):
The registration of buying one train to prevent any further buys was not undoable.
This fix probably also applies to other games where similar buying restrictions exist.
(cherry picked from commit e9fbe53c5ef3c0b6f047771d478dbd919a7ad1db)
Conflicts:
src/rails/game/OperatingRound.java
commit bef70046449e7ab24311e0edbb421de145375c3c
Author: Erik Vos <eri...@xs...>
Date: Fri Nov 11 22:39:34 2011 +0100
Added blue water tile -4000 and half tiles -4004 and -4005.
Applied to 1825 (all units and regional kits).
The tiles have type "fixed", so that no track can be laid towards any of them.(cherry picked from commit 8f9b2d141ab02bfb31b78c4f4063116fc88fd7eb)
Conflicts:
src/data/1825/Map.xml
src/data/1825/Tiles.xml
src/tiles/HandmadeTiles.xml
commit 2c50653a58d7fd19303f2951b1e6274e448fdcaa
Author: Stefan Frey <ste...@we...>
Date: Fri Nov 11 16:36:27 2011 +0100
updated version number to rails 1.5.3 (this corresponds to release 1.5.3 in branch 1.5.x)
(cherry picked from commit e161ea2c8e3da97064fc12a127ebaacf88fca30d)
Conflicts:
src/rails/game/RailsRoot.java
commit 214afafbd9d3270962253d31f9912d403e82c552
Author: Stefan Frey <ste...@we...>
Date: Fri Nov 11 16:34:58 2011 +0100
reverted commenting-out automated pass execution code (see commit 1893c3)
(cherry picked from commit 2fef5fe020452f1c1901f3ce1e1ee7ab1e49aa50)
commit b33b3c15121d4d3059ed4166db3ac13b7dbf7eef
Author: Erik Vos <eri...@xs...>
Date: Fri Nov 11 16:27:44 2011 +0100
Applied half-hexes etc. to 1825 Units 2 & 3.
Also added the Unit 2 & 3 companies, so that these are at least *somewhat* playable.(cherry picked from commit 415ee8339e845cd3c7a306118d7be83539cab712)
Conflicts:
data/1825/CompanyManager.xml
src/data/1825/Map.xml
commit 77bf24bded67715038eaf06384f83a4029758fed
Author: Erik Vos <eri...@xs...>
Date: Wed Nov 9 21:54:40 2011 +0100
Added new empty half-hex preprinted tiles.
Co-authored by Stefan Frey <ste...@we...>.
Thanks to Stefan for the half-hex pictures.
For 1825, to help recognising allowed track laying on some board edges.
Applied to Unit 1 only, at the borders with Unit 2 and kits R1-3.
All Unit 1 'open' attributes have been removed.
Q11 (Crewe) SW is now impassable.(cherry picked from commit f5e251419ca78926162c0183be12fc8fb8abf5ed)
commit 137e388575d96c322cb383555f63c66ebfe02ce5
Author: Erik Vos <eri...@xs...>
Date: Wed Nov 9 16:29:17 2011 +0100
18EU: entities in company names changed to Unicode characters.
Actually, entities are safer, as these are encoding-independent.
Characters (like Ã) require file encoding to be understood as UTF-8.
To ensure this, added Eclipse preference to encode/decode fiels as UTF-8
(this affects reading/writing non-java and non-XML files).
Also set line delimiter to newline only.
(cherry picked from commit 6ca045795458ba9c3a9d8e14451bde3dbfaad23e)
commit 9fc21a09be43c310c4e529ff8512bf4b481ee353
Author: Stefan Frey <ste...@we...>
Date: Tue Nov 8 23:51:01 2011 +0100
Fixed issues with displaying SVG background maps.
Added Peter Mumford 18GA redesigned map.
(cherry picked from commit 7cf64e84042d36e1f0c1d902e767efc987f797be)
commit 484e1b5e6676d95b3c0a5236b13b4b2a1fb74960
Author: Stefan Frey <ste...@we...>
Date: Thu Nov 3 13:04:00 2011 +0100
prepared for release 1.5.2
(cherry picked from commit 38a485f50cf2229bce22bf90103de1f767b42358)
Conflicts:
src/rails/game/RailsRoot.java
commit eb53a131cb49550362bad2163f13b61e7c009b80
Author: Stefan Frey <ste...@we...>
Date: Wed Oct 12 16:14:20 2011 +0200
fixed display of operating companies in networkinfo menu
(cherry picked from commit cea7752364090c76b28874e85cdb8f58e03ce90d)
commit fa97b5d9794c297e3d66d87bea10c865c4ab9ab9
Author: Erik Vos <eri...@xs...>
Date: Tue Nov 1 14:10:21 2011 +0100
18EU: fixed wrong train limit step from phase 5.
Added train limits to Company Info.
Added train limit steps to Phase Info.
(cherry picked from commit 68d4bf75fa548674c61cdfa1e2670a2d7df4f2b1)
commit 17e511fbfd71804b89ed6f3c084ff4d224607d6d
Author: Stefan Frey <ste...@we...>
Date: Wed Sep 19 15:40:22 2012 +0200
fixed extraTile handling, still todo for simplification and undo proofness
commit bd60b41ee6ffa94dad5af8663ea00ffff3270f1c
Author: Stefan Frey <ste...@we...>
Date: Wed Sep 19 14:37:47 2012 +0200
fixed merge error in StockRound
commit 53c9ad902e7f43a6f9b934c6185fd2af3b6553e0
Author: Erik Vos <eri...@xs...>
Date: Wed Oct 12 00:37:21 2011 +0200
Phase management upgrade step 5: extra tile lays
Extra tile lays are now registered in <Phase> rather than <CompanyType>.
Affects Game.xml and CompanyManager.xml of the following games:
1825, 1835,1851, 1880, 18EU, 18TN.
Additional fix:
In 18EU, minors can no longer select yellow tiles for upgrading.
Green tiles will no longer be displayed in this case. (cherry picked from commit 8d2469c1076b10c883cc6cd1c21f78f8bb668df1)
Conflicts:
rails/game/CompanyManager.java
rails/game/CompanyManagerI.java
rails/game/PhaseI.java
rails/game/PublicCompanyI.java
src/rails/game/OperatingRound.java
src/rails/game/PublicCompany.java
src/rails/ui/swing/UpgradesPanel.java
commit 454c908bcb7995c911eaa3ebadcbe2632e1a4db6
Author: Erik Vos <eri...@xs...>
Date: Sun Oct 30 23:45:41 2011 +0100
18Jr prototype removed.
As requested by the designer: Scott Petersen.(cherry picked from commit 6915bd88f7d018bcbb3e7dcdd9f3d82cf7973c87)
Conflicts:
src/data/18JR/CompanyManager.xml
src/data/18JR/Game.xml
src/data/18JR/Map.xml
src/data/18JR/StockMarket.xml
src/data/18JR/TileSet.xml
src/data/18JR/Tiles.xml
commit aab630cf3b00cb9a825a37cf04f124007469db8a
Author: Erik Vos <eri...@xs...>
Date: Sun Oct 30 21:32:37 2011 +0100
Fix to error message if a Right cannot be bought(cherry picked from commit 81bf33b01a64d3d74edb8fa0b46199c350b05372)
commit 59b4903f34ee9209f3f5d9fcc505bd5c804c8c0e
Author: Erik Vos <eri...@xs...>
Date: Sun Oct 30 21:16:37 2011 +0100
Fix: Buying Coalfields right is now refused if the company does not have enough cash.
Reported by Charles Strong.
This is the easy fix. In fact, the option to buy this right should not be offered at all
if the company lacks cash, but fixing that is a bit more complex and omitted for now.
(cherry picked from commit 8dd8adf3e2da0056bb7b254f3a0d796288d73b1d)
Conflicts:
src/rails/game/OperatingRound.java
commit 57d55d6ad2db406348c2c3d88314317be004e6a6
Author: Martin Brumm <Dr....@t-...>
Date: Sun Oct 30 18:18:40 2011 +0100
Fixed 18TN grey tile being not available due to error in phase definition.
Also fixed wrong availability of Tile 170. (cherry picked from commit c631bc3e4f4873e8245bec880a4e3166da45ba39)
commit 79ba8677a49dfc355bb5457b912d31b6ea877afd
Author: Erik Vos <eri...@xs...>
Date: Thu Oct 27 10:11:08 2011 +0200
Added "Yellow Plain" value for the Unlimited Tiles game option.
The default value is "Yellow Plain" for 1826 and 1851, "No" for all other games.(cherry picked from commit ec5c857b605051bfb7924810ce4b518af86d2ade)
commit 03dce6df52ddf0475fff9199e43132ae7017c7ea
Author: Erik Vos <eri...@xs...>
Date: Tue Oct 25 16:05:55 2011 +0200
Fixed 18GA: missing cost of hex J10
Bug #3326993.(cherry picked from commit 147edb8de4cad85a7308a1bad4e9248815c29427)
commit f74e90217b8ecf558c6cbef99f248f331fc89827
Author: Erik Vos <eri...@xs...>
Date: Mon Oct 24 19:39:22 2011 +0200
Fixed 18GA stock market value of square M3 from 100 to 190.(cherry picked from commit 6213166fdf63a04d45364cb9d0cea534fbb574b6)
commit 9eba117073a346f1d14d33382b76bddeb7c931e0
Author: Erik Vos <eri...@xs...>
Date: Thu Oct 13 22:30:03 2011 +0200
In 1835 Start Round, removed popups that reported forced passes.
Also removed some redundant/ineffective code.(cherry picked from commit 1893c34a2ea53e78be3bd4828ccff1e675018e0c)
Conflicts:
src/rails/game/action/PossibleActions.java
commit 399f04516e2e561de206339d1dfddbcba7b96bb0
Author: Erik Vos <eri...@xs...>
Date: Thu Oct 13 21:15:53 2011 +0200
Moved StartRound_1835 to the game-specific package.(cherry picked from commit b5cb481a353309e04d48c49b9ca363f4f9e6c532)
Conflicts:
rails/game/StartRound_1835.java
rails/game/specific/_1835/StartRound_1835.java
src/rails/game/StartRound_1835.java
commit d27c0c6cf0adad4cbff2c497fff35b634ae66848
Author: Erik Vos <eri...@xs...>
Date: Thu Oct 13 17:31:12 2011 +0200
Fixed two 1835 bugs and updated Game Notes.
- Crash in final PR formation round.
Cause: already closed privates were not excluded from the merge process.
- Hangs in first OR if Start Packet not sold.
Caused by missing call to setPossibleActions() in StartRound_1835.
Also corrected 'operate' flag for this case when creating OR object
(unclear if this omission was causing problems).
Removed bug description and workaround from the Game Notes.
Replaced workaround for the non-closing privates bug.(cherry picked from commit d5283097c814b535456a530af604b9640b68d603)
Conflicts:
src/rails/game/specific/_1835/PrussianFormationRound.java
commit cae10a6136e3424f0680084c29d6e6813ec70760
Author: Erik Vos <eri...@xs...>
Date: Thu Oct 13 17:11:37 2011 +0200
Fixed 1835 bug: Hangs in first OR if Start Packet not sold.
Missing call to setPossibleActions() in StartRound_1835.
Also corrected 'operate' flag for this case when creating OR object
(unclear if this omission was causing problems).(cherry picked from commit cd9efcef8d70134015e96e25a809f49b468800ea)
Conflicts:
src/rails/game/StartRound_1835.java
src/rails/game/specific/_1835/GameManager_1835.java
src/rails/game/specific/_1835/OperatingRound_1835.java
commit 5ef4c91198ab26cb631e71718d616fd1fba6724b
Author: Erik Vos <eri...@xs...>
Date: Thu Oct 13 13:14:01 2011 +0200
Updated 1835 Game Notes(cherry picked from commit df31d98077ce7d818cae7c671c77a403fdc3eeca)
commit 27fa9f7790cef9e6243fb6f785f4b44917fb32e7
Author: Erik Vos <eri...@xs...>
Date: Thu Oct 13 12:54:13 2011 +0200
Some code cleanups(cherry picked from commit adfb01e778893115aec455fd3755bd0e1bad3502)
Conflicts:
src/rails/game/Stop.java
commit 4e685c78c9e0362c4f756a2b9b7cdce70a44e0f9
Author: Erik Vos <eri...@xs...>
Date: Wed Oct 12 15:28:57 2011 +0200
Fixed wrong revenue value (20) of NW city on tile -803 (1835 Hamburg)(cherry picked from commit c7277d4d9659931ddd2996d48fc20e6bf32b80fc)
commit 718fe74f6e2bb25d2212018e6b1f6e232f6cee2f
Author: Erik Vos <eri...@xs...>
Date: Wed Oct 12 13:24:16 2011 +0200
In GameStatus window, make train list fields auto-wrapping.
By embedding the text in <html>...</html>
and setting the JLabel preferred size to (1,1).(cherry picked from commit 919a2ba43dec0595a445e163d2f008104dc27852)
Conflicts:
src/rails/ui/swing/GameStatus.java
src/rails/ui/swing/elements/Field.java
commit 840a9b408bd5c0f75444df9cc69a40494de1cdf6
Author: Erik Vos <eri...@xs...>
Date: Mon Oct 10 16:12:11 2011 +0200
Set version # to 1.5.1+(cherry picked from commit 15fa441bd80ceb32615bd8706d620d811166be77)
Conflicts:
src/rails/game/RailsRoot.java
commit af0ebda22c225d3c1db50ccf88adebdc385fbed3
Author: Stefan Frey <ste...@we...>
Date: Mon Oct 10 20:51:52 2011 +0200
adding further test games
(cherry picked from commit 4b9247bd63ddf2003e0c8f5538d29b207cb92ed7)
commit f35b716cbff0d301cf3ef2411c096a343125dfff
Author: Stefan Frey <ste...@we...>
Date: Mon Oct 10 20:40:19 2011 +0200
updated shell script to manage releases
(cherry picked from commit 22b79e84bee3711a29aaf25333be26f85a62a5bf)
commit 18792b5d4323eb8eb8cb1eb56f38f65a26d4c486
Author: Stefan Frey <ste...@we...>
Date: Sun Oct 9 17:40:34 2011 +0200
Changed Montgomery and Tallahassee to major scoring locations.(cherry picked from commit 48aa0f099ef6335a9ab7d60eca11e86f54b0ea6d)
commit bb4ef21a364107d38be54dc1b81113ac21a035bf
Author: Erik Vos <eri...@xs...>
Date: Fri Oct 7 14:41:44 2011 +0200
Fixed positioning bug of base tokens on corner-facing cities.
This was a bug in ConvertXML.java.
Replaced Tiles.xml: generic, 1825, 1830 and 1835 versions.
Added "universal" XML formatting Perl script under tools.(cherry picked from commit 9fd64c124f5f348217c0273bf54250707b8b2dd1)
commit 956be3bf41d06063dc9d76483653d7b032e3cced
Author: Erik Vos <eri...@xs...>
Date: Tue Oct 4 19:34:19 2011 +0200
Allow game-specific StartRoundWindow classes.
Added empty StartRoundWindow_1880 class.(cherry picked from commit 49c5d96547d2904ccfc803dc9018b56233b39537)
Conflicts:
src/rails/ui/swing/GameUIManager.java
src/rails/ui/swing/StartRoundWindow.java
commit 1a14e77d7fc7ba63acab782c38767883c2046e30
Author: Erik Vos <eri...@xs...>
Date: Tue Oct 4 19:07:55 2011 +0200
Fix bug that disallows selling a share after buying one in some cases.
Relates to the "don't sell a just bought certificate" rule.
The fix is to reverse the sequence of that and the pool size check.(cherry picked from commit 8fce0f10a5c8ebcb6528a991efcfc74abe45a686)
Conflicts:
src/rails/game/StockRound.java
commit 44f674cfedb5ec2f6eb22ea97c54671c76ca1e46
Author: Erik Vos <eri...@xs...>
Date: Mon Oct 3 11:46:12 2011 +0200
Javadoc comments added to the LayBaseToken constructors.(cherry picked from commit 9502e7165a2752f013bd2793f49c774ac4a83acf)
commit c2499124771b146974aa374104c158e216deb5d2
Author: Stefan Frey <ste...@we...>
Date: Fri Sep 30 22:57:50 2011 +0200
added test case for 1856 token bug
(cherry picked from commit ff1134c23f7a2d1438504c9b6e87cd93dbc5e226)
commit d14cea725ed29e1d9a97a89aa7796ecdee7bd783
Author: Stefan Frey <ste...@we...>
Date: Fri Sep 23 08:09:31 2011 +0200
Prepared for release 1.5(cherry picked from commit eb7868e9d88a51b11c39f56283617dcf9acec2aa)
Conflicts:
rails.bat
rails.sh
|
