From 388793dd3f190f82f5e6f775132c04f08f545588 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Wed, 1 Jun 2011 17:38:49 +0000 Subject: [PATCH 1/5] updated version number --- README.txt | 4 ++-- build.ant.properties | 2 +- runserver.bat | 2 +- runserver.sh | 2 +- src/games/stendhal/client/update/Version.java | 2 +- src/games/stendhal/common/Debug.java | 2 +- src/games/stendhal/server/core/engine/GenerateINI.java | 2 +- stendhal.jnlp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.txt b/README.txt index ab3a5e1e37..dc89037a01 100644 --- a/README.txt +++ b/README.txt @@ -39,12 +39,12 @@ Java is included in most Linux distributions. Both Sun Java and OpenJDK are supp Please download Stendhal from http://arianne.sourceforge.net Then unzip the client zip into a new folder. -You can double click on stendhal-0.93.5.jar and the client will run. +You can double click on stendhal-0.94.jar and the client will run. If you prefer to run from command line, then just execute this command in the stendhal folder: - java -jar stendhal-0.93.5.jar + java -jar stendhal-0.94.jar Alternatively you can run it using Java Webstart technology at: diff --git a/build.ant.properties b/build.ant.properties index c7f8a045c6..0a34333db9 100644 --- a/build.ant.properties +++ b/build.ant.properties @@ -73,7 +73,7 @@ version_server = http://arianne.sourceforge.net/stendhal.version # current version of stendhal version.old = 0.93 -version = 0.93.5 +version = 0.94 # javac options javac.deprecation = true diff --git a/runserver.bat b/runserver.bat index 6b1be5eb01..31d1332cd5 100644 --- a/runserver.bat +++ b/runserver.bat @@ -1,3 +1,3 @@ -set STENDHAL_VERSION=0.93.5 +set STENDHAL_VERSION=0.94 set LOCALCLASSPATH=.;data\script;data\conf;stendhal-server-%STENDHAL_VERSION%.jar;marauroa.jar;mysql-connector.jar;log4j.jar;commons-lang.jar;h2.jar java -Xmx400m -cp "%LOCALCLASSPATH%" games.stendhal.server.StendhalServer -c server.ini -l diff --git a/runserver.sh b/runserver.sh index 91c9d8d22c..c94297f122 100644 --- a/runserver.sh +++ b/runserver.sh @@ -1,5 +1,5 @@ #!/bin/sh -STENDHAL_VERSION="0.93.5" +STENDHAL_VERSION="0.94" LOCALCLASSPATH=.:data/script/:data/conf/:stendhal-server-$STENDHAL_VERSION.jar:marauroa.jar:mysql-connector.jar:log4j.jar:commons-lang.jar:h2.jar diff --git a/src/games/stendhal/client/update/Version.java b/src/games/stendhal/client/update/Version.java index 7838aa44d8..4f4781c116 100644 --- a/src/games/stendhal/client/update/Version.java +++ b/src/games/stendhal/client/update/Version.java @@ -10,7 +10,7 @@ package games.stendhal.client.update; public class Version { /** Version Number. */ - private static final String VERSION = "0.93.5"; + private static final String VERSION = "0.94"; /** * Extract the specified number of parts from a version-string. diff --git a/src/games/stendhal/common/Debug.java b/src/games/stendhal/common/Debug.java index 81ea6c2e29..bcd6ad5bc4 100644 --- a/src/games/stendhal/common/Debug.java +++ b/src/games/stendhal/common/Debug.java @@ -26,7 +26,7 @@ public class Debug { /** version. */ // Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line. - public static final String VERSION = "0.93.5"; + public static final String VERSION = "0.94"; public static final String PRE_RELEASE_VERSION = null; diff --git a/src/games/stendhal/server/core/engine/GenerateINI.java b/src/games/stendhal/server/core/engine/GenerateINI.java index 881a41d075..4c5c3e3417 100644 --- a/src/games/stendhal/server/core/engine/GenerateINI.java +++ b/src/games/stendhal/server/core/engine/GenerateINI.java @@ -271,7 +271,7 @@ public class GenerateINI { out.println(); out.println("server_typeGame=" + gameName); out.println("server_name=" + gameName + " Marauroa server"); - out.println("server_version=0.93.5"); + out.println("server_version=0.94"); out.println("server_contact=https://sourceforge.net/tracker/?atid=514826&group_id=66537&func=browse"); out.println(); out.println("# Extensions configured on the server. Enable at will."); diff --git a/stendhal.jnlp b/stendhal.jnlp index aa8f43ff4f..296695e82a 100644 --- a/stendhal.jnlp +++ b/stendhal.jnlp @@ -22,7 +22,7 @@ Some of these people are NPC, they will give you tasks to accomplish and hints t - + From d445693d7d34f3396399848b3530b4812edaef32 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Wed, 1 Jun 2011 18:02:07 +0000 Subject: [PATCH 2/5] updated version number --- README.txt | 4 ++-- build.ant.properties | 2 +- runserver.bat | 2 +- runserver.sh | 2 +- src/games/stendhal/client/update/Version.java | 2 +- src/games/stendhal/common/Debug.java | 2 +- src/games/stendhal/server/core/engine/GenerateINI.java | 2 +- stendhal.jnlp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.txt b/README.txt index dc89037a01..e82ac8291b 100644 --- a/README.txt +++ b/README.txt @@ -39,12 +39,12 @@ Java is included in most Linux distributions. Both Sun Java and OpenJDK are supp Please download Stendhal from http://arianne.sourceforge.net Then unzip the client zip into a new folder. -You can double click on stendhal-0.94.jar and the client will run. +You can double click on stendhal-0.93.6.jar and the client will run. If you prefer to run from command line, then just execute this command in the stendhal folder: - java -jar stendhal-0.94.jar + java -jar stendhal-0.93.6.jar Alternatively you can run it using Java Webstart technology at: diff --git a/build.ant.properties b/build.ant.properties index 0a34333db9..d7127cbd23 100644 --- a/build.ant.properties +++ b/build.ant.properties @@ -73,7 +73,7 @@ version_server = http://arianne.sourceforge.net/stendhal.version # current version of stendhal version.old = 0.93 -version = 0.94 +version = 0.93.6 # javac options javac.deprecation = true diff --git a/runserver.bat b/runserver.bat index 31d1332cd5..5bcebc262d 100644 --- a/runserver.bat +++ b/runserver.bat @@ -1,3 +1,3 @@ -set STENDHAL_VERSION=0.94 +set STENDHAL_VERSION=0.93.6 set LOCALCLASSPATH=.;data\script;data\conf;stendhal-server-%STENDHAL_VERSION%.jar;marauroa.jar;mysql-connector.jar;log4j.jar;commons-lang.jar;h2.jar java -Xmx400m -cp "%LOCALCLASSPATH%" games.stendhal.server.StendhalServer -c server.ini -l diff --git a/runserver.sh b/runserver.sh index c94297f122..4fb6b763ea 100644 --- a/runserver.sh +++ b/runserver.sh @@ -1,5 +1,5 @@ #!/bin/sh -STENDHAL_VERSION="0.94" +STENDHAL_VERSION="0.93.6" LOCALCLASSPATH=.:data/script/:data/conf/:stendhal-server-$STENDHAL_VERSION.jar:marauroa.jar:mysql-connector.jar:log4j.jar:commons-lang.jar:h2.jar diff --git a/src/games/stendhal/client/update/Version.java b/src/games/stendhal/client/update/Version.java index 4f4781c116..98e60d7aad 100644 --- a/src/games/stendhal/client/update/Version.java +++ b/src/games/stendhal/client/update/Version.java @@ -10,7 +10,7 @@ package games.stendhal.client.update; public class Version { /** Version Number. */ - private static final String VERSION = "0.94"; + private static final String VERSION = "0.93.6"; /** * Extract the specified number of parts from a version-string. diff --git a/src/games/stendhal/common/Debug.java b/src/games/stendhal/common/Debug.java index bcd6ad5bc4..d3c39f7faf 100644 --- a/src/games/stendhal/common/Debug.java +++ b/src/games/stendhal/common/Debug.java @@ -26,7 +26,7 @@ public class Debug { /** version. */ // Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line. - public static final String VERSION = "0.94"; + public static final String VERSION = "0.93.6"; public static final String PRE_RELEASE_VERSION = null; diff --git a/src/games/stendhal/server/core/engine/GenerateINI.java b/src/games/stendhal/server/core/engine/GenerateINI.java index 4c5c3e3417..9dd9ca8b13 100644 --- a/src/games/stendhal/server/core/engine/GenerateINI.java +++ b/src/games/stendhal/server/core/engine/GenerateINI.java @@ -271,7 +271,7 @@ public class GenerateINI { out.println(); out.println("server_typeGame=" + gameName); out.println("server_name=" + gameName + " Marauroa server"); - out.println("server_version=0.94"); + out.println("server_version=0.93.6"); out.println("server_contact=https://sourceforge.net/tracker/?atid=514826&group_id=66537&func=browse"); out.println(); out.println("# Extensions configured on the server. Enable at will."); diff --git a/stendhal.jnlp b/stendhal.jnlp index 296695e82a..f76b24c8c1 100644 --- a/stendhal.jnlp +++ b/stendhal.jnlp @@ -22,7 +22,7 @@ Some of these people are NPC, they will give you tasks to accomplish and hints t - + From e09e185390315b44101c6bccd33688d4894d5e9a Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 3 Jun 2011 12:32:09 +0000 Subject: [PATCH 3/5] backported activated deathmatch and red item set loot achievements --- .../core/rp/achievement/factory/ItemAchievementFactory.java | 2 +- .../core/rp/achievement/factory/QuestAchievementFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/games/stendhal/server/core/rp/achievement/factory/ItemAchievementFactory.java b/src/games/stendhal/server/core/rp/achievement/factory/ItemAchievementFactory.java index 863f72549d..270cb44a5d 100644 --- a/src/games/stendhal/server/core/rp/achievement/factory/ItemAchievementFactory.java +++ b/src/games/stendhal/server/core/rp/achievement/factory/ItemAchievementFactory.java @@ -41,7 +41,7 @@ public class ItemAchievementFactory extends AbstractAchievementFactory { Achievement.HARD_BASE_SCORE, true, new PlayerLootedNumberOfItemsCondition(1000000, "money"))); itemAchievements.add(createAchievement("item.set.red", "Amazon's Menace", "Loot a complete red equipment set", - Achievement.MEDIUM_BASE_SCORE, false, + Achievement.MEDIUM_BASE_SCORE, true, new PlayerLootedNumberOfItemsCondition(1, "red armor", "red helmet", "red cloak", "red legs", "red boots", "red shield"))); itemAchievements.add(createAchievement("item.set.shadow", "Shadow Dweller", "Loot a complete shadow equipment set", Achievement.MEDIUM_BASE_SCORE, true, diff --git a/src/games/stendhal/server/core/rp/achievement/factory/QuestAchievementFactory.java b/src/games/stendhal/server/core/rp/achievement/factory/QuestAchievementFactory.java index 1cbe6a15c5..95151d313c 100644 --- a/src/games/stendhal/server/core/rp/achievement/factory/QuestAchievementFactory.java +++ b/src/games/stendhal/server/core/rp/achievement/factory/QuestAchievementFactory.java @@ -50,7 +50,7 @@ public class QuestAchievementFactory extends AbstractAchievementFactory { questAchievements.add(createAchievement("quest.special.maze", "Pathfinder", "Finish the maze", Achievement.EASY_BASE_SCORE, true, new QuestStateGreaterThanCondition("maze", 2, 0))); questAchievements.add(createAchievement("quest.deathmatch", "Deathmatch Hero", "Earn 100,000 points in deathmatch", - Achievement.MEDIUM_BASE_SCORE, false, new QuestStateGreaterThanCondition("deathmatch_score", 0, 100000))); + Achievement.MEDIUM_BASE_SCORE, true, new QuestStateGreaterThanCondition("deathmatch_score", 0, 100000))); // Ados Deathmatch // disabled. Currently the wrong index is being checked (it would be index 6) From 8d77c10b45f6a9856e0aff634242e425419b4237 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 4 Jun 2011 08:53:50 +0000 Subject: [PATCH 4/5] backported spelling fixed by kymara --- doc/CHANGES.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt index fe79614391..3d9f88e3f9 100644 --- a/doc/CHANGES.txt +++ b/doc/CHANGES.txt @@ -11,17 +11,17 @@ Changelog *bugfixes* - fixed right clicking on sources, fishing spots, etc. - On Mac cmd+dragging opens the item split window -- client error log is now works in webstart client, too -- a number of small map bugs +- client error log now works in the webstart client, too +- a number of small map fixes *admin* -- added new zone int_abstract_admin_investigation for investigation account issues +- added new zone int_abstract_admin_investigation for investigation of account issues - added new zone int_abstract_server_down for operating Stendhal on a read only database copy *website* - achievements on character pages now have a mouse over box - nicer layout for chat logs and log selection -- improved performance of recent event page +- improved performance of Recent Events page - improved performance of pages with many images From e0e7dd5a74a2c14a78381f0189f3e5542eaa2bca Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 4 Jun 2011 08:55:13 +0000 Subject: [PATCH 5/5] updated version number --- README.txt | 4 ++-- build.ant.properties | 2 +- runserver.bat | 2 +- runserver.sh | 2 +- src/games/stendhal/client/update/Version.java | 2 +- src/games/stendhal/common/Debug.java | 2 +- src/games/stendhal/server/core/engine/GenerateINI.java | 2 +- stendhal.jnlp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.txt b/README.txt index e82ac8291b..dc89037a01 100644 --- a/README.txt +++ b/README.txt @@ -39,12 +39,12 @@ Java is included in most Linux distributions. Both Sun Java and OpenJDK are supp Please download Stendhal from http://arianne.sourceforge.net Then unzip the client zip into a new folder. -You can double click on stendhal-0.93.6.jar and the client will run. +You can double click on stendhal-0.94.jar and the client will run. If you prefer to run from command line, then just execute this command in the stendhal folder: - java -jar stendhal-0.93.6.jar + java -jar stendhal-0.94.jar Alternatively you can run it using Java Webstart technology at: diff --git a/build.ant.properties b/build.ant.properties index d7127cbd23..0a34333db9 100644 --- a/build.ant.properties +++ b/build.ant.properties @@ -73,7 +73,7 @@ version_server = http://arianne.sourceforge.net/stendhal.version # current version of stendhal version.old = 0.93 -version = 0.93.6 +version = 0.94 # javac options javac.deprecation = true diff --git a/runserver.bat b/runserver.bat index 5bcebc262d..31d1332cd5 100644 --- a/runserver.bat +++ b/runserver.bat @@ -1,3 +1,3 @@ -set STENDHAL_VERSION=0.93.6 +set STENDHAL_VERSION=0.94 set LOCALCLASSPATH=.;data\script;data\conf;stendhal-server-%STENDHAL_VERSION%.jar;marauroa.jar;mysql-connector.jar;log4j.jar;commons-lang.jar;h2.jar java -Xmx400m -cp "%LOCALCLASSPATH%" games.stendhal.server.StendhalServer -c server.ini -l diff --git a/runserver.sh b/runserver.sh index 4fb6b763ea..c94297f122 100644 --- a/runserver.sh +++ b/runserver.sh @@ -1,5 +1,5 @@ #!/bin/sh -STENDHAL_VERSION="0.93.6" +STENDHAL_VERSION="0.94" LOCALCLASSPATH=.:data/script/:data/conf/:stendhal-server-$STENDHAL_VERSION.jar:marauroa.jar:mysql-connector.jar:log4j.jar:commons-lang.jar:h2.jar diff --git a/src/games/stendhal/client/update/Version.java b/src/games/stendhal/client/update/Version.java index 98e60d7aad..4f4781c116 100644 --- a/src/games/stendhal/client/update/Version.java +++ b/src/games/stendhal/client/update/Version.java @@ -10,7 +10,7 @@ package games.stendhal.client.update; public class Version { /** Version Number. */ - private static final String VERSION = "0.93.6"; + private static final String VERSION = "0.94"; /** * Extract the specified number of parts from a version-string. diff --git a/src/games/stendhal/common/Debug.java b/src/games/stendhal/common/Debug.java index d3c39f7faf..bcd6ad5bc4 100644 --- a/src/games/stendhal/common/Debug.java +++ b/src/games/stendhal/common/Debug.java @@ -26,7 +26,7 @@ public class Debug { /** version. */ // Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line. - public static final String VERSION = "0.93.6"; + public static final String VERSION = "0.94"; public static final String PRE_RELEASE_VERSION = null; diff --git a/src/games/stendhal/server/core/engine/GenerateINI.java b/src/games/stendhal/server/core/engine/GenerateINI.java index 9dd9ca8b13..4c5c3e3417 100644 --- a/src/games/stendhal/server/core/engine/GenerateINI.java +++ b/src/games/stendhal/server/core/engine/GenerateINI.java @@ -271,7 +271,7 @@ public class GenerateINI { out.println(); out.println("server_typeGame=" + gameName); out.println("server_name=" + gameName + " Marauroa server"); - out.println("server_version=0.93.6"); + out.println("server_version=0.94"); out.println("server_contact=https://sourceforge.net/tracker/?atid=514826&group_id=66537&func=browse"); out.println(); out.println("# Extensions configured on the server. Enable at will."); diff --git a/stendhal.jnlp b/stendhal.jnlp index f76b24c8c1..296695e82a 100644 --- a/stendhal.jnlp +++ b/stendhal.jnlp @@ -22,7 +22,7 @@ Some of these people are NPC, they will give you tasks to accomplish and hints t - +