From 3b2b32936dcaf65fee61a1be6646725b634f161f Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Fri, 15 Nov 2019 12:14:30 +0100 Subject: [PATCH 1/9] Update to Freeciv server freeciv/freeciv@bb89a3f1 Freeciv commit message: Add space between ")" and following "{" where ever it was missing See hrm Feature #819488 - http://www.hostedredmine.com/issues/819488 (Signed-off-by line removed from FCW commit message to avoid confusion) --- freeciv/patches/savegame.patch | 2 +- freeciv/version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/freeciv/patches/savegame.patch b/freeciv/patches/savegame.patch index 797d17626..3113f1ae1 100644 --- a/freeciv/patches/savegame.patch +++ b/freeciv/patches/savegame.patch @@ -31,7 +31,7 @@ index afbf376..db62262 100644 } - /* If orig_filename is NULL or empty, use a generated default name. */ -- if (filename[0] == '\0'){ +- if (filename[0] == '\0') { - /* manual save */ - generate_save_name(game.server.save_name, filename, - sizeof(stdata->filepath) + stdata->filepath - filename, "manual"); diff --git a/freeciv/version.txt b/freeciv/version.txt index 3b1da9d98..94425cfb1 100644 --- a/freeciv/version.txt +++ b/freeciv/version.txt @@ -1,7 +1,7 @@ # The Git SHA hash for the commit to checkout from # https://github.com/freeciv/freeciv -FCREV=1b9f4684bc9215fdec6313bbd57b0b8db89fa0aa +FCREV=bb89a3f1d44d8cc3b85055c7b3147e46309da387 ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Feb.28" From ae6abec48f8643520ddbcfc3f5964ed42a09bb37 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Mon, 18 Nov 2019 06:31:43 +0100 Subject: [PATCH 2/9] Update to Freeciv server freeciv/freeciv@fd47d78b Freeciv commit message: Editor: Remove possibility to set game start year In most cases it wouldn't be respected, and it breaks ruleset driven calendars when it is. Reported by Jacob Nevins See hrm Bug #767130 - http://www.hostedredmine.com/issues/767130 (Signed-off-by line removed from FCW commit message to avoid confusion) --- freeciv/version.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/freeciv/version.txt b/freeciv/version.txt index 94425cfb1..10ebf23e3 100644 --- a/freeciv/version.txt +++ b/freeciv/version.txt @@ -1,9 +1,9 @@ # The Git SHA hash for the commit to checkout from # https://github.com/freeciv/freeciv -FCREV=bb89a3f1d44d8cc3b85055c7b3147e46309da387 +FCREV=fd47d78b4d638dcfc1e56981c613f57150faa33e -ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Feb.28" +ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.12" # There's no need to bump this constantly as current freeciv-web # makes no connections to outside world - all connections are From c39b083f5a5bcbbecb1b1a7c73a2b97d91ed52cd Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Mon, 18 Nov 2019 06:39:20 +0100 Subject: [PATCH 3/9] Update to Freeciv server freeciv/freeciv@ec32381b Freeciv commit message: Rename player.culture as player.history It contains only history, not full culture value. Confusing name has already produced issues. Everything remains ABI compatible. See hrm Bug #821112 - http://www.hostedredmine.com/issues/821112 (Signed-off-by line removed from FCW commit message to avoid confusion) --- freeciv/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeciv/version.txt b/freeciv/version.txt index 10ebf23e3..7d1233612 100644 --- a/freeciv/version.txt +++ b/freeciv/version.txt @@ -1,7 +1,7 @@ # The Git SHA hash for the commit to checkout from # https://github.com/freeciv/freeciv -FCREV=fd47d78b4d638dcfc1e56981c613f57150faa33e +FCREV=ec32381ba20ff275a08046272ac1b9dc12be1b01 ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.12" From be7780e9b24f4ee511ab2ea182f3ef950102a778 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Mon, 18 Nov 2019 06:43:09 +0100 Subject: [PATCH 4/9] Update to Freeciv server freeciv/freeciv@5ce13d01 Freeciv commit message: Add ruleset alt_dir support The ruleset can define alt_dir for itself. That definition about current ruleset is saved to savegames (along the main rulesetdir definition). When the savegame is loaded and loading of the ruleset as defined by main rulesetdir definition fails, server tries to load ruleset from the alt_dir. Purpose of this is to provide a way, though slow - migration happens over a version boundary -, to rename ruleset directory. Older ruleset version, in the old path, has future path as alt_dir, so future version can load from that path. See hrm Feature #820924 - http://www.hostedredmine.com/issues/820924 (Signed-off-by line removed from FCW commit message to avoid confusion) --- freeciv/version.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/freeciv/version.txt b/freeciv/version.txt index 7d1233612..5158349c0 100644 --- a/freeciv/version.txt +++ b/freeciv/version.txt @@ -1,9 +1,9 @@ # The Git SHA hash for the commit to checkout from # https://github.com/freeciv/freeciv -FCREV=ec32381ba20ff275a08046272ac1b9dc12be1b01 +FCREV=5ce13d0194d95b591de5672fd1a57c04c5b562c2 -ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.12" +ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.17" # There's no need to bump this constantly as current freeciv-web # makes no connections to outside world - all connections are From 1a56e1b777e64b88c6551f71a49baa787b904158 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Mon, 18 Nov 2019 06:51:37 +0100 Subject: [PATCH 5/9] Update to Freeciv server freeciv/freeciv@ad5769b7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Freeciv commit message: Make city happiness effects on civil war chance ruleset defined Requested by Zoltán Žarkov See hrm Feature #769075 - http://www.hostedredmine.com/issues/769075 (Signed-off-by line removed from FCW commit message to avoid confusion) --- freeciv/version.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/freeciv/version.txt b/freeciv/version.txt index 5158349c0..5fda3f31a 100644 --- a/freeciv/version.txt +++ b/freeciv/version.txt @@ -1,9 +1,9 @@ # The Git SHA hash for the commit to checkout from # https://github.com/freeciv/freeciv -FCREV=5ce13d0194d95b591de5672fd1a57c04c5b562c2 +FCREV=ad5769b7ffa4717596a2ebf81632b2d84819ef53 -ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.17" +ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.18" # There's no need to bump this constantly as current freeciv-web # makes no connections to outside world - all connections are From 564d7736734cf71c64ca6e3235c5b6bca4fc1957 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Mon, 18 Nov 2019 06:56:38 +0100 Subject: [PATCH 6/9] Update to Freeciv server freeciv/freeciv@72c08a14 Freeciv commit message: Send player culture info to players with embassy Requested by Dean Brown See hrm Feature #820730 - http://www.hostedredmine.com/issues/820730 (Signed-off-by line removed from FCW commit message to avoid confusion) --- freeciv/version.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/freeciv/version.txt b/freeciv/version.txt index 5fda3f31a..f0dd3033a 100644 --- a/freeciv/version.txt +++ b/freeciv/version.txt @@ -1,9 +1,9 @@ # The Git SHA hash for the commit to checkout from # https://github.com/freeciv/freeciv -FCREV=ad5769b7ffa4717596a2ebf81632b2d84819ef53 +FCREV=72c08a14502fcd46b8616fb2192380cc70a89b03 -ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.18" +ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.18b" # There's no need to bump this constantly as current freeciv-web # makes no connections to outside world - all connections are From 79db2fa02539952742530738656cdceed8fa7e9e Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Mon, 18 Nov 2019 07:11:31 +0100 Subject: [PATCH 7/9] Update to Freeciv server freeciv/freeciv@84cf3538 Freeciv commit message: Add DefenseMultiplierPct & DefenseDividerPct combat bonuses Requested by Lexxie L Patch by S.C. L. See hrm Feature #809470 - http://www.hostedredmine.com/issues/809470 (Signed-off-by line removed from FCW commit message to avoid confusion) --- freeciv/version.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/freeciv/version.txt b/freeciv/version.txt index f0dd3033a..51fefca63 100644 --- a/freeciv/version.txt +++ b/freeciv/version.txt @@ -1,9 +1,9 @@ # The Git SHA hash for the commit to checkout from # https://github.com/freeciv/freeciv -FCREV=72c08a14502fcd46b8616fb2192380cc70a89b03 +FCREV=84cf353806a212ed800df31048d8764a883ae529 -ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.18b" +ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.21" # There's no need to bump this constantly as current freeciv-web # makes no connections to outside world - all connections are From 1ac4ea5bd0f20a2bd25cf1b57da473b4c47823d9 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Mon, 18 Nov 2019 08:37:45 +0100 Subject: [PATCH 8/9] Update to Freeciv server freeciv/freeciv@3b2568c0 Freeciv commit message: Add scenario option to inhibit loading of ruleset luadata.txt See hrm Feature #820980 - http://www.hostedredmine.com/issues/820980 (Signed-off-by line removed from FCW commit message to avoid confusion) --- freeciv/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeciv/version.txt b/freeciv/version.txt index 51fefca63..d073b56ac 100644 --- a/freeciv/version.txt +++ b/freeciv/version.txt @@ -1,7 +1,7 @@ # The Git SHA hash for the commit to checkout from # https://github.com/freeciv/freeciv -FCREV=84cf353806a212ed800df31048d8764a883ae529 +FCREV=3b2568c0f97d64c10180dae71028b49945322f02 ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.21" From 74fc951a0cca7116f6dc3ef3a64d2c6d5f8f31cb Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Mon, 18 Nov 2019 08:42:34 +0100 Subject: [PATCH 9/9] Update to Freeciv server freeciv/freeciv@5c97588f Freeciv commit message: Revert feature to allow scenario to make client show an image and play sound Hopefully it will be reintroduced with a better implementation in the future. See hrm Feature #771485 - http://www.hostedredmine.com/issues/771485 (Signed-off-by line removed from FCW commit message to avoid confusion) --- freeciv-web/src/main/webapp/javascript/packhand.js | 10 ---------- freeciv/version.txt | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/freeciv-web/src/main/webapp/javascript/packhand.js b/freeciv-web/src/main/webapp/javascript/packhand.js index 2bc0aa2a6..ee3ba1187 100644 --- a/freeciv-web/src/main/webapp/javascript/packhand.js +++ b/freeciv-web/src/main/webapp/javascript/packhand.js @@ -1612,16 +1612,6 @@ function handle_timeout_info(packet) seconds_to_phasedone_sync = new Date().getTime(); } -/************************************************************************//** - Shows image with text and play music -****************************************************************************/ -function handle_show_img_play_sound(packet) -{ - /* TODO: Implement */ - /* Currently (6th Sep 2018) only used in sandbox. The sandbox ruleset - * isn't supported by Freeciv-web at the moment. */ -} - function handle_play_music(packet) { /* TODO: Implement */ diff --git a/freeciv/version.txt b/freeciv/version.txt index d073b56ac..f972e5fa1 100644 --- a/freeciv/version.txt +++ b/freeciv/version.txt @@ -1,9 +1,9 @@ # The Git SHA hash for the commit to checkout from # https://github.com/freeciv/freeciv -FCREV=3b2568c0f97d64c10180dae71028b49945322f02 +FCREV=5c97588fe2b62d06ea9d119c867e01d994d8b7c0 -ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.21" +ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.25" # There's no need to bump this constantly as current freeciv-web # makes no connections to outside world - all connections are