Menu
▾
▴
rails-commits
|
From: Stefan F. <ste...@us...> - 2012-10-02 09:48:20
|
.classpath | 4
dev/null |binary
rails.bat | 2
rails.sh | 3
rails/ui/swing/gamespecific/_1880/StartRoundWindow_1880.java | 7
src/LocalisedText.properties | 115
src/build.xml | 350
src/buildRails.xml | 171
src/data/1830/CompanyManager.xml | 2
src/data/1830/Game.xml | 4
src/data/1830/Map.xml | 12
src/data/1830/TileSet.xml | 1
src/data/1830/Tiles.xml | 5
src/data/1835/CompanyManager.xml | 12
src/data/1835/Game.xml | 3
src/data/1856/CompanyManager.xml | 73
src/data/1856/Game.xml | 37
src/data/1856/Map.xml | 203
src/data/1856/MapImage.svg | 6072 ++
src/data/1856/TileSet.xml | 15
src/data/1856/Tiles.xml | 6
src/data/1889/CompanyManager.xml | 2
src/data/1889/Map.xml | 53
src/data/1889/MapImage.svg | 4259 +
src/data/18AL/Game.xml | 13
src/data/18AL/Map.xml | 2
src/data/18EU/Map.xml | 2
src/data/18EU/TileSet.xml | 1
src/data/18EU/Tiles.xml | 6
src/data/18GA/Map.xml | 280
src/data/18GA/MapImage_CottonPort.svg |21576 ++++++++++
src/data/18Kaas/Game.xml | 6
src/data/18Lummer/CompanyManager.xml | 43
src/data/18Lummer/Game.xml | 102
src/data/18Lummer/Map.xml | 17
src/data/18Lummer/StockMarket.xml | 149
src/data/18Lummer/TileSet.xml | 145
src/data/18Lummer/Tiles.xml | 460
src/data/18TN/Game.xml | 4
src/data/GamesList.xml | 91
src/data/Properties.xml | 58
src/data/profiles/LIST_OF_PROFILES | 7
src/data/profiles/ORDocking.predefined | 7
src/data/profiles/default.profile | 41
src/data/profiles/default.profiles | 2
src/data/profiles/hotseat.predefined | 4
src/data/profiles/pbem.predefined | 4
src/data/profiles/prettyUI.predefined | 13
src/data/profiles/root | 60
src/data/profiles/test | 15
src/data/profiles/test.profile | 125
src/images/icon/green_station.png |binary
src/images/icon/green_track.png |binary
src/images/icon/grey_station.png |binary
src/images/icon/grey_track.png |binary
src/images/icon/notile_2towns.png |binary
src/images/icon/notile_station.png |binary
src/images/icon/russet_station.png |binary
src/images/icon/russet_track.png |binary
src/images/icon/yellow_station.png |binary
src/images/icon/yellow_track.png |binary
src/lib/JLayer1.0.1/jl1.0.1jar |binary
src/lib/commons-io-2.1/commons-io-2.1.jar |binary
src/lib/df_1.1.0/dockingFramesCommon.jar |binary
src/lib/df_1.1.0/dockingFramesCore.jar |binary
src/manifest | 4
src/rails.bat | 2
src/rails.sh | 2
src/rails/algorithms/RevenueAdapter.java | 3
src/rails/common/Config.java | 55
src/rails/common/ConfigItem.java | 181
src/rails/common/ConfigManager.java | 313
src/rails/common/ConfigProfile.java | 396
src/rails/common/LocalText.java | 1
src/rails/common/MoneyFormatter.java | 1
src/rails/common/parser/Config.java | 608
src/rails/common/parser/ConfigItem.java | 145
src/rails/game/Bank.java | 2
src/rails/game/GameManager.java | 57
src/rails/game/MapHex.java | 21
src/rails/game/MapManager.java | 42
src/rails/game/OperatingRound.java | 110
src/rails/game/Phase.java | 7
src/rails/game/PublicCompany.java | 34
src/rails/game/RailsRoot.java | 33
src/rails/game/ReportBuffer.java | 9
src/rails/game/StartRound.java | 20
src/rails/game/StockMarket.java | 33
src/rails/game/StockRound.java | 126
src/rails/game/StockSpace.java | 13
src/rails/game/Stop.java | 6
src/rails/game/Tile.java | 15
src/rails/game/TrainManager.java | 43
src/rails/game/action/BuyTrain.java | 7
src/rails/game/action/LayTile.java | 38
src/rails/game/correct/ClosePrivate.java | 2
src/rails/game/special/SpecialRight.java | 4
src/rails/game/special/SpecialTileLay.java | 56
src/rails/game/specific/_1835/ElsasModifier.java | 44
src/rails/game/specific/_1835/OperatingRound_1835.java | 39
src/rails/game/specific/_1835/StartRound_1835.java | 14
src/rails/game/specific/_1856/CGRFormationRound.java | 3
src/rails/game/specific/_1889/OperatingRound_1889.java | 66
src/rails/game/specific/_18EU/FinalMinorExchangeRound.java | 4
src/rails/game/specific/_18EU/OffBoardRevenueModifier.java | 2
src/rails/game/specific/_18EU/StartCompany_18EU.java | 20
src/rails/game/specific/_18EU/StockRound_18EU.java | 8
src/rails/sound/SoundConfig.java | 104
src/rails/sound/SoundContext.java | 129
src/rails/sound/SoundEventInterpreter.java | 301
src/rails/sound/SoundManager.java | 68
src/rails/sound/SoundPlayer.java | 273
src/rails/ui/images/accept.png |binary
src/rails/ui/images/add.png |binary
src/rails/ui/images/arrow_redo.png |binary
src/rails/ui/images/arrow_undo.png |binary
src/rails/ui/images/auction_hammer_gavel.png |binary
src/rails/ui/images/bricks.png |binary
src/rails/ui/images/button.png |binary
src/rails/ui/images/cancel.png |binary
src/rails/ui/images/cash_stack.png |binary
src/rails/ui/images/clock_add.png |binary
src/rails/ui/images/clock_delete.png |binary
src/rails/ui/images/coins_in_hand.png |binary
src/rails/ui/images/control_fastforward_blue.png |binary
src/rails/ui/images/control_play_blue.png |binary
src/rails/ui/images/globe_model.png |binary
src/rails/ui/images/hand_property.png |binary
src/rails/ui/images/information.png |binary
src/rails/ui/images/money_add.png |binary
src/rails/ui/images/money_bag.png |binary
src/rails/ui/images/participation_rate.png |binary
src/rails/ui/images/rails32.png |binary
src/rails/ui/images/script.png |binary
src/rails/ui/images/traffic_lights_green.png |binary
src/rails/ui/images/traffic_lights_red.png |binary
src/rails/ui/images/traffic_lights_yellow.png |binary
src/rails/ui/images/train.png |binary
src/rails/ui/swing/AbstractReportWindow.java | 11
src/rails/ui/swing/ConfigWindow.java | 398
src/rails/ui/swing/GUIToken.java | 78
src/rails/ui/swing/GameSetupWindow.java | 167
src/rails/ui/swing/GameStatus.java | 125
src/rails/ui/swing/GameUIManager.java | 234
src/rails/ui/swing/GridPanel.java | 230
src/rails/ui/swing/ImageLoader.java | 27
src/rails/ui/swing/MapPanel.java | 182
src/rails/ui/swing/MessagePanel.java | 103
src/rails/ui/swing/ORPanel.java | 597
src/rails/ui/swing/ORUIManager.java | 476
src/rails/ui/swing/ORWindow.java | 145
src/rails/ui/swing/RemainingTilesWindow.java | 80
src/rails/ui/swing/ReportWindow.java | 2
src/rails/ui/swing/ReportWindowDynamic.java | 66
src/rails/ui/swing/Scale.java | 2
src/rails/ui/swing/SplashWindow.java | 357
src/rails/ui/swing/StartRoundWindow.java | 139
src/rails/ui/swing/StatusWindow.java | 141
src/rails/ui/swing/StockChart.java | 10
src/rails/ui/swing/TokenIcon.java | 15
src/rails/ui/swing/UpgradesPanel.java | 230
src/rails/ui/swing/WindowSettings.java | 7
src/rails/ui/swing/elements/ActionButton.java | 8
src/rails/ui/swing/elements/CheckBoxDialog.java | 111
src/rails/ui/swing/elements/ConfirmationDialog.java | 112
src/rails/ui/swing/elements/DockingFrame.java | 409
src/rails/ui/swing/elements/MessageDialog.java | 83
src/rails/ui/swing/elements/NonModalDialog.java | 132
src/rails/ui/swing/elements/RadioButtonDialog.java | 113
src/rails/ui/swing/elements/RailsIcon.java | 127
src/rails/ui/swing/elements/RailsIconButton.java | 139
src/rails/ui/swing/gamespecific/_1835/GameUIManager_1835.java | 46
src/rails/ui/swing/gamespecific/_1835/StatusWindow_1835.java | 33
src/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java | 27
src/rails/ui/swing/gamespecific/_1880 | 7
src/rails/ui/swing/gamespecific/_18EU/GameStatus_18EU.java | 8
src/rails/ui/swing/gamespecific/_18EU/GameUIManager_18EU.java | 182
src/rails/ui/swing/hexmap/GUIHex.java | 249
src/rails/ui/swing/hexmap/GUITile.java | 137
src/rails/ui/swing/hexmap/HexHighlightMouseListener.java | 243
src/rails/ui/swing/hexmap/HexMap.java | 713
src/rails/ui/swing/hexmap/HexMapImage.java | 83
src/rails/util/GameFileIO.java | 230
src/rails/util/RunGame.java | 23
src/rails/util/SystemOS.java | 117
src/rails/util/Util.java | 47
src/readme.txt | 13
src/test/SVGApplication.java | 105
src/test/SVGOffscreenLoader.java | 192
src/test/TestGame.java | 2
src/test/TestGameBuilder.java | 8
src/test/data/bugs/1830CF_obsoleteTrains.rails |binary
src/test/data/bugs/1830CF_obsoleteTrains.report | 432
src/test/data/bugs/1830_sellPresidency.rails |binary
src/test/data/bugs/1830_sellPresidency.report | 408
src/test/data/bugs/1835_changePresidentAtStart.rails |binary
src/test/data/bugs/1835_changePresidentAtStart.report | 54
src/test/data/bugs/1856_tokens.report | 1
src/test/data/bugs/1889_presidentContribution.report | 3
src/test/data/real/1830_A.report | 3
src/test/data/real/1856_A.report | 3
src/test/data/real/1889_A.report | 2
src/test/data/real/1889_B.report | 3
src/test/data/real/1889_C.report | 3
src/test/data/real/18AL_A.report | 1
src/test/data/real/18EU_A.report | 2099
src/test/data/real/18GA_A.report | 415
src/test/data/real/18TN_A.rails |binary
src/test/data/real/18TN_A.report | 616
src/test/data/test/1830_5forDtrainExchange.report | 3
src/test/data/test/1830_SellFullPresCert.report | 535
src/test/data/test/1830_SellHalfPresCert.report | 535
src/test/data/test/1835_NatDoubleShare.rails |binary
src/test/data/test/1835_NatDoubleShare.report | 884
src/test/data/test/1835_NatSingleShare.rails |binary
src/test/data/test/1835_NatSingleShare.report | 348
src/test/data/test/1835_PR_3rdTrain.report | 1060
src/test/data/test/1835_SellDoubleShare.rails |binary
src/test/data/test/1835_SellDoubleShare.report | 1643
src/test/data/test/1835_SwapPresForDoubleShare.rails |binary
src/test/data/test/1835_SwapPresForDoubleShare.report | 424
src/test/data/test/1851_Late.report | 2
src/test/data/test/1856_2nd6T+PrezCash2.report | 3
src/tools/ListAndFixSavedFiles.java | 268
src/tools/formatxml.pl | 23
src/version.number | 5
test/data/test/1835_PRHasTwoExcessTrains.report | 1141
tools/formatxml.pl | 23
228 files changed, 47213 insertions(+), 9356 deletions(-)
New commits:
commit bc91566270779d8a245d05219b01392563cab91b
Author: Stefan Frey <ste...@we...>
Date: Fri Sep 21 12:20:16 2012 +0200
prepared for release 1.7.10
(cherry picked from commit ef4e13ac6c9dba970ff8e7720098eaf7d0d9a552)
diff --git a/src/readme.txt b/src/readme.txt
index ba355d5..5ef8bbc 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -1,4 +1,4 @@
-Rails release 1.7.9:
+Rails release 1.7.10:
A new maintenance release for Rails 1.x series
@@ -6,8 +6,8 @@ This release fixes two bugs.
Contributors: Stefan Frey
-Bugs reported by Arne Ãsterlund
+Bugs reported by theos and Russel J. Alphey
Lists of bugs fixed:
-- List of recent files does not work with few entries
-- 1830 Coalfields (and others): Obsolete Trains in Pool should rust (previously the stayed forever)
+- fixed bug in starting a company in 18EU if only one start price is possible
+- fixed bug that the ReportWindow does not scroll down at game start
\ No newline at end of file
diff --git a/src/version.number b/src/version.number
index 385bed2..2ab2e9d 100644
--- a/src/version.number
+++ b/src/version.number
@@ -1,5 +1,5 @@
#Property file that contains version number and the develop indicator
-version=1.7.9
+version=1.7.10
# the following string "@DEVELOP@ is replaced by an empty string in the release version
# this is done automatically by ant
develop=@DEVELOP@
\ No newline at end of file
commit 9198df6e602f5195f1f38e65c412f668aabae76e
Author: Stefan Frey <ste...@we...>
Date: Fri Sep 21 10:45:27 2012 +0200
fixed bug that the ReportWindow does not scrolldown at gameStart, added invokeLater to scrollDown to run in EDT, reported by Russel J. Alphey
(cherry picked from commit 31879bbddbab1a44403379a4ab34004c3c903d53)
diff --git a/src/rails/ui/swing/ReportWindowDynamic.java b/src/rails/ui/swing/ReportWindowDynamic.java
index bed9f8e..2752af9 100644
--- a/src/rails/ui/swing/ReportWindowDynamic.java
+++ b/src/rails/ui/swing/ReportWindowDynamic.java
@@ -181,21 +181,25 @@ public class ReportWindowDynamic extends AbstractReportWindow implements Action
@Override
public void scrollDown() {
// only set caret if visible
- if (!this.isVisible()) return;
+ //if (!this.isVisible()) return;
// find the active message in the parsed html code (not identical to the position in the html string)
// thus the message indicator is used
- int caretPosition;
- try{
- String docText = editorPane.getDocument().getText(0, editorPane.getDocument().getLength());
- caretPosition = docText.indexOf(ReportBuffer.ACTIVE_MESSAGE_INDICATOR);
- } catch (BadLocationException e){
- caretPosition = -1;
- };
- final int caretPositionStore = caretPosition;
- if (caretPosition != -1) {
- editorPane.setCaretPosition(caretPositionStore);
- }
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ int caretPosition;
+ try{
+ String docText = editorPane.getDocument().getText(0, editorPane.getDocument().getLength());
+ caretPosition = docText.indexOf(ReportBuffer.ACTIVE_MESSAGE_INDICATOR);
+ } catch (BadLocationException e){
+ caretPosition = -1;
+ };
+ final int caretPositionStore = caretPosition;
+ if (caretPosition != -1) {
+ editorPane.setCaretPosition(caretPositionStore);
+ }
+ }
+ });
}
public void actionPerformed(ActionEvent e) {
commit afd21447aa9d4ae35f7e00f77c7a6be2b8690816
Author: Stefan Frey <ste...@we...>
Date: Fri Sep 21 10:35:49 2012 +0200
fixed bug in starting a company in 18EU if only one start price is possible, bug reported by theos
(cherry picked from commit 4c1d24f937619baccda7e76d141a621319282d3d)
Conflicts:
src/rails/ui/swing/GameStatus.java
diff --git a/src/rails/ui/swing/GameStatus.java b/src/rails/ui/swing/GameStatus.java
index 9a5e758..0450dfd 100644
--- a/src/rails/ui/swing/GameStatus.java
+++ b/src/rails/ui/swing/GameStatus.java
@@ -18,6 +18,7 @@ import rails.game.*;
import rails.game.action.*;
import rails.game.correct.CashCorrectionAction;
import rails.game.model.PortfolioModel;
+import rails.game.specific._18EU.StartCompany_18EU;
import rails.sound.SoundManager;
import rails.ui.swing.elements.*;
import rails.ui.swing.hexmap.HexHighlightMouseListener;
@@ -769,7 +770,8 @@ public class GameStatus extends GridPanel implements ActionListener {
}
}
int index = 0;
- if (options.size() > 1) {
+ // check for instanceof StartCompany_18EU allows to continue with selecting the minor
+ if (options.size() > 1 || actions.get(0) instanceof StartCompany_18EU) {
if (startCompany) {
RadioButtonDialog dialog = new RadioButtonDialog (
GameUIManager.COMPANY_START_PRICE_DIALOG,
commit 81f16a283eadc74d8aea660409b63a82eeb490ba
Author: Stefan Frey <ste...@we...>
Date: Mon Sep 17 20:18:41 2012 +0200
prepared for 1.7.9 release
(cherry picked from commit 2a12d199876712dd7e83f5ed491e05365e644b5a)
diff --git a/src/readme.txt b/src/readme.txt
index 111a7c4..ba355d5 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -1,13 +1,13 @@
-Rails release 1.7.8:
+Rails release 1.7.9:
A new maintenance release for Rails 1.x series
-This release fixes several bugs.
+This release fixes two bugs.
-Contributors: Erik Vos, Stefan Frey
+Contributors: Stefan Frey
-Bugs reported by Martin Brumm, John David Galt
+Bugs reported by Arne Ãsterlund
Lists of bugs fixed:
-- All Games: Update "PD" label in GameStatus lower player names panel
-- 1835 (and others with NoMapMode): Cannot save game file with ClosePrivate action
+- List of recent files does not work with few entries
+- 1830 Coalfields (and others): Obsolete Trains in Pool should rust (previously the stayed forever)
diff --git a/src/version.number b/src/version.number
index f74a335..385bed2 100644
--- a/src/version.number
+++ b/src/version.number
@@ -1,5 +1,5 @@
#Property file that contains version number and the develop indicator
-version=1.7.8
+version=1.7.9
# the following string "@DEVELOP@ is replaced by an empty string in the release version
# this is done automatically by ant
develop=@DEVELOP@
\ No newline at end of file
commit 2dd67fc4bc701adad9b5e9998d33f0b13b7ef01b
Author: Stefan Frey <ste...@we...>
Date: Mon Sep 17 18:47:13 2012 +0200
fixed problem of obsoleting trains in the pool, as reported by arne oestlund
(cherry picked from commit 1cb73edf9ec9657eaac3665cf7db57908556e88f)
Conflicts:
rails/game/TrainManager.java
diff --git a/src/rails/game/TrainManager.java b/src/rails/game/TrainManager.java
index 289491d..02b3d0e 100644
--- a/src/rails/game/TrainManager.java
+++ b/src/rails/game/TrainManager.java
@@ -328,6 +328,8 @@ public class TrainManager extends RailsManager implements Configurable {
private boolean isTrainObsolete(Train train, Owner lastBuyingCompany) {
// check fist if train can obsolete at all
if (!train.getCertType().isObsoleting()) return false;
+ // and if it is in the pool (always rust)
+ if (train.getOwner() == pool.getParent()) return false;
// then check if obsolete type
if (obsoleteTrainFor == ObsoleteTrainForType.ALL) {
commit 68d5723375b9b4a73adf03ea7af7f7b31738d27c
Author: Stefan Frey <ste...@we...>
Date: Mon Sep 10 15:29:29 2012 +0200
fixed recent file list bug
(cherry picked from commit 0eeb12fa8e0383287abe41d85a8dfc311a0e6126)
Commit was already included, kept for reference.
commit 78c45672597422a92362e0f1c424782c2cbc74d7
Author: Stefan Frey <ste...@we...>
Date: Mon Jul 23 17:01:38 2012 +0200
prepared for 1.7.8 release
(cherry picked from commit 18c0f865fc235df7a4d370114d3d26cb3eff4f76)
diff --git a/src/readme.txt b/src/readme.txt
index 33de310..111a7c4 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -1,4 +1,4 @@
-Rails release 1.7.7:
+Rails release 1.7.8:
A new maintenance release for Rails 1.x series
@@ -6,13 +6,8 @@ This release fixes several bugs.
Contributors: Erik Vos, Stefan Frey
-Bug reported by Are-Harald Brenne, John David Galt
-
-New:
-- Added little fun variant 18Lummer
+Bugs reported by Martin Brumm, John David Galt
Lists of bugs fixed:
-- Errors in UI after adding a comment at game start
-- Fixed failure on reloading a just started game
-- 1835: Manual close of Pfalzbahn is possible (to enable closing after token lay only)
-- 1835 (and others): Fixed UI issues with token relays on OO-tiles
+- All Games: Update "PD" label in GameStatus lower player names panel
+- 1835 (and others with NoMapMode): Cannot save game file with ClosePrivate action
diff --git a/src/version.number b/src/version.number
index 60520e3..f74a335 100644
--- a/src/version.number
+++ b/src/version.number
@@ -1,5 +1,5 @@
#Property file that contains version number and the develop indicator
-version=1.7.7
+version=1.7.8
# the following string "@DEVELOP@ is replaced by an empty string in the release version
# this is done automatically by ant
develop=@DEVELOP@
\ No newline at end of file
commit d0c93922e840fca16e8c628e654e53e411b3b6d7
Author: Erik Vos <eri...@xs...>
Date: Mon Jul 23 12:06:11 2012 +0200
Fix to all games: update PD in GameStatus lower player names row.(cherry picked from commit 7d694b4bc788283c72de5165dee0d54ee55cb6d1)
(cherry picked from commit 59d48a43689c5128a9487290d0682e0961201c6e)
Conflicts:
src/rails/ui/swing/GameStatus.java
diff --git a/src/rails/ui/swing/GameStatus.java b/src/rails/ui/swing/GameStatus.java
index 9e22716..9a5e758 100644
--- a/src/rails/ui/swing/GameStatus.java
+++ b/src/rails/ui/swing/GameStatus.java
@@ -977,8 +977,9 @@ public class GameStatus extends GridPanel implements ActionListener {
public void setPriorityPlayer(int index) {
for (int j = 0; j < np; j++) {
- upperPlayerCaption[j].setText(players[j].getId()
- + (j == index ? " PD" : ""));
+ String playerNameAndPriority = players[j].getId() + (j == index ? " PD" : "");
+ upperPlayerCaption[j].setText(playerNameAndPriority);
+ lowerPlayerCaption[j].setText(playerNameAndPriority);
}
}
commit 5d1855c07242cdad121ee11c6a210c3a55cd946c
Author: Stefan Frey <ste...@we...>
Date: Sun Jul 22 23:32:17 2012 +0200
fixed bug: cannot save game file with ClosePrivate action, reported by John David Galt
(cherry picked from commit b564e00983be9033464fd3e0658d61143ab5bf5f)
Conflicts:
src/rails/game/correct/ClosePrivate.java
diff --git a/src/rails/game/correct/ClosePrivate.java b/src/rails/game/correct/ClosePrivate.java
index 0ffea43..7a10c3e 100644
--- a/src/rails/game/correct/ClosePrivate.java
+++ b/src/rails/game/correct/ClosePrivate.java
@@ -18,7 +18,7 @@ public class ClosePrivate extends PossibleAction {
/* Preconditions */
/** private company to close */
- private PrivateCompany privateCompany;
+ transient private PrivateCompany privateCompany;
/** converted to name */
private String privateCompanyName;
commit c910d16695395424919bc5312cfebf04b95d18d3
Author: Stefan Frey <ste...@we...>
Date: Fri Jun 15 17:35:37 2012 +0200
prepared for release 1.7.7
(cherry picked from commit 90ba59260b14c2a7d5f14a37c730d7d0cc5e0baf)
diff --git a/src/readme.txt b/src/readme.txt
index a1180ee..33de310 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -1,12 +1,18 @@
-Rails release 1.7.6:
+Rails release 1.7.7:
A new maintenance release for Rails 1.x series
-This release fixes one sole bug.
+This release fixes several bugs.
-Contributors: Erik Vos
+Contributors: Erik Vos, Stefan Frey
-Bug reported by Antonio Baracca
+Bug reported by Are-Harald Brenne, John David Galt
-1856: Allowing selling a share just bought by the president.
-(According to Steve Thomas rule clarification).
\ No newline at end of file
+New:
+- Added little fun variant 18Lummer
+
+Lists of bugs fixed:
+- Errors in UI after adding a comment at game start
+- Fixed failure on reloading a just started game
+- 1835: Manual close of Pfalzbahn is possible (to enable closing after token lay only)
+- 1835 (and others): Fixed UI issues with token relays on OO-tiles
diff --git a/src/version.number b/src/version.number
index cde0424..60520e3 100644
--- a/src/version.number
+++ b/src/version.number
@@ -1,5 +1,5 @@
#Property file that contains version number and the develop indicator
-version=1.7.6
+version=1.7.7
# the following string "@DEVELOP@ is replaced by an empty string in the release version
# this is done automatically by ant
develop=@DEVELOP@
\ No newline at end of file
commit 65107299650c9c09229f3f88bf03f952eb494115
Author: Erik Vos <eri...@xs...>
Date: Fri Jun 15 13:48:48 2012 +0200
Fixed failure on reloading a null action list.
GameFileIO.replayGame() was not protected against that condition.
[IMO the list should have been created empty, not null; EV](cherry picked from commit ee3e580ae2efdb10c28bdfe0565566e39f17491a)
(cherry picked from commit bf16424ac310389b5b48fabfc11a86a6f2a93a29)
Conflicts:
src/rails/util/GameFileIO.java
diff --git a/src/rails/util/GameFileIO.java b/src/rails/util/GameFileIO.java
index 7e97190..f4feece 100644
--- a/src/rails/util/GameFileIO.java
+++ b/src/rails/util/GameFileIO.java
@@ -227,16 +227,17 @@ public class GameFileIO {
gameManager.setReloading(true);
int count = -1;
- // set possible actions for first action
- gameManager.getCurrentRound().setPossibleActions();
-
- for (PossibleAction action : gameData.act...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X