Menu
▾
▴
rails-commits — CVS Commits
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
(46) |
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(51) |
Feb
(10) |
Mar
|
Apr
|
May
(14) |
Jun
|
Jul
(13) |
Aug
(30) |
Sep
(83) |
Oct
(56) |
Nov
(148) |
Dec
(107) |
| 2010 |
Jan
(260) |
Feb
(164) |
Mar
(183) |
Apr
(99) |
May
(160) |
Jun
(40) |
Jul
(33) |
Aug
(48) |
Sep
(22) |
Oct
(24) |
Nov
(1) |
Dec
(12) |
| 2011 |
Jan
(6) |
Feb
(15) |
Mar
(13) |
Apr
(37) |
May
(27) |
Jun
(29) |
Jul
(33) |
Aug
(20) |
Sep
(17) |
Oct
(20) |
Nov
(33) |
Dec
(17) |
| 2012 |
Jan
(39) |
Feb
(38) |
Mar
(20) |
Apr
(21) |
May
(17) |
Jun
(22) |
Jul
(16) |
Aug
(3) |
Sep
(9) |
Oct
(10) |
Nov
|
Dec
|
|
From: Erik V. <ev...@us...> - 2009-11-23 18:32:55
|
Update of /cvsroot/rails/18xx/data/18AL In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv613/data/18AL Modified Files: Game.xml Log Message: Added new GameOption "LeaveAuctionOnPass" to 1830-style games Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18AL/Game.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Game.xml 3 Sep 2009 21:36:54 -0000 1.20 --- Game.xml 23 Nov 2009 18:32:47 -0000 1.21 *************** *** 5,8 **** --- 5,9 ---- <GameOption name="UnlimitedTopTrains" parm="4D" type="toggle" default="no"/> <GameOption name="Obsolete4Trains" type="toggle" default="yes"/> + <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> <OperatingRound class="rails.game.specific._18AL.OperatingRound_18AL"/> <ORUIManager class="rails.ui.swing.gamespecific._18AL.ORUIManager_18AL"/> |
|
From: Erik V. <ev...@us...> - 2009-11-23 18:32:55
|
Update of /cvsroot/rails/18xx/rails/game In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv613/rails/game Modified Files: Round.java StartRound_1830.java GamesInfo.java GameOption.java PublicCompany.java Log Message: Added new GameOption "LeaveAuctionOnPass" to 1830-style games Index: StartRound_1830.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/StartRound_1830.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** StartRound_1830.java 22 Nov 2009 14:28:49 -0000 1.24 --- StartRound_1830.java 23 Nov 2009 18:32:45 -0000 1.25 *************** *** 306,315 **** } else { // More than one left: find next bidder ! ! //auctionItem.setBid(-1, player); ! // That was incorrect: passing players may still bid. ! // But often they won't, or don't have the money. ! // TODO Need autopass facility, and skipping of turns if no money ! setNextBiddingPlayer(auctionItem, getCurrentPlayerIndex()); --- 306,315 ---- } else { // More than one left: find next bidder ! ! if (GameOption.OPTION_VALUE_YES.equalsIgnoreCase(getGameOption("LeaveAuctionOnPass"))) { ! // Game option: player to leave auction after a pass (default no). ! auctionItem.setBid(-1, player); ! } ! setNextBiddingPlayer(auctionItem, getCurrentPlayerIndex()); Index: PublicCompany.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** PublicCompany.java 2 Nov 2009 23:30:36 -0000 1.71 --- PublicCompany.java 23 Nov 2009 18:32:45 -0000 1.72 *************** *** 1793,1797 **** public boolean canLoan() { ! return maxNumberOfLoans > 0; //TODO Does not work?? (see ORPanel) } --- 1793,1797 ---- public boolean canLoan() { ! return maxNumberOfLoans != 0; } Index: Round.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/Round.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Round.java 7 Oct 2009 19:00:38 -0000 1.27 --- Round.java 23 Nov 2009 18:32:44 -0000 1.28 *************** *** 116,119 **** --- 116,122 ---- } + public String getGameOption (String name) { + return gameManager.getGameOption(name); + } /* * (non-Javadoc) Index: GameOption.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/GameOption.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GameOption.java 15 Jan 2009 20:53:28 -0000 1.7 --- GameOption.java 23 Nov 2009 18:32:45 -0000 1.8 *************** *** 18,21 **** --- 18,24 ---- new HashMap<String, GameOption>(); + public static final String OPTION_VALUE_YES = "yes"; + public static final String OPTION_VALUE_NO = "no"; + public static final String NUMBER_OF_PLAYERS = "numberOfPlayers"; Index: GamesInfo.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/GamesInfo.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GamesInfo.java 4 Jun 2008 19:00:32 -0000 1.7 --- GamesInfo.java 23 Nov 2009 18:32:45 -0000 1.8 *************** *** 1,4 **** /** ! * This is a singleton class that encapsulates the static game info * contained in data/Games.xml. * This information is available through a number of getters. --- 1,4 ---- /** ! * This is a singleton class that encapsulates the static game info * contained in data/Games.xml. * This information is available through a number of getters. *************** *** 6,13 **** package rails.game; ! import java.util.ArrayList; ! import java.util.HashMap; ! import java.util.List; ! import java.util.Map; import rails.util.Tag; --- 6,10 ---- package rails.game; ! import java.util.*; import rails.util.Tag; *************** *** 16,20 **** /** * @author Erik Vos ! * */ public class GamesInfo { --- 13,17 ---- /** * @author Erik Vos ! * */ public class GamesInfo { *************** *** 63,66 **** --- 60,64 ---- myGamesXmlFile = GAMES_XML; } + System.out.println("Loading games list from "+myGamesXmlFile); List<String> directories = new ArrayList<String>(); |
|
From: Erik V. <ev...@us...> - 2009-11-23 18:32:55
|
Update of /cvsroot/rails/18xx/data/1870 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv613/data/1870 Modified Files: Game.xml Log Message: Added new GameOption "LeaveAuctionOnPass" to 1830-style games Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1870/Game.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Game.xml 3 Sep 2009 21:36:54 -0000 1.19 --- Game.xml 23 Nov 2009 18:32:47 -0000 1.20 *************** *** 3,6 **** --- 3,7 ---- <Component name="GameManager" class="rails.game.GameManager"> <Game name="1870"/> + <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> <PlayerShareLimit percentage="60"> <PriceProtection/> |
|
From: Erik V. <ev...@us...> - 2009-11-23 18:32:55
|
Update of /cvsroot/rails/18xx/data/18Kaas In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv613/data/18Kaas Modified Files: Game.xml Log Message: Added new GameOption "LeaveAuctionOnPass" to 1830-style games Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/Game.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Game.xml 3 Sep 2009 21:36:54 -0000 1.5 --- Game.xml 23 Nov 2009 18:32:47 -0000 1.6 *************** *** 3,6 **** --- 3,7 ---- <Component name="GameManager" class="rails.game.GameManager"> <Game name="18Kaas"/> + <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> <PlayerShareLimit percentage="60"/> <BankPoolLimit percentage="50"/> |
|
From: Erik V. <ev...@us...> - 2009-11-23 18:32:04
|
Update of /cvsroot/rails/18xx/rails/game In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv494/rails/game Modified Files: StockRound.java Log Message: MInor change (separate var. numberSold) Index: StockRound.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** StockRound.java 6 Nov 2009 20:22:44 -0000 1.49 --- StockRound.java 23 Nov 2009 18:31:54 -0000 1.50 *************** *** 926,934 **** } ! numberToSell = action.getNumberSold(); if (errMsg != null) { DisplayBuffer.add(LocalText.getText("CantSell", playerName, ! numberToSell, companyName, errMsg )); --- 926,934 ---- } ! int numberSold = action.getNumberSold(); if (errMsg != null) { DisplayBuffer.add(LocalText.getText("CantSell", playerName, ! numberSold, companyName, errMsg )); *************** *** 951,968 **** moveStack.start(true); ! if (numberToSell == 1) { ReportBuffer.add(LocalText.getText("SELL_SHARE_LOG", playerName, company.getShareUnit(), companyName, ! Bank.format(numberToSell * price) )); } else { ReportBuffer.add(LocalText.getText("SELL_SHARES_LOG", playerName, ! numberToSell, company.getShareUnit(), ! numberToSell * company.getShareUnit(), companyName, ! Bank.format(numberToSell * price) )); } --- 951,968 ---- moveStack.start(true); ! if (numberSold == 1) { ReportBuffer.add(LocalText.getText("SELL_SHARE_LOG", playerName, company.getShareUnit(), companyName, ! Bank.format(numberSold * price) )); } else { ReportBuffer.add(LocalText.getText("SELL_SHARES_LOG", playerName, ! numberSold, company.getShareUnit(), ! numberSold * company.getShareUnit(), companyName, ! Bank.format(numberSold * price) )); } *************** *** 989,993 **** } } ! company.adjustSharePrice (SOLD, numberToSell, gameManager.getStockMarket()); // Check if we still have the presidency --- 989,993 ---- } } ! company.adjustSharePrice (SOLD, numberSold, gameManager.getStockMarket()); // Check if we still have the presidency |
|
From: Erik V. <ev...@us...> - 2009-11-23 18:31:35
|
Update of /cvsroot/rails/18xx/rails/game In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv311/rails/game Modified Files: ShareSellingRound.java Log Message: Fixed bug that price wasn't adjusted at emergency share selling Index: ShareSellingRound.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/ShareSellingRound.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ShareSellingRound.java 7 Oct 2009 19:00:38 -0000 1.24 --- ShareSellingRound.java 23 Nov 2009 18:31:23 -0000 1.25 *************** *** 352,356 **** } } ! company.adjustSharePrice (SOLD, numberToSell, gameManager.getStockMarket()); // Check if we still have the presidency --- 352,356 ---- } } ! company.adjustSharePrice (SOLD, numberSold, gameManager.getStockMarket()); // Check if we still have the presidency |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:48:57
|
Update of /cvsroot/rails/18xx In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30256 Modified Files: build.xml rails.sh rails.bat .cvsignore Log Message: Update version to 1.0.7-rc3 Index: .cvsignore =================================================================== RCS file: /cvsroot/rails/18xx/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .cvsignore 3 Oct 2009 14:02:28 -0000 1.4 --- .cvsignore 22 Nov 2009 18:48:41 -0000 1.5 *************** *** 20,21 **** --- 20,23 ---- tools rails-?.*.* + jar/* + classes/* Index: rails.bat =================================================================== RCS file: /cvsroot/rails/18xx/rails.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rails.bat 14 Nov 2009 20:21:51 -0000 1.2 --- rails.bat 22 Nov 2009 18:48:41 -0000 1.3 *************** *** 1,2 **** ! java -jar rails-1.0.7-rc2.jar %1 \ No newline at end of file --- 1,2 ---- ! java -jar rails-1.0.7-rc3.jar %1 \ No newline at end of file Index: rails.sh =================================================================== RCS file: /cvsroot/rails/18xx/rails.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rails.sh 14 Nov 2009 20:21:51 -0000 1.2 --- rails.sh 22 Nov 2009 18:48:41 -0000 1.3 *************** *** 1,3 **** #!/bin/bash ! java -jar ./rails-1.0.7-rc2.jar $1 --- 1,3 ---- #!/bin/bash ! java -jar ./rails-1.0.7-rc3.jar $1 Index: build.xml =================================================================== RCS file: /cvsroot/rails/18xx/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.xml 14 Nov 2009 20:21:51 -0000 1.4 --- build.xml 22 Nov 2009 18:48:41 -0000 1.5 *************** *** 10,14 **** <property name="target" value="1.5"/> <property name="source" value="1.5"/> ! <property name="version" value="1.0.7-rc2"/> <path id="18xx.classpath"> <pathelement location="classes"/> --- 10,14 ---- <property name="target" value="1.5"/> <property name="source" value="1.5"/> ! <property name="version" value="1.0.7-rc3"/> <path id="18xx.classpath"> <pathelement location="classes"/> |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:48:50
|
Update of /cvsroot/rails/18xx/rails/game In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30256/rails/game Modified Files: Game.java Log Message: Update version to 1.0.7-rc3 Index: Game.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/Game.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Game.java 17 Nov 2009 19:31:26 -0000 1.38 --- Game.java 22 Nov 2009 18:48:40 -0000 1.39 *************** *** 12,16 **** public class Game { ! public static final String version = "1.0.7-rc2"; /** The component Manager */ --- 12,16 ---- public class Game { ! public static final String version = "1.0.7-rc3"; /** The component Manager */ |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:58
|
Update of /cvsroot/rails/18xx/jar/rails/ui/swing/gamespecific/_18AL In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/rails/ui/swing/gamespecific/_18AL Log Message: Directory /cvsroot/rails/18xx/jar/rails/ui/swing/gamespecific/_18AL added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:58
|
Update of /cvsroot/rails/18xx/jar/tiles/images In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/tiles/images Log Message: Directory /cvsroot/rails/18xx/jar/tiles/images added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:58
|
Update of /cvsroot/rails/18xx/jar/rails/ui/swing/gamespecific In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/rails/ui/swing/gamespecific Log Message: Directory /cvsroot/rails/18xx/jar/rails/ui/swing/gamespecific added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:42
|
Update of /cvsroot/rails/18xx/jar/rails/common In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/rails/common Log Message: Directory /cvsroot/rails/18xx/jar/rails/common added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:42
|
Update of /cvsroot/rails/18xx/jar/rails/game/specific/_1851 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/rails/game/specific/_1851 Log Message: Directory /cvsroot/rails/18xx/jar/rails/game/specific/_1851 added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:42
|
Update of /cvsroot/rails/18xx/jar/rails In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/rails Log Message: Directory /cvsroot/rails/18xx/jar/rails added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:42
|
Update of /cvsroot/rails/18xx/jar/data/18Kaas In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/data/18Kaas Log Message: Directory /cvsroot/rails/18xx/jar/data/18Kaas added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:42
|
Update of /cvsroot/rails/18xx/jar/rails/game/specific/_18AL In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/rails/game/specific/_18AL Log Message: Directory /cvsroot/rails/18xx/jar/rails/game/specific/_18AL added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:42
|
Update of /cvsroot/rails/18xx/jar/rails/ui/swing In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/rails/ui/swing Log Message: Directory /cvsroot/rails/18xx/jar/rails/ui/swing added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:42
|
Update of /cvsroot/rails/18xx/jar/rails/ui/swing/hexmap In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/rails/ui/swing/hexmap Log Message: Directory /cvsroot/rails/18xx/jar/rails/ui/swing/hexmap added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:42
|
Update of /cvsroot/rails/18xx/jar/rails/game/action In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/rails/game/action Log Message: Directory /cvsroot/rails/18xx/jar/rails/game/action added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:42
|
Update of /cvsroot/rails/18xx/jar/data/1830 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/data/1830 Log Message: Directory /cvsroot/rails/18xx/jar/data/1830 added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:42
|
Update of /cvsroot/rails/18xx/jar/rails/util In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/rails/util Log Message: Directory /cvsroot/rails/18xx/jar/rails/util added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:42
|
Update of /cvsroot/rails/18xx/jar/data/1835 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/data/1835 Log Message: Directory /cvsroot/rails/18xx/jar/data/1835 added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:40
|
Update of /cvsroot/rails/18xx/jar/data/1870 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/data/1870 Log Message: Directory /cvsroot/rails/18xx/jar/data/1870 added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:40
|
Update of /cvsroot/rails/18xx/jar/test In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/test Log Message: Directory /cvsroot/rails/18xx/jar/test added to the repository |
|
From: Brett L. <wak...@us...> - 2009-11-22 18:36:40
|
Update of /cvsroot/rails/18xx/jar/rails/game/specific In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/jar/rails/game/specific Log Message: Directory /cvsroot/rails/18xx/jar/rails/game/specific added to the repository |
