diff --git a/.cvsignore b/.cvsignore index e54e4e4..f36dbe0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -colossus-20090817-4489.tar.gz +colossus-20090906-4519.tar.gz diff --git a/4495.patch b/4495.patch deleted file mode 100644 index b8fe899..0000000 --- a/4495.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- core/src/main/java/net/sf/colossus/game/Battle.java (revision 4494) -+++ core/src/main/java/net/sf/colossus/game/Battle.java (revision 4495) -@@ -392,7 +392,7 @@ - { - strikerAtop = true; - totalObstacles++; -- if (hexside == 'c') -+ if (hexside == 'c' || hexside == 'd') - { - strikerAtopCliff = true; - } -@@ -401,7 +401,7 @@ - { - midObstacle = true; - totalObstacles++; -- if (hexside2 == 'c') -+ if (hexside2 == 'c' || hexside2 == 'd') - { - midCliff = true; - } -@@ -417,7 +417,7 @@ - { - midObstacle = true; - totalObstacles++; -- if (hexside == 'c') -+ if (hexside == 'c' || hexside == 'd') - { - midCliff = true; - } -@@ -430,7 +430,7 @@ - { - targetAtop = true; - totalObstacles++; -- if (hexside2 == 'c') -+ if (hexside2 == 'c' || hexside2 == 'd') - { - targetAtopCliff = true; - } -@@ -439,7 +439,7 @@ - { - return true; - } -- if (midCliff && !strikerAtopCliff && !targetAtopCliff) -+ if (midCliff && (!strikerAtopCliff || !targetAtopCliff)) - { - return true; - } -@@ -467,7 +467,8 @@ - { - midObstacle = true; - totalObstacles++; -- if (hexside == 'c' || hexside2 == 'c') -+ if (hexside == 'c' || hexside2 == 'c' || hexside == 'd' || -+ hexside2 == 'd') - { - midCliff = true; - } ---- core/src/main/java/net/sf/colossus/client/Strike.java (revision 4494) -+++ core/src/main/java/net/sf/colossus/client/Strike.java (revision 4495) -@@ -293,7 +293,7 @@ - { - strikerAtop = true; - totalObstacles++; -- if (hexside == 'c') -+ if (hexside == 'c' || hexside == 'd') - { - strikerAtopCliff = true; - } -@@ -303,7 +303,7 @@ - { - midObstacle = true; - totalObstacles++; -- if (hexside2 == 'c') -+ if (hexside2 == 'c' || hexside2 == 'd') - { - midCliff = true; - } -@@ -320,7 +320,7 @@ - { - midObstacle = true; - totalObstacles++; -- if (hexside == 'c') -+ if (hexside == 'c' || hexside == 'd') - { - midCliff = true; - } -@@ -335,7 +335,7 @@ - { - targetAtop = true; - totalObstacles++; -- if (hexside2 == 'c') -+ if (hexside2 == 'c' || hexside2 == 'd') - { - targetAtopCliff = true; - } -@@ -346,7 +346,7 @@ - return true; - } - -- if (midCliff && !strikerAtopCliff && !targetAtopCliff) -+ if (midCliff && (!strikerAtopCliff || !targetAtopCliff)) - { - return true; - } -@@ -382,7 +382,8 @@ - { - midObstacle = true; - totalObstacles++; -- if (hexside == 'c' || hexside2 == 'c') -+ if (hexside == 'c' || hexside2 == 'c' || hexside == 'd' || -+ hexside2 == 'd') - { - midCliff = true; - } diff --git a/colossus.spec b/colossus.spec index da860ab..72edab4 100644 --- a/colossus.spec +++ b/colossus.spec @@ -1,8 +1,8 @@ Name: colossus -%define rev 4489 -%define revdate 20090817 -Version: 0.9.1 -Release: 2.%{revdate}svn%{rev}%{?dist} +%define rev 4519 +%define revdate 20090906 +Version: 0.9.2 +Release: 1.%{revdate}svn%{rev}%{?dist} Summary: Allows people to play Titan against each other or AIs Group: Amusements/Games @@ -20,7 +20,6 @@ URL: http://colossus.sourceforge.net/ Source0: colossus-%{revdate}-%{rev}.tar.gz Source1: colossus-gen-tarball.sh Source2: colossus-rev.xsl -Patch1: 4495.patch %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} @@ -65,7 +64,6 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{revdate}-%{rev} -%patch1 %build @@ -181,6 +179,19 @@ touch --no-create %{_datadir}/pixmaps || : %changelog +* Sun Sep 06 2009 Bruno Wolff III - 0.9.2-1.20090906svn4519 +- Rebase to 0.9.2 +- See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html +- Fixed: 2835558 WARNING: Could not find creature with name none +- Fixed: 2820231 Illegal rangestrike +- Fixed: 2848651 and 2828028: Legion flyouts +- Fixed: 2837746 Balrog variant: Caretaker counts not reset between games +- Fixed: 2839241 Faulty anchor tags (Crossreference links in docs worked for Inetnet Explorer but not for Netscape) +- Make loading and saving of Balrog games work +- Make Auto Done act properly when there is no Recruit action or undo possible +- Add in save game also a property that tells with which release / revision of Colossus that save game was created. +- Eliminated some race situations in game startup (thread interaction/notifications) + * Wed Aug 19 2009 Bruno Wolff III - 0.9.1-2.20090817svn4489 - Fix for desert LOS bug diff --git a/import.log b/import.log index 50c739f..ef124ed 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ colossus-0-0_4_20090725svn4454_fc11:HEAD:colossus-0-0.4.20090725svn4454.fc11.src colossus-0-0_5_20090726svn4462_fc11:HEAD:colossus-0-0.5.20090726svn4462.fc11.src.rpm:1248643266 colossus-0_9_0-1_20090810svn4482_fc11:HEAD:colossus-0.9.0-1.20090810svn4482.fc11.src.rpm:1249966312 colossus-0_9_1-1_20090817svn4489_fc11:HEAD:colossus-0.9.1-1.20090817svn4489.fc11.src.rpm:1250541173 +colossus-0_9_2-1_20090906svn4519_fc11:HEAD:colossus-0.9.2-1.20090906svn4519.fc11.src.rpm:1252255689 diff --git a/sources b/sources index aeb17a2..99c753c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f55310339968f1c885f89678c22c73c colossus-20090817-4489.tar.gz +29662adb0e19e4eeea4c0f5c6942c477 colossus-20090906-4519.tar.gz