Menu
▾
▴
[Rails-commits] 2 commits - buildRails.xml rails/util readme.txt version.number
|
From: Stefan F. <ste...@us...> - 2012-03-06 22:20:26
|
buildRails.xml | 19 +++++++------
rails/util/Util.java | 2 -
readme.txt | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++
version.number | 2 -
4 files changed, 87 insertions(+), 10 deletions(-)
New commits:
commit 576127100fc7d21af7640e3da872184b021cc9dd
Author: Stefan Frey <ste...@we...>
Date: Tue Mar 6 23:20:02 2012 +0100
fixed typo in railsBuild.xml that causes defect jar manifest
diff --git a/buildRails.xml b/buildRails.xml
index cc81b7a..aca719d 100644
--- a/buildRails.xml
+++ b/buildRails.xml
@@ -139,7 +139,7 @@
./lib/batik-1.7/lib/batik-anim.jar
./lib/df_1.1.0/dockingFramesCommon.jar
./lib/df_1.1.0/dockingFramesCore.jar
- -/lib/commons-io-2.1/commons-io-2.1.jar"/>
+ ./lib/commons-io-2.1/commons-io-2.1.jar"/>
</manifest>
</jar>
<delete dir="jar"/>
commit 0c43942fa04877a7de713cf2c632ea3e971fbfc3
Author: Stefan Frey <ste...@we...>
Date: Tue Mar 6 14:23:47 2012 +0100
prepared for release 1.7.0
diff --git a/buildRails.xml b/buildRails.xml
index 9878e88..cc81b7a 100644
--- a/buildRails.xml
+++ b/buildRails.xml
@@ -44,7 +44,8 @@
<exclude name="rails-*-${version}/**"/>
<exclude name="rails.bat"/>
<exclude name="rails.sh"/>
- <exclude name="version.number" />
+ <exclude name="version.number"/>
+ <exclude name="readme.txt"/>
<exclude name=".project"/>
<exclude name=".classpath"/>
<exclude name=".git/**"/>
@@ -67,10 +68,7 @@
<include name="log4j-1.2/log4j-1.2.14.jar" />
<include name="jgrapht-0.7.3/jgrapht-jdk1.5.jar" />
<include name="jgraph5/jgraph.jar" />
- <include name="junit-4.8.2/junit.jar" />
<include name="JLayer1.0.1/jl1.0.1.jar"/>
- <include name="lib/df_1.1.0/dockingFramesCommon.jar"/>
- <include name="lib/df_1.1.0/dockingFramesCore.jar"/>
<include name="batik-1.7/lib/batik-transcoder.jar" />
<include name="batik-1.7/lib/batik-dom.jar" />
<include name="batik-1.7/lib/batik-swing.jar" />
@@ -90,6 +88,9 @@
<include name="batik-1.7/lib/xerces_2_5_0.jar" />
<include name="batik-1.7/lib/xml-apis-ext.jar" />
<include name="batik-1.7/lib/batik-anim.jar" />
+ <include name="df_1.1.0/dockingFramesCommon.jar"/>
+ <include name="df_1.1.0/dockingFramesCore.jar"/>
+ <include name="commons-io-2.1/commons-io-2.1.jar"/>
</fileset>
</copy>
<copy includeemptydirs="false" todir="rails-${version}">
@@ -97,6 +98,7 @@
<fileset dir=".">
<include name="LICENSE"/>
<include name="README"/>
+ <include name="readme.txt"/>
<include name="AUTHORS"/>
<include name="rails.bat"/>
<include name="rails.sh"/>
@@ -116,8 +118,6 @@
./lib/jgraph5/jgraph.jar
./lib/junit-4.8.2/junit.jar
./lib/JLayer1.0.1/jl1.0.1.jar
- ./lib/df_1.1.0/dockingFramesCommon.jar
- ./lib/df_1.1.0/dockingFramesCore.jar
./lib/batik-1.7/lib/batik-transcoder.jar
./lib/batik-1.7/lib/batik-dom.jar
./lib/batik-1.7/lib/batik-swing.jar
@@ -136,7 +136,10 @@
./lib/batik-1.7/lib/js.jar
./lib/batik-1.7/lib/xerces_2_5_0.jar
./lib/batik-1.7/lib/xml-apis-ext.jar
- ./lib/batik-1.7/lib/batik-anim.jar"/>
+ ./lib/batik-1.7/lib/batik-anim.jar
+ ./lib/df_1.1.0/dockingFramesCommon.jar
+ ./lib/df_1.1.0/dockingFramesCore.jar
+ -/lib/commons-io-2.1/commons-io-2.1.jar"/>
</manifest>
</jar>
<delete dir="jar"/>
@@ -161,7 +164,7 @@
<arg value="rails-${version}.tar.gz"/>
<arg value="${sf.user},rails@${sf.uri}${sf.filedir}${version}/"/>
</exec>
- <exec executable="scp" dir="../../rails-${version}" failonerror="true">
+ <exec executable="scp" dir="./" failonerror="true">
<arg value="readme.txt"/>
<arg value="${sf.user},rails@${sf.uri}${sf.filedir}${version}/"/>
</exec>
diff --git a/rails/util/Util.java b/rails/util/Util.java
index 813db49..e514969 100644
--- a/rails/util/Util.java
+++ b/rails/util/Util.java
@@ -16,7 +16,7 @@ import rails.game.move.MoveableHolder;
public final class Util {
- protected static Logger log;
+ protected static Logger log = Logger.getLogger(Util.class.getPackage().getName());;
/**
* No-args private constructor, to prevent (meaningless) construction of one
diff --git a/readme.txt b/readme.txt
new file mode 100644
index 0000000..0bac2d1
--- /dev/null
+++ b/readme.txt
@@ -0,0 +1,74 @@
+Rails release 1.7.0:
+
+A new release for Rails 1.x series
+
+This release celebrates many improvements to the UI due to the
+work of Frederick Weld.
+
+Contributors: Erik Vos, Frederick Weld, Martin Brumm, Stefan Frey
+
+Includes all previously reported bug fixes of the 1.6.x branch.
+
+Please be aware that this release contains many changes, so bugs are more likely.
+Any feedback is welcome.
+
+Many of the included changes are NOT activated by default: Either switch them off
+using the configuration dialog or use one of the new predefined profiles:
+
+prettyUI --> all UI changes except docking activated
+ORdocking --> only activates the docking framework
+(currently only available for the OR window)
+
+Note: To show a background map, the option has to be switched on in Configuration => Map/Report => Display background map.
+Background maps are only available for 1856, 1889, 18EU, 18GA (incl. Cotton Port) and 18AL so far.
+
+The following are the major changes by topic:
+
+General UI improvements:
+* Interactive highlighting of hexes
+* Enhanced highlighting of active table cells during Operating Round
+* Adaptive rendering of token labels
+* Lay Tile: Invalid tile lays are displayed (incl. the reason for
+not being valid)
+* Support for icons
+* Splash screen with improvement startup behavior
+
+Added UI options:
+* Map / Zoom Fit Option: Fit-to-window and more
+* Map / Display Routes of Active Company
+* Map / Highlight company locations
+* Appearance / Display borders in grid layout
+* Windows / Flexible panels for operating round:
+Applies a docking framework to Operating Round Window
+
+Added Music/Sound Effects options (mp3 only):
+* Music: Background music can be specified per round-type and phase
+* Sound Effects: Sound effects can be associated to more than 20 game events
+* Includes support of "intelligent" effects (eg., revenue
+sound as in RailroadTycoon1)
+* No music/sound files are provided by Rails
+
+Rails configuration:
+* Added support for OS dependent centralized rails file storage
+(UNIX: ~/rails, Windows: %APPDIR, MacOS: ~/Library/Preferences/net.sourceforge.rails)
+* New configuration profile system based on profile hierachy
+* Several predefined profiles can be distributed
+
+Further changes:
+* Added StatusWindow File menu action to dump the (transposed) contents into a csv file
+* Several changes to use non-modal dialogs
+* Several updates to 1880 development
+* Added user-friendly network info including keyboard shortcut
+* Added highlighting of private companies' hexes triggered by mouse-over
+* Added invalid tile lays to upgrade panel (grayed out & reason)
+* Added option to play 1856 as a 2-player game.
+
+
+Further bug fixes:
+* Fix for 1835 bug: BY presidency not transferred during start round.
+* Always address the company president when a home token must be relaid.
+* Fixed 'Load Recent' by running it in a separate thread.
+* Fixed the glitch of initially displaying map images in the wrong scale
+* Fixed 1856 background map's mini-map (Windsor area)
+* Added precise sizing and positioning of token labels
+
diff --git a/version.number b/version.number
index 79c0ece..59d7603 100644
--- a/version.number
+++ b/version.number
@@ -1,5 +1,5 @@
#Property file that contains version number and the develop indicator
-version=1.6.0
+version=1.7.0
# 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
|
