From: Brett L. <wak...@us...> - 2011-07-17 19:35:55
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The annotated tag, v1.1.3 has been created at 919bd0b063586b6d0f33a3cb257599e14e20b1f1 (tag) tagging 2a449ca2f381d9a8397af3abaee57bcc5852fa95 (commit) tagged by Brett Lentz on Sun Jul 17 12:29:22 2011 -0700 - Log ----------------------------------------------------------------- Rails v1.1.3 Brett Lentz (256): initial checkin initial checkin initial checkin This commit was generated by cvs2svn to compensate for changes in r6, which Removing files that were accidentally uploaded. Convert arrays to ArrayLists Adding Erik Vos' changes Adding framework for test cases Test structure for stock market UI Object Model from Stewart Thain Updated obect model from Stewart Thain Test class for swing-based stock chart UI Added test for displaying test stockchart swing class Merging Erik Vos' updates Adding Iain Adams' DOM libraries Minor tweaks More testing out Swing Rudimentary chit definitions Merging Erik Vos' updates Added explicit licensing information New UI Tests Merging update from Erik Vos Merged updates Fixed formatting Merging updates from Erik Vos Merging Iain Adams' changes. Merging Iain Adams' Changes Merging Iain Adams' changes Updated StockChart to use data from game/StockChart Merging updates Merging Iain Adams' files. Stockmarket now does color! StockChart does colors! Fixed Stock Chart to display correct values Bug Fixes. Market should display 100% correctly now. Changed color from int to String Merging Erik's updates Merging Erik's updates. Merging Erik's updates Merging Erik's updates from 3/20. Merging Erik's changes of 3/20. Removing files that are outside the scope of this project Added StockChit code; Removed usage of interfaces as objects; fixed a few bugs. Reverting to previous copy Initial working stockchit code. Tokens now drawn using both colors Clean up the token displaying. Renamed StockChit to StockToken; Added CompanyStatus Added Listeners to start supporting basic token movement (not finished yet); Fully Working Stock Token Movement Initial code for displaying Player Status Bug fix in Stock Token display Initial support for new game options Minor bugfix. Added test class for initializing the game. UI Tweaks; Improved GameInit Screen Renamed GameInit to Options; Fixed Player name display support. Minor Token Placement Fix Major performance bug fixed; other minor tweaks here and there; *** empty log message *** Lots of UI updates Added UI to create companies Company Purchasing UI updates Game and Bank are now static; GameLoder renamed to GameUILoader Added PlayerManager, fixed a bug in Portfolio, added buying and selling stock to Player Changed Stock to Certificate in StockMarket.java Beginnings of CertificateStatus seperated game status info into its own window. Initial UI code for buying any stock Improved StatusWindow display; Added GetNextAvailableCertificate method to Portfolio Improved UI behavior; Fixed many calculation bugs. Added ability to sell shares. Fixed "StartCompany transfers too much money" bug Initial Hex draing files taken from colossus.sf.net Added stock pools to CompanyStatus; Added Token movement for stock sale. Hex files from Colossus Initial HexMap main() for testing Initial Auction Window. minor tweaks to get StartRoundWindow to display correctly Cleaned out colossus-specific code. Remove debugging console output. Add missing pieces to Hex test display More HexTest Code Hex display fixes. *** empty log message *** Initial stab at Map.XML Added Tile Colors for towns. Added </Map> Tag. Create initial stab at NS and EW oriented hexes. Tweaks to the hex layout Minor tweaks to hex layout E-W hexes now displaying correctly. Reorganizing code from Oriented-HexMap into HexMap class Fixed repaint bug First stab at Tileset definitions. Adding Batik libraries *** empty log message *** Added some basic math reminders. initial tile image support Tile images kinda sorta work. Almost. Commented out work-in-progress code. Minor UI adjustments mostly working map tiles map tile images added transparency Transparent GIFs work better than PNGs GIF works better than PNG Tweaks to tile loading First stab at clickable map. adding loading orientation from xml Interactivity broken, orientation fixed. Interactivity fixed, rotation bugs exist. setClip() to fix bounds box issues. Adding Scale class from Colossus source tree. NS Tile images working. Other minor cleanups as well. Tile Display Updates New tiles for 18AL and 1856 Added Mnemonics to all buttons. Added basic menu to Map. small UI updates. small UI updates. Resized the options window. Removed old code from start round window UI Cleanups. Moved drop-down menu to StatusWindow. Added selectors to draw specific windows. No longer drawing all windows. Scrolling MapWindow Fully working scrollbars on the map. small UI updates. Twiddling the menu checkboxes for consistency using drawOverlay() works. rotation and repainting is broken. Fixed rotation. Still a ton of repaint bugs. Fix problem with Scale by explicitly setting Scale in MapWindow A bunch of cleanups. Lots of comments added to help track down repaint bugs. Minor code cleanups. Added more mnemonics. Added lots of JavaDoc comments Added more JavaDoc comments Minor UI behavior updates. Adding more debugging code and comments for the paint bugs. Fixed repaint issues by using ScrollPane instead of JScrollPane adjusted repainting behavior of mouseClicked Defaulting useOverlay and useAntialias to true. Modifications to UpgradesPanel and classes touched by the UP. Disabled overlays due to clipping issues. UpgradesPanel mostly works. Fixed repaint and scrolling bugs. FINALLY. UpgradesPanel populates correctly now. Display Tile graphic in upgrades panel. basic functionality for laying tiles works. Adding upgrade cost and company home designations to the map. Add Company Destination to tooltips Fixed StatusWindow checkbox bug Tile laying only allowed during Operating Round Adding initial TokenHolder code. Added More Token Laying Code. Properly decrement numCityTokens after laying a token Move home token laying to a more sane location First stab at token laying More token laying code Adjusting the visibility of some methods Removing some unnecessary comments. Bugfixing token placement. Added station size checking before token laying Adding tokens to the hex AND company token lists. Token Laying bug fix. Other minor cleanups as well. Updated tile images. Some orientations rotated. More token drawing positions Bug fixes. Slightly improved token adjustments. Fixed moving tokens when tiles are upgraded. One-liner moveToken fix. Added size checking for addToken Adding size checking for token laying Updated highlighting clicked hexes logic. initial UI for prompting user about token placement added a toString method Added checking for existing company token. Displaying blocked hexes on the map. Fix station selection bug. Improve drawing location of tokens. Merging ORWindow and MapWindow. Map Window Display Update ORWindow display bugfix String cleanups. Window display bug fixed. Fixed move tokens bug. Preparing for end game. Changed addCash to return a boolean. Removing ORWindow dependancies. Finished removing ORWindow dependancies Fix invalid cast and reworking StockChart Code clean ups. Restore some update methods String abstraction and Bug fixing in ORWindow and ORPanel Fixed transition to SR from OR. Fixed ORPanel repainting. Fixed hex selection bug. Added AUTHORS SVG Tiles Fixing the SVG images and changing loader from gif to svg Fixing the SVG images and changing loader from gif to svg Added fallback to GIF. SVG tiles for 18KAAS Gif tiles for 18KAAS Added ScrollPane to UpgradesPanel Fix UpgradesPanel button inconsistency. Fixed ArrayOutOfBoundsException being thrown. Improved localization support. Moved a large number of strings to LocalisedText.properties Improved localization support. Moved a large number of strings to LocalisedText.properties Disabled load/save UI buttons to reduce confusion. Added Tiles for 1835 Changed variant popup into checkboxes in options UI. Reverting previous changes Move creation of ImageLoader to GameUILoader, improved image caching Clean up Imageloader Commenting out the servlet classes so that they no longer show compiler errors. Slight adjustments to image's vertical sizing. Slight adjustments to image's vertical sizing. Slight adjustments to image's vertical sizing. Adjusted image scaling to improve quality of displayed tiles. Allow game to operate even if we can't find my.properties or LocalisedText Fixing GIF tile sizing Centralised the jar filename to a single location. Fixed setMnemonic typo. Improved mnemonics. Moving log4j into it's own subdirectory. Update log4j to use a relative path set DefaultCloseOperation to DISPOSE_ON_CLOSE Exiting after "Unable to load game" error. Migration to use ResourceLoader Removed 1830test Migration to use ResourceLoader Finishing migration to ResourceLoader New tiles for 18AL and 1851 Remove Windows-specific reference Remove old commented-out code Renamed Options to GameSetupWindow Merged FinishSetup() into StartNewGame() Add dynamic resizing to player name text boxes. Fixed window sizing issues across all window components. Fixed missing null checking on game start Added game notes button. First, incomplete map for 18EU Improving the text on the Game Options button. Stockmarket and Tileset XML files for 18EU Adding 18EU Tile images. Added SerialNumbers Version string bump. Applied patch from Micha? Ba?y?ski Bump version string. Fix fill-rule. It's evenodd, not even-odd. Applying patch from Freek Dijkstra. Applying patch from Freek Dijkstra. Move </html> to the right line. Add syncmail to commits mailing list. Add some missing authors. Add build.xml. Bump version to 1.0.7-rc1 Add batch file and shell script to cvs. Update version references to 1.0.7-rc2. Improve build.xml to better automate building a release. Update version to 1.0.7-rc3 bump version to 1.1.0 bump version to 1.1.1 update version string to 1.1.2 Apply Unlimited Trains patch from Freek Dijkstra <sf_...@ma...> Revert Freek Dijkstra's unlimited trains patch. We found a simpler way to implement this. Add unlimited tiles option back in. Bump version strings to 1.1.3 Erik Vos (761): Standard project directories initialized by cvs2svn. Certificates added Updated Added New classes/interfaces Was hard to get in... Moved here from game.test Adapted to changed Game initiation New method that returns integer attribute value Added a few dropped I's (interface) to names *** empty log message *** Updates to configure Bank amount. This required some rearrangements. Added Bank Added Certificates and Bank Implemented initial player cash Added Player (initial cash, cert.limit) Added use of Color objects All colours now as hex values Changes to get Hex colour values Now gets Color objects from Company Removed (?) Fixed colour->Colour (again?) Mostly Javadoc Removed some outcommented code Javadoc .start replaced by .setParPrice (duplicate methods) Adapted to new Player without the player list :-( To make it work with Java 1.4 PublicCompany now has shareUnit, and Certificates has shares. New share values Added ".getContentPane()" to make it Java 1.4-compatible. No differences Initial versions of Round and StockRound, and related changes StockRound finalised (more or less) Changes caused by implementation of OperatingRound StockRound interface now uses Strings for names rather than objects Added GameManager (initial version), Bank.format() etc. Renamed Certificate(I) to PublicCertificate(I) Renamed from Certificate(I) Added StartRound_1830. Lots of changes to other classes. Fixes and minor additions Fixes, and implemented SVRR price reduction if unsold CompositeOrNumber now returned as String (was double) Float percentage added Added getGames() method Block cash used in bidding. Minor cleanup Mainly Javadoc Use Game.getGames() Added pool share limit Minor changes, fix for share selling bug *** empty log message *** StockRound extended: presidency changes, partial handling of double shares. Privates can now be closed in an Operating Round Added 1835 (3 variants). Implemented auction in StartRound1830 StartRound cleanups & fixes New UI, with functionality as in TestGameServlet - UI cleanup Basic maps for 1830 and 1856 The Tile Dictionary converted to Tiles.xml Fixes Tiles set for 1830 Added Tiles.xml for 1856. Small comment update Added 1870 map & tiles. Added Trains Removed old code *** empty log message *** Added orientation to 1830 map *** empty log message *** Added orientation code 1870 map corrected Added orientations *** empty log message *** 18AL map fixes *** empty log message *** Failed attempts to enable tooltips on the map Rotations now properly derived from PI Frist Diesel exchange implemented Outcommented setPreferredSize() Neighbour setting in MapHex Basic implementation of phases, including train limits. Removed unused imports. Hexmap code cleanup. Bugfix Added private closing on first train buy Added comment on orientation numbers. IMplemented impassable hexsides Added preprinted track impassable hex side detection. Added map tooltips per hex/tile. Panel for upgrade tiles in MapWindow Removed redundant method getMapHexModel() *** empty log message *** *** empty log message *** Fix map size and positioning *** empty log message *** *** empty log message *** *** empty log message *** *** empty log message *** Cleanup and improvements, phase 1 Cleanup and improve, phase 2 Only valid tile orientations now allowed. Fixed rotation: no more adjustments. Cleanups phase 3. Fixed tooltip Minor improvements Tile laying integration phase 1 Tile laying integration phase 2. Basic Help system added Help window using JEditorPane Private special properties phase 1 Special properties phase 2 Special tile lays for 1830 completed OR updates Granular Model/View phase 1 Granular model/view,phase 2 *** empty log message *** Token laying step - phase 1 Base token laying phase 2 base token laying phase 3 & other small improvements Fixes and small improvements. Added city positions to Tiles.xml. Minor changes Tile quantity observed. Corrected 1830 tile orientations Preserve track (except OO). NoTile/Token texts in upgrade panel Correct number of ORs per SR Number of ORs per SR Close privates at first 5-train. Fixed special tile laying. Fixed special tile laying bug. Added token cost info to other games than 1830. Added static getLastORNUmber() Always show price & loacation on stock chart Reorder companies in a 2nd and 3rd OR Fixed bug in assignment number of ORs per SR Buy at par price from IPO (was: all at current price) Fixed off-by-one error in getTrainLimit Fixed checking buying shares that have been sold in the same round. M&H-NYC swap New message panel in ORWindow, with localised messages. *** empty log message *** Game end (maybe not yet complete) *** empty log message *** Fix Lots of minor fixes, mostly to get OR display correct again. Updated stock chart so that only changed squares are updated Granular Model/View for LastRevenue Fixes to D train exchange and 4-train rusting. Enabled reading files from the jar ORPanel/OperatingRound cooperation for train buying changed to move the game decisions to the Model. buyTrain: lookup train for selected prompt rather than parse it. Added coordinates Added president help in buying trains, including selling shares in an ShareSellingRound. Implemented TradeableCertificates for buying. Make GameStatus aware of sellable certificates. Game end implementation. Add "Close all windows" button after game end. Several fixes Implemented 18Kaas *** empty log message *** Fixed share trading bugs. Mark President in Game Status window. Fixed available tile counting Fixed bug with tile laying at cost with no money (bug 1517705) Fixed tile- and tokenlaying related bugs (wrong repainting of UpgradesPanel) Train buying fixes Train buying improvements Added localisation strings with parameters using MessageFormat Remove "Buy Private" button if nothing to buy First basic Action/Undo classes Added basic Undo for stock trading. Not all side effects covered yet! Extended Undo to cover all Stock Round actions, except turn change. Improved log messages Added Redo Upgraded StartRound View/Model interface to work similar to stock rounds. Fixed capitalisation. Added exchange shares Remove default certs if company-specific certs are defined 1835 map Changed home base token management such that one tile can contain multiple home bases in multiple stations (cities). Fixed token laying. 1835 majors can now lay 2 yellow tiles in the yellow phase. Off-board revenue values in tooltips. Added private special properties (tile and token lays). Added red message about active special properties to the Map Window. Renamed game.action package to game.move, and Action to MoveSet. Implemented "PossibleAction" for private buying. Fixed special tile lays in 1830. Fixed extra tile laying message in 1830. Some cleanups. Added XML option to make owning a train optional (for minors as in 1835) *** empty log message *** Token laying now uses LayToken allowance objects. Special properties for condition "ifOwnedByPlayer" (as in 1835) now work. Cleanup in localised text. Localised tooltips More localisation cleanups Implemented Undo/Redo for tile lays. Added tokens display to GameStatus and ORPanel. Implemented undo/redo for token lays. Added check that a company cannot lay tokens twice on one hex. Implemented Undo/Redo for the OR revenue entry and payout steps. Imports cleaned up All user messages in OperatingRound are now localised. 1870 fixes Detect absence of stations while laying tokens Some tile-laying related fixes. Added log4j logging and applied to ImageLoader only. System.out.print replaced by log4j logging. Simplified my.properties. Some StartRound fixes, more localisations, and cosmetic changes Added some config items to my,properties. Moved version-string from LocalText to Game. Package names changed (rails prepended) Remove corrupt jars Improved Undo/Redo, mainly in the OR. MoveSet.add() calls moved down into Move subclasses Minor changes Start Round processing updated: Applied parametrized collections to resolve most Java 1.5 warnings. More generics and for/in loops More generics and for/in loops Restructured StockRound View/Model interface to use new PossibleAction subclass objects. Bug fixes and minor improvements to the StockRound overhaul. Fixed bug (ClassCastException when clicking Map checkbox) Cleanup Fix: put only slash after tileRootDir if it has a value OR using PossibleAction object for execution. Removed redundant classes. Removed redundant classes. Undo/Redo completed. Cleanup Save/Load. Fixed bug: laid tiles not shown after Load. Fixed bug: No payout options shown after Set Revenue Fixed more bugs Bugs fixed. new SerialVersionUID because of changes Added playability comments to game list in Options. Added Game Options, allowing conditional attributes (see example in 1830/Game.xml). Also used to replace Variant choices. Integrated game option setting into the Options window. Preparations for adding Bonus Tokens, as in 18AL, 1856 etc. Streamlined Game startup interface. Cleaned up old code & added $Header where missing Used new Tag class everywhere. XmlUtils removed. Added description for 1830 Fix: "revenue" changed to "value" All 'name' atributes of tiles>0 are now numeric All tiles with id > 0 now have a numeric name 18EU tiles added Added (includes 18EU) Updated including all tiles now. Added Updated for implementation of Lumber Terminal Updated mainly for 18AL special properties. Lumber Terminal now works. Some fixes too. Added 18EU Added Updated Fixes Allowed default colour per company type (used for minor) Improved Colours Name correction Implemented 18AL bonus token. Bonus Token Removal (18AL) Implemented 18AL Named Trains. Require new tiles to be connected (except home bases and special lays). Fix: tile lay check only applies to yellow tiles Added 18AL train naming by using NDY private. Implemented 18AL destination bonus Updated game 1830 and 18AL descriptions Connection check bug fixed Fixed bug in handling par price setting for President's shares coming with a private. 1851 - partial implementation Fixed special green upgrade in Montgomery. Improved tile rotation validity checking: preserve old tracks (except OO cities). Minor changes & cleanups 1851 almost completed 1851 completed. Added bidding parameters Fixed 18EU description Removed redundant base prices Minor changes, related to the 18EU start round implementation. BuyOrBidStartItem renamed tp StartItemAction and subclassed with separate BuyStartItem and BidStartItem classes. resetOption() added Added boolean allowNegative Minor changes caused by 18EU start round implementation Added Minor changes (if any at all) Changes to accomodate the 18EU start round New entries for 18EU start round Added setBit and bitSet Fixed Berlin/Vienna yellow tile Completed -10 to 201,202 upgrade locations Fixed Budapest (was plain) Added initial 2-trains Added <StockRound> Formatting and minor changes More 18EU aspects Added moveObjects() to move the contents of a list without incurring ConcurrentModificationExceptions Added More 18EU aspects Fixes Reorganised to get all tile-laying related items under <LayTiles> Fixed bug: trains could not be traded Fixed tile -939 to become an Off-Map city tile. The "internal" (XML) representation now differs from the "external" (visible) version. Removed getBaseTokenLayCostBySequence. The functionality has been moved to PublicCompanyI. Removed getBaseTokenLayCostBySequence(). The functionality has been moved to PublicCompany. TokenLay cost now obtained from PublicCompany (previously from CompanyManager) Added "whenStarted" as an option to lay home base token. Fix: set the minors to "started"when bought Use larger font if the name is shorter than 4 characters Hide spinner when revenue is set. Fixed bug that prevented tiles to be laid where internal and external IDs were different. Added new inner class HexImage for that purpose. Fixes and additions Using Util.moveObjects() Added getCompanyByName() Added getCurrentTrainLimit() Added getCurrentTrainLimit() Added stubs: setGameSpecificActions() and processGameSpecificActions() New Added U (unfloated) indicator Added setGameSpecificActions() and processGameSpecificActions() Changes for 18EU Added handling for MergeCompanies Added lines for 18EU Formatting only Upgraded 18EU to "partly playable" Fixed Undo problem in 18EU Implemented 18EU Pullmann train buying and discarding Corrected city locations Added split revenue option Corrected city numbers Added some for 18EU Changed "corner" location codes on behalf of correct token position calculation. New code for token position calculation Improved rotation checking for city tiles. Formatting only Stations -> Cities Phase 5 company start (unfinished) Changes for 18EU, incl. better token positioning on tile upgrades Added city names for use in tooltips and home base selection (18EU) City names Nothing material 1835 tile laying fixes Completed 18EU Fixed some 1835 tiles Remove duplicate tokens when cities merge Small rearrangement Move cash and certificate transfers on floating from PublicCompany to Round Few new entries Added comment for 18EU Added generic facility to allow multiple upgrade costs. Commented multiple upgrade cost values Fixed format errors Also display upgrade cost on laid tiles Formatting standard Removed blank line between field declarations Formatting preferences Trial reformats Reformatted OR number changes made undoable Cleanups, mostly to remove static references to GameManager and some other classes. Use of new Defs class for definitions common to UI and server. New class to hold definitions common to UI and server Some more cleanup of statics More cleanup of static methods Fixed player cash Fixed bugs in B&O private buying. Improved start price setting prompt Various bug fixes Updated XML for cases where 2 yellow tile lays are allowed. The syntax had been changed with the implementation of 18EU. Formatting only Fixed special properties initialsation (again - previous fix was wrong) Removed numberOfPlayers - this caused 1835 to abort at the very start Removed some debugging statements Formatting only Configured some of the private special properties Added NDY closing condition Reimplemented private closing conditions Started reimplementing private company closure when exercising special properties in a more generic way Implemented private closure at end of OR turn if special propoerties are exercised (appplies to 1856 W&SR) Implemented unavailability of certain shares at game start in 1835 and 1856 (CGR) Implemented initial unavailability of shares. Removed test values Fixed bug that prevented company start Reorganized "getPrice" methods of PublicCompany. Renamed setParPrice and setCurrentPrice Implemented varying flotation percentage for 1856. Fixed 1856 float percentage (was incorrectly linked to phase rather than next available train) Removed isLayableNow() Added custom OperatingRound Added destination reached condition New setNextOperatingCompany method & some refactoring to allow specific 1856 rules in a subclass New class for specific first operation rules Added message "MayNotYetOperate" to signal 1856 condition Removed dead code Improve display (Jonathan's fix) New (initial) capitalisation type. Fixed upgrade (and downgrade) rules. New dialog (added for destination reaching) Implemented 1856 capitalisation rules. ReportWindow changes (Jonathan) Removed dead code Fixed 1851 Louisville green upgrade bug: L&N token not displayed Small cleanup Added confirmation question on closing StatusWindow Allow selection of 1830 Erie home base station while upgrading to green. Small cleanup Mark initial yellow OO/XX cities to reposition any (home) tokens when upgraded to green (needed for 1835 Badische and 1856 THB) Window now remembers position and height between rounds. Cleanups Cleanups Could remove WindowListener methods (mostly unused) by passing WindowAdapter into addWindowListener. CLeanup Cleanups only Initialisation fixed Localised some hardcoded text Bug fix in flotation check when merging a minor Cleanups, annotations, formatting. Cleanups, annotations, formatting Fixed missing companies as merge targets Undone previous fix, which was wrong. Small cleanups Use new interface GameManagerI Implements new interface GameManagerI New constructors Apply new round initialisation logic. Added toString(). Apply new round initialisation logic. Apply new round initialisation logic Apply new round initialisation logic. Use new interface GameManagerI New method hasChild (String) New <AllowsMultipleBasesOfOneCompany> property to deal with 18EU Paris/Berlin/Vienna allowances. On merging, only ask the "replace token" question if a token can actually legitimately be laid. Cases like 18EU brown Paris are now also covered: a check is added that token replacement is only allowed if there is not yet a token in the same station. Fixed bug that disabled buying more than 1 "infinite quantity" train. Fix the previous fix (first item on next row was also set to buyable when the previous row had more than one item left). Added start packet item info to the StartRoundWindow. Start item status tooltips & colours Changed multi-parameter constructor to use varargs Basic loans taking and specific rules for 1856. Added 1856 loan interest payment (from all possible sources). Fixed code to remove compiler warnings Added 1856 loan repayment step at end of OR. Preparations for final loan repayment Minor changes, mainly about better integrating TrainManager and removing static access to it. CGR Formation round phase 1: repaying loans. CGR Formation round phase 1: repaying loans. 1856 CGR formation round Removed outcommented code Implemented correct CGR start price Added message to start merged company Fixes to CGR formation Fixes to CGR formation Fixes to CGR formation Fixes to CGR formation Fixes to CGR formation. Removed unused imports Make CGR have 10% shares if max. 10 shares are issued. Fix to CGR share% display CGR 5% to 10% share conversion made undoable Minor change in imports Minor change in initialisation sequence Split off new class PublicCompany_State for 1856 CGR Added loadTakingAllowed as a Phase property Enabled village downgrading (as in 1856) Enabled village downgrading (as in 1856) Minor change in logging Add floating point parsing Added fractional certificate counts. Added fractional certificate counts. Use Unicode \u00bd for ½ (0.5) Fix: CGR 10% Pres share counts as 1 certificate Added boolean mustTradeTrainsAtFixedPrice (for 1856 CGR) Minor change in imports Special train buying rules for 1856 CGR Fix cert count display Fix loans display in OR panel Added running with borrowed train (CGR) Clarification added: 'price token' in stead of 'token' Various fixes to CGR formation and operation Clarified running with borrowed train (CGR): must withhold Certificate limits after CGR formation Implemented the certificate limit change after CGR formation. Made certificate limit variable for UI Added canClose attribute - CGR cannot close. Renamed PublicCompany_State to PublicCompany_CGR. Renamed PublicCompany_State to PublicCompany_CGR. Moved player share limit from Player to GameManager Remove duplicate debug log CGR price down on selling every *two* 5% shares Fix tile downgrading revenue -> value (to fix tooltips) revenue -> value Removed statics from some manager classes Added SerialVersionUID Rationalisation of StartPacket/StartItem initialisation code. Statics removed. 1856: Deduct $10 per outstanding loan from player worth. Simplified Defs.ClassName and Defs.Parm handling Implemented 1856 Bridge and Tunnel tokens Rationalised Bank, removing statics Removed statics from StockMarket (no longer a singleton) Fixed bug that prevented 1830 M&H/NYC swap Minor cleanups Spelling correction Reduced dependence on static access to MapManager CGR pres. must buy 2nd shars at first opportunity if not yet owned Fixed bug that OR did not end if last-running company bought first 6-train and CGR formed. Created basic mechanism to allow more games running in parallel at the server side (which itself will not be implemented anytime soon). Dead code removal ReportBuffer and DisplayBuffer made instantiatable Removed some not really necessary interfaces. Extended ConfiguableComponentI interface to include final (post XML-parsing) initialisation. Used it to remove several more static methods & calls. MapManager & TrainManager config. updates TrainManager - removed static instance variable. Payments are rounded up Added message for payouts More rationalising of static method usage More rationalising of static method usage More rationalising of static method usage More rationalising of static method usage More rationalising of static method usage 1856 marked "Fully playable" Fixed some bugs: Fixed impassable hexsides New RunGame class to start game and pickup load file argument Print arguments buildinfo Ant script to create BuildInfo.java as a separate Ant job Fix brown share buying cost problem Display bars to show impassable hex sides Removed Cleanups Have the working directory as the default for saving/loading files. Added missing city names Moved clearing DisplayBuffer ro GameManager. Added missing city names Fixed: error if price token moves down. Fixed bug that left BidAmount disabled after a reload Fixed various bugs Fixed prioritysetting bug during start round Comment on Erie removed from 1830 game notes Made Save follow Load directory Allow not buying a train when trainless, with a warning that this is only allowed without a route Two new config variables to tweak the predefined save filenames Suffix special value to insert next player name Undoing the passing-player-cannot-bid-again fix for 1830-style auctions. Fixed bug that price wasn't adjusted at emergency share selling MInor change (separate var. numberSold) Added new GameOption "LeaveAuctionOnPass" to 1830-style games Fixed bug that made old actions stick to a button Check on honouring a fixed train price Added getRoundName() Fixed missing deserialization statements. These cause all train prices becoming $0 on a reload Better handling of load errors. Check for player index <0 Allow negative values & reorder with minus always in front Change bar colour from black to blue Alllow negative train cost; subtract train sale amount from seller Link sale to previous move (Undo must affect both) Name change only Scroll down ReportWindow after load. Fixed missing argument for 'sold' message Changed window title Enable initial visibility Enable initial report window visibility Added report.window.open and or.number_format Enable empty lines Beautified report window contents & log Added option to make Report Window editable, and to save from and load files into this window Added Find functionality to Report Window Replaced tile -901 by -800 for ports Call update() on token exchange to update map. Added round type check to updateStatus(), to prevent errors on map updates outside OR (such as token exchanges) Aded missing messages on token exchanges on merging. On the M&H/NYC swap, check if NYC floats. Improved token exchange texts Added some missing required private speciral property attributes Added train price overview Added coordinate grid Fixed bug in determining end of round Implemented request to show low-price colours in SR and OR panels. Changed minor token BG colour to light gray (to better distinguish from empty circles) Addes larger token font for short names (1 or 2 chars) Draw company names in their home cities rather than on the hex. Replaced track by pointy triangles in off-board tiles Map made zoomable. Removed Reproduced SVG tiles from TileDesigner. Removed GIF tiles Changed orientation of tile #4 to get the village right New SVG tile production. Some updates Adapted code for correct working with new set of SVG tiles. Better positioning and sizing of tokens and home indicators Fixed price token display Moved stepObject creation backwards to OR start() Removed GUI status update which seems redundant and in any case caused crashes in solitaite/hotseat play. Fixed a misnamed constant. Fixed bonus token position on hex Formatting only Explicitly remove tiles at start of token mode (although that should have happened earlier). Unclear why that doesn't work. The disappearance of the tiles when another one is selected remains a mystery. Fixed disappearance of tiles if a selected and dropped tile is changed. Fixed wrong $1 token cost display when merging 2nd etc. minot into major. Fixed cert.limits for 3 and 5 players (which were swapped) Described 1856 limitation Added 2 chars of name to View string if no locations exist Fixed moving unsold Bridge/Tunnel tokens to GM/Bank Set seller of unsold Bridge/Tunnel tokens to Bank Fixed message text Removed option to select "common" actions in case of forced actions (i.e. a train discard). Minor cleanup Fixed in 1856: Some restructuring New tool (unfinished) Added Save, Load and Trim menu items Added equals() Prevent CGR getting more than 1 bonus of the same type (e.g. Bridge) Added option to undo setting to exercised (this is not actually used now) Added log message related to Bonus tokens Fixed bookkeeping on sold bonus tokens, in particular in relation to dropping duplicate tokens acquired by the CGR Clear display buffer after reload Minor cleanup 1856: allowing unlimited Bridge/Tunnel bonus tokens as a game option Fixed bug where CGR would in case of excess trains discard all 4-trains, in stead Cleanup help message at end of OR. Offboard value display made special throughout. Map is now visible during CGR formation (but the dialogs are still modal) Fix null "reached destination" created on an empty response. Added mayBuyTrainType() to fix incorrect 4-train buy option for 1856 CGR. Added a financials report to the end of each round. Bring ORWindow to front at certain actions Added "Has" and fixed second Select to SelectSomething fixed Select to SelectSomething Minor change Repack status window at start of switchableRound because for some reason it squeezes a that time. Added a precaution A null Destinations action is no longer sent to the server. Expose closedModel. Remove unused closed attribute. Added fixed text facility (used for "MERGE"in 1856) Set fixed text "MERGE" into loans model for merging companies Added getUpdate() to enable use as ModelObject. Added MERGE Added facility to hide closed company rows via a nested class RowVisibility Call update when object is set. Catch an unexpected error condition - to be sorted out later Removed unnecessary update() call Fix row visibility Minor cleanup Always allow SAVE Always add SAVE Permanently enable SAVE DiscardTrains was not handled after Load Both Game Status and OR/Map windows now hide closed company rows. Cleaned up imports Created common superclass GridPanel for GameStatus and ORPanel to abstract common features. Player worth is now recalculated at every certificate move (bug fix) Created non-modal version of CheckBoxDialog and a method to deal with such dialogs in the UI Managers. Added value 10 to tile #4 Added joinWithDelimiter Added messages for checkbox dialog Added nonmodal RadioButtonDialog2 and apply to Repay Loans Renamed some interfaces Renamed some interfaces Added missing company name parameter to repay loans display text Fixed phase-dependent revenues on non-offboard (red) hexes. More dialogs made modal Renamed New classes for the server-to-client communication Removed because unused Changes related to non-modal dialogs Fixed and added alwaysOnTop() Added alwaysOnTop() Added dependents to propagate updates Fixed company turn change issue Propagate row invisibility to ClickButtons Reworked updateUI() for use of GuiHints Defs->GuiDef name change Added missing SelectedHomeBase Fixed SelectedHomeBase message Abstracted some variables into methods, taking info from GameUIManager Changed comment Added GUIHInts Empties (may get redundant) Added GUIHints Added GUIHints Added some generic getters. Changes some unnecessary class attributes into local variables Added some generic getters. Use of GuiDef and GameDef New class, for game-engine parameter definitions Added '+' to version number to indicate experimental version Set game parameters in stead of some local variables Added orientation to a laid tile in the Game Report Fixed price typo Fixed missing upgrades Added getGameOptions() Moved comments on game options from 1830/Game.xml to here Changes structure of GameManager XML Moved various non-changing variables to gameParameters (via GameDef.Parm). Fixed addressed player for train discards games.properties no longer used Fixed escrow message Added Privates item to Info menu. Added special property info for PRR and B&O Moved <StockRoundRules> contents, misplaced in CompanyManager.xml, to existing <StockRound> element in Game.xml. Fix for companies not being able to start at lowest price. Clear visibility hints after loading Fixed bug in phases definition Added phase and train info to the status window Initial implementation of Autopass and RequestTurn Fixed bug Recreated (had somehow got mangled) Moved FMER start player from OR to GM object, as it must survive an OR change. Added "free" to tile lay on B20 to prevent confusing "normal cost" info bit. Added config setting to keep stockchart open. For future use (follow-up doesn't work yet) Added lowerCaseFirst() Localized extra tile and token messages by calling new getInfo() methods Added some info items. Use getInfo() Cleaned up unused import Adde dmessages for Info Removed description (now in superclass) Minor cleanups Added getInfo() Added and improved Info messages. Fixed: players were offered to buy >1 share from pool Added START_GAME (to replace null action after loading) Removed displayServerMessage() All displayMessage() methods moved to GameUIManager, which now uses the new nonmodal MessageDialog Added Message Added info about using custom property files Honour new UnlimitedTiles game option Added default gameoption values <GameOption> tags are processed again (and it's now documented why) Added check (perhaps redundant) Print game setup error to sysout too toString() simplified No change Reversed an equals condition to prevent null breaking it Fixed price determination of company buying pool shares Added getIndex (for debugging) Fixed looping bug: while() -> if () Moved nonmodal message display to end of updating UI Fixed: log was set too early Safety check on assigning game option value Allow passing working directory Updated comment In save file name suffixes, replace spaces and other nonword characters to underscores New tile for Birmingham 1851 Fixes to 18EU Pullmann problems Fixed Javadoc Minor fix to help message Fixed instantiation problem for 2nd etc. copy of unlimited quantity trains Discard Pullmanns to Pool, not ScrapHeap Cleanup & additional comment Fixed usage of amount/quantity Enabled UTC timezone as default for save file names Player worth is now updated at each price token move (except Undo and Redo) This commit was manufactured by cvs2svn to create tag 'rails_1_1_3'. Freek Dijkstra (6): Ignore tools directories for builds Add program icons Create build-mac target. While this creates a working .app for Mac OS X, this is considered alpha status. E.g. my.properties is ignored. Fix typo in path for jarbundler Fix indentation: XML files contain tabs Fix indentation: Java files contain 4 spaces, not tabs Mark J. Smith (16): MJS Test Commit, Comment added Removed TEST Line. Mark Smith testing Commit rights Added Upgrades for Tiles 3, 4 and 58 that were missing. When drawing Blocked Hexes for Privates, tested to be sure there are blocked entries in the list. Not all Privates Block Hexes. This Fixes the 1856 Map Drawing Issue Corrected starting orientation of Tile on B13 - Sarnia Change 'Bank=Bank' to 'BANK=Bank' to match how GameStatus line 471 will now use it. GameStatus.java will also be updated. Update the LocalText.getText("Bank") to LocalText.getText("BANK") Corrected the hasTokenOf(PublicCompanyI company) to get the Company Name and call hasTokenOf(String companyName). The previous use of the tokens.contains(company) failed since the ArrayList is of TokenI's not PublicCompanyI's. Update to only display the Select Station For Token Dialog if there is more than one city where the token can be placed Update to include Constructors. Added Constructors for proper intialization Added Constructors for proper initializing Added Constructors for proper initializing Added Constructors for proper initializing Improve Start Packet Handling so that only the left most item from the second available row is for sale, rather than the entire second row. Update OR Window Title to show 'Operating Round #.# of #, where the last # is the total number of Operating Rounds to be performed before going back to the Stock Round. ----------------------------------------------------------------------- hooks/post-receive -- UNNAMED PROJECT |