widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1740141-map-horizon into lp:widelands.

Commit message:
Fixed bug in Crossing the Horizon map where the artifact at position 135/65 couldn't be conquered by a player

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1740141 in widelands: "Artifact on map Crossing the Horizon can't be conquered"
  https://bugs.launchpad.net/widelands/+bug/1740141

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1740141-map-horizon/+merge/337855
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1740141-map-horizon into lp:widelands.

=== modified file 'data/maps/Crossing_the_Horizon.wmf/binary/heights'
Binary files data/maps/Crossing_the_Horizon.wmf/binary/heights	2016-03-21 19:29:24 +0000 and data/maps/Crossing_the_Horizon.wmf/binary/heights	2018-02-16 11:35:48 +0000 differ
=== modified file 'data/maps/Crossing_the_Horizon.wmf/binary/mapobjects'
Binary files data/maps/Crossing_the_Horizon.wmf/binary/mapobjects	2016-03-21 19:29:24 +0000 and data/maps/Crossing_the_Horizon.wmf/binary/mapobjects	2018-02-16 11:35:48 +0000 differ
=== modified file 'data/maps/Crossing_the_Horizon.wmf/binary/terrain'
Binary files data/maps/Crossing_the_Horizon.wmf/binary/terrain	2016-03-21 19:29:24 +0000 and data/maps/Crossing_the_Horizon.wmf/binary/terrain	2018-02-16 11:35:48 +0000 differ
=== modified file 'data/maps/Crossing_the_Horizon.wmf/elemental'
--- data/maps/Crossing_the_Horizon.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Crossing_the_Horizon.wmf/elemental	2018-02-16 11:35:48 +0000
@@ -6,7 +6,7 @@
 map_h="144"
 nr_players="4"
 name=_"Crossing the Horizon"
-author="Kristin"
+author="Kristin – edited by 3plus4i"
 descr=_"Man your ship and sail to the horizon."
 hint=
 tags="2teams,artifacts,ffa,official,seafaring"

=== modified file 'data/maps/Crossing_the_Horizon.wmf/minimap.png'
Binary files data/maps/Crossing_the_Horizon.wmf/minimap.png	2016-03-21 19:29:24 +0000 and data/maps/Crossing_the_Horizon.wmf/minimap.png	2018-02-16 11:35:48 +0000 differ
=== modified file 'data/maps/Crossing_the_Horizon.wmf/objective'
--- data/maps/Crossing_the_Horizon.wmf/objective	2016-03-21 19:29:24 +0000
+++ data/maps/Crossing_the_Horizon.wmf/objective	2018-02-16 11:35:48 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr7905[trunk] (Debug)
+# Automatically created by Widelands bzr8543-201712201214 (Release)
 
 [global]
 packet_version="2"

=== modified file 'data/maps/Crossing_the_Horizon.wmf/player_names'
--- data/maps/Crossing_the_Horizon.wmf/player_names	2016-03-21 19:29:24 +0000
+++ data/maps/Crossing_the_Horizon.wmf/player_names	2018-02-16 11:35:48 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr7905[trunk] (Debug)
+# Automatically created by Widelands bzr8543-201712201214 (Release)
 
 [global]
 packet_version="2"

=== modified file 'data/maps/Crossing_the_Horizon.wmf/player_position'
--- data/maps/Crossing_the_Horizon.wmf/player_position	2016-03-21 19:29:24 +0000
+++ data/maps/Crossing_the_Horizon.wmf/player_position	2018-02-16 11:35:48 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr7905[trunk] (Debug)
+# Automatically created by Widelands bzr8543-201712201214 (Release)
 
 [global]
 packet_version="2"

=== modified file 'data/maps/Crossing_the_Horizon.wmf/port_spaces'
--- data/maps/Crossing_the_Horizon.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Crossing_the_Horizon.wmf/port_spaces	2018-02-16 11:35:48 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr7905[trunk] (Debug)
+# Automatically created by Widelands bzr8543-201712201214 (Release)
 
 [global]
 packet_version="1"

=== modified file 'data/maps/Crossing_the_Horizon.wmf/version'
--- data/maps/Crossing_the_Horizon.wmf/version	2016-03-21 19:29:24 +0000
+++ data/maps/Crossing_the_Horizon.wmf/version	2018-02-16 11:35:48 +0000
@@ -1,11 +1,11 @@
-# Automatically created by Widelands bzr7905[trunk] (Debug)
+# Automatically created by Widelands bzr8543-201712201214 (Release)
 
 [global]
 map_source_url=
 map_release=
-map_creator_version="bzr7905[trunk]"
+map_creator_version="bzr8543-201712201214"
 map_version_major="0"
 map_version_minor="1"
-map_version_timestamp="1458572717"
+map_version_timestamp="1514390111"
 packet_version="1"
 packet_compatibility="1"