# HG changeset patch
# User sheepluva
# Date 1432587038 -7200
# Node ID 91d256bbd84018b4fcebd7acebee98153af9556d
# Parent  4f77e60146fcd701adc48ac8068572496f0f0816# Parent  b30f29396f0c00546a05f476974c782a406981e3
merge

diff -r b30f29396f0c -r 91d256bbd840 ChangeLog.txt
--- a/ChangeLog.txt	Mon May 25 16:40:04 2015 -0400
+++ b/ChangeLog.txt	Mon May 25 22:50:38 2015 +0200
@@ -1,6 +1,14 @@
 + features
 * bugfixes
 
+0.9.21 -> 0.9.22
+ + Map previews can now take script parameters into account and preview waypoints in TechRacer
+ + Added a couple new flags
+ + Small improvements to the interface and in-game chat
+ * Generated bridges/girders are now connected better to the land mass
+ * Fixed rubberband sprite
+ * Many other bug fixes
+
 0.9.20 -> 0.9.21:
  + New type of randomly generated maps: Perlin Maps.
  + Old Random generated maps are more diverse now.
diff -r b30f29396f0c -r 91d256bbd840 share/hedgewars/Data/Scripts/TechMaps.lua
--- a/share/hedgewars/Data/Scripts/TechMaps.lua	Mon May 25 16:40:04 2015 -0400
+++ b/share/hedgewars/Data/Scripts/TechMaps.lua	Mon May 25 22:50:38 2015 +0200
@@ -29,7 +29,7 @@
 function PreviewWayPoint(x,y)
     AddPoint(x,y,20)
     AddPoint(x,y,19,true)
-    for i = 0,100,50 do 
+    for i = 0,100,50 do
         AddPoint(x-120,y+i,1,true)
         AddPoint(x+120,y-i)
         AddPoint(x-i,y+120,1,true)