Showing 567 changed files with 41,342 additions and 11,169 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 *.o
 *.a
 *.gmo
+*.mo
 *.pyc
 *.wz
 
@@ -15,6 +16,7 @@ win32/release
 # directories and files created when crosscompiling or Windows
 win32/build
 win32/downloads
+win32/__BUILD_CONFIG.USER
 win32/libs/dejavu/dejavu-fonts-ttf-*/
 win32/libs/dejavu/*-stamp
 win32/libs/devpkg/*-stamp
@@ -51,6 +53,10 @@ win32/libs/zlib/zlib-*/
 /src/autorevision.h
 /src/force-linker.cpp
 
+/doc/quickstartguide.html
+/doc/quickstartguide.pdf
+/doc/warzone2100.6
+
 # Generated executables:
 /build_tools/autorevision/autorevision
 /src/warzone2100
@@ -145,5 +151,6 @@ cscope.out
 /build
 /2.3
 /trunk
+/master
 /newnet
 /qt-trunk
diff --git a/COMPILE b/COMPILE
@@ -1,77 +1 @@
-Warzone Compilation Guide.
-
-The compilation method depends on your operating system.
-
-This guide will tell you how to compile warzone on its two main supported platforms: Linux and Windows.
-
-Linux Compilation:
-
-	Linux compilation follows the standard GNU autotools path, which you may know from other projects.
-
-	With the GNU autotools, compilation is straight forward. 'cd' a shell to warzones source root directory; the one containing the 'autogen.sh' file, and run the following commands:
-		./autogen.sh
-		./configure
-		make
-		make install
-	Note that the last command must be run as a privileged user (e.g. root) in order to succeed.
-
-	If the above commands fail, you're probably not having all the required software needed to satisfy the dependencies that warzone has on other libraries or tools. In that case, the scripts will tell you what package you're missing.
- 	Warzone has compile-time dependencies on the following software: autotools, gcc, make, SDL-dev, SDL_net-dev, oggvorbis-dev, zlib-dev, physicsfs-dev, OpenAL-dev, libpng-dev.
- 	Depending on your flavor of Linux, the package names may be different.
- 	If you are certain that you got all the packages required, but still can't compile, then try compiling with this command instead:
- 		make -f Makefile.raw
- 	If the compilation succeeds, then you have a problem with your autotools - please check that your 'autoheader', 'autoconf' and 'automake' symlinks are pointing to the correct versions of these programs.
- 	If the compilation still fails, write to our mailing list at: warzone-dev@gna.org or contact us on IRC at irc://irc.freenode.net/warzone
-
-Windows Compilation:
-
-	You may find a more up to date version at http://wz.rootzilla.de/wiki/user:windows_compile_guide
-
-	Prerequesites:
-		- Warzone Developer's Package (http://download.gna.org/warzone/development/warzone-devpkg.7z)
-		- Only when using the SVN version: TortoiseSVN (http://tortoisesvn.tigris.org/)
-
-		When using MinGW:
-			- MinGW (http://mingw.org/)
-				Candidate version is known to work.
-				You need to install Core, GCC, Binutils, Make, API and Runtime. Others are optional.
-			- Flex (http://gnuwin32.sourceforge.net/packages/flex.htm) and Bison (http://gnuwin32.sourceforge.net/packages/bison.htm)
-
-		When using MSVC:
-			- Microsoft Visual C++, eg. the MSVC 2005 Express Edtion (http://msdn.microsoft.com/vstudio/express/visualc/)
-			- Microsoft Platform SDK (http://msdn.microsoft.com/platformsdk/)
-			- Warzone Lexfiles (http://download.gna.org/warzone/development/warzone-lexfiles.7z)
-
-	Downloading the sourcecode:
-		Create a directory where you want to store the Warzone sourcecode. You will need the path to the sourcecode, so remember it’s location!
-
-		Release version:
-			Download a source tarball (tar.bz2) and extract it to the new folder.
-
-		SVN version:
-			Right-click on the new folder and choose “SVN Checkout...”
-			Set “URL of repository” to svn://svn.gna.org/warzone/trunk, leave everything else as is and click OK
- 			TortoiseSVN will now checkout the up to date sourcecode from our SVN repository. This may take a while, especially on slow internet connections
-
-	Preparing:
-		Extract the Developer’s Package to a folder of your choice. Remember the location!
-		Only when using the SVN version: Open the “src” folder and copy “version.c.tmpl” to “version.c” and change the version numbers according to the current version and the revision you checked out. If you want to distribute the compiled binary these versions need to be correct! (Otherwise you can leave them as is.)
-
-		MinGW:
-			Open the “makerules” folder
-			Copy “config.mk.tmpl” to “config.mk” and change the settings and paths according to your needs
-
-		MSVC:
-			Extract the Lexfiles into the newly created sourcecode directory
-			Open the Solution (MSVC 2005 and higher required, file: Warzone.sln) or the Project (file: Warzone.vcproj)
-			Choose “Project / Properties” from the menu
-			Change the “Additional Includedirectories” in “C/C++ / General” and “Additional Librarydirectories” in “Linker / General” according to your setup
-
-	Compile:
-		MinGW:
-			Open a Windows Terminal
-			cd to the sourcecode directory
-			type “mingw32-make -f Makefile.raw”
-
-		MSVC:
-			Choose “Compile / Solution” from the menu
+See http://developer.wz2100.net/wiki/CompileGuide.
diff --git a/COPYING.NONGPL b/COPYING.NONGPL
@@ -5,8 +5,6 @@ data/texpages/bdrops/backdrop6.png
 	- CC BY SA 3.0	- Copyright (c) 2007-2008 "B. V. Edwards" <cathuria>
 data/base/texpages/page-25-sky-urban.png
 	- CC0, original work by cybersphinx
-data/mods/global/newst_tiles/
-	- CC BY SA 3.0	- Copyright (c) 1999-2004 N.E.W.S.T., permission by "Frank Lamboy" <rman>
 lib/framework/tagfile.*
 	- Public Domain
 lib/netplay/miniupnpc/*

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,55 @@
+2011-05-17: Version 2.3.8
+ * General:
+   * New: Two new 2 player maps - Vision and Roughness (commit:697afb16d5244f9715952f8762b1011c6d75101e, commit:ebfc46b679a1f74df0e63313e4d3e05db55a23ad)
+   * Change: Increase recycled experience storage in memory (commit:703665b4b7df1282eee29a7064961bc66152a847)
+   * Change: Set a window icon (ticket:2465, commit:ac792c67d4bb66618ae7ff712844c4eebb70a496)
+   * Change: Allow projectiles to go through terrain again (ticket:2386, commit:d13ede6bf2d2248866c4ecc62594555db9f9de0d)
+   * Change: Limited support for map-mods. Only load the map file actually used when starting a game. (ticket:2610, commit:65d968cdfccecc6c60e0215ab34dbf3d56f19a80)
+   * Change: Show the minimap larger on small maps if the vertical resolution is higher than 480 (commit:5731d0e12c0d58dd42601e5befff3e30804bd1fe, commit:c201b5948b0af9a16b8676620e7cb64553d4c112)
+   * Change: Show experience with one decimal place (ticket:2641, commit:fb5d9645e85de49365e47382dfce9fec7fd3fb31)
+   * Change: Allow video resolutions up to 1024x1024 (ticket:2682, commit:1f4690572be0792a3450f7afce36b3a6b9f8e093, commit:7019d7eb515f974deb544135d661087bc2ce2db5)
+   * Change: Add an option to show videos with black or 50% dimmed scanlines (ticket:2095, commit:96984700f5f0182ad66b7425eace33e7f62c0177, commit:549c476672a9133d9400eec7b7fefbdd7da35cfe, commit:8895d58d282524b9636bcbf58f0753edc244dbd9)
+   * Change: Use a resolution-dependent font size for video subtitles (commit:9597d741a0104aa9b7c57745ab9f9d9ca0892218)
+   * Change: Show power generator effects for all players (commit:adeacf66a1954a87fcfc2d950a7b890e20bf6d5d)
+   * Fix: Prevent savegame corruption (ticket:2100, commit:a974722e397b7072fb59d0114e2a4ef9f8d509d8, ticket:2625, commit:cc156a668fb5291e38eab33ff77138a05e29fa28, ticket:2627, commit:fc0f87807eeadaeeafb1386b2525a81f0a550fde)
+   * Fix: Prevent saved experience from being truncated (ticket:2641, commit:4b197ba312a5c08efdab1fb4c2ccd2bf1c077c1d)
+   * Fix: Prevent building on burning oil (ticket:1100, commit:2745ac27f84301c05b678892d798a93fd4e7f813)
+ * Multiplayer balance (ticket:2687, commit:71eac1c4a332be3af4ab8c9bc4cafd65dabe7f13):
+   * HP increased:
+     * Leopard 85 → 107
+     * Panther 145 → 193
+     * Tiger 225 → 284
+   * Range increased:
+     * Minipod 3-8 → 4-9
+     * MRA 3-8.5 → 4-9
+   * Pepperpot:
+     * Damage increased 50 → 60 (splash 30 → 40)
+     * Reload time decreased 2.0 → 1.8
+   * Heavy Laser (normal and VTOL):
+     * Price decreased 600 → 400
+     * Build points decreased 1000 → 600
+     * HP increased 200 → 300
+   * Twin Assault Cannon:
+     * Damage decreased 55 → 50 (splash 45 → 40)
+   * Plasmite Bomb:
+     * Weight increased 12000 → 15000
+   * VTOL Sunburst AA:
+     * Damage increased 100 → 120
+     * Splash damage removed
+   * Lowered prerequisites:
+     * Thermal Armor from Dense Composite Alloys to Composite Alloys Mk3
+     * High Intensity Thermal Armor from Superdense Composite Alloys to Dense Composite Alloys Mk3
+ * Mods:
+   * Fix: 1.10 Balance (commit:9943ff3a4b67b0f64a9e2ee163c8ccac711be72e)
+   * Fix: NTW bodies (ticket:2177, commit:a8fb8bec834c9d550fe43bada610bf5440d6b960)
+ * Translations:
+   * New: Catalan (ticket:2616, commit:9c6b0b8131636c2d1bf2b610114f0fd08291bc42)
+   * New: Hungarian (commit:5266c78b544593fb9497892ba9e632c1ddcda763, commit:b7cc16c72b4d4aaa3f2a3b23b69a9a5896b1fa43)
+   * Update: French (commit:cdd283ce60c5cdb573106981a35080f2fff0d7db)
+   * Update: Portuguese and Brazilian (ticket:2489, commit:0ade7219d614505839bd201c3f4cb8a50c9857e2)
+   * Update: German (ticket:2679, commit:7bfeb3e01c571c077b388e017ec86bfd58b97a6a)
+   * Update: Dutch (ticket:2720, commit:7bd5df883557e9f2b2aaa55a93d46a2ec4f9a81a, commit:6896384f8271aaa577d69e61a18437bd1399e648)
+
 2011-01-21: Version 2.3.7
  * General:
    * Fix: Make construction, production and research independent of framerate and number of parallel tasks (commit:b4e33f24a2dca11fe5c28683f43ccea4fe95e811)

diff --git a/autorevision.conf b/autorevision.conf
@@ -1 +1 @@
-wc_uri=tags/2.3.7
+wc_uri=tags/2.3.8
diff --git a/build_tools/Makefile.am b/build_tools/Makefile.am
@@ -1,3 +1 @@
 SUBDIRS=autorevision
-
-EXTRA_DIST = download.pl
diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[2.3.7],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[2.3.8],[http://wz2100.net/],[warzone2100])
 
 AM_INIT_AUTOMAKE([1.10 tar-ustar])
 
@@ -49,6 +49,11 @@ echo $srcdir
 rm -f filesynctest.zip
 AC_SUBST([ZIP_UPDATE], [${ZIP_UPDATE}])
 
+AC_CHECK_PROG(A2X, a2x, a2x)
+AC_CHECK_PROG(WKHTMLTOPDF, wkhtmltopdf, wkhtmltopdf)
+AM_CONDITIONAL([A2X_AVAILABLE], test -n "$A2X")
+AM_CONDITIONAL([WKHTMLTOPDF_AVAILABLE], test -n "$WKHTMLTOPDF")
+
 # Enable Compiler/LibC GNU extensions
 AC_GNU_SOURCE
 
@@ -400,7 +405,7 @@ AS_IF([test "$enable_motif" != "no"],[
 	AC_CHECK_HEADER(Xm/Xm.h, , AS_IF([test "$enable_motif" = "yes"],
 		[AC_MSG_ERROR([Motif headers not found])]))
 	AC_CHECK_LIB(Xm, XmCreateErrorDialog, [
-		AC_SUBST([MOTIF_LIBS], [-lXm])
+		AC_SUBST([MOTIF_LIBS], ["-lXt -lXm"])
 		AC_DEFINE([WZ_HAVE_MOTIF], 1, [Enable use of Motif when available])
 		AM_CONDITIONAL([MOTIF_AVAILABLE], true)
 		], AS_IF([test "$enable_motif" = "yes"],
@@ -516,3 +521,10 @@ AS_IF([test -z "$PERL"],[
 	AC_MSG_NOTICE()
 	AC_MSG_WARN([Perl >= 5.10 isn't installed, autogeneration of some sources will not work.])
 ])
+
+AS_IF([test -z "$A2X" -o -z "$WKHTMLTOPDF"],[
+	AC_MSG_NOTICE()
+	AC_MSG_WARN([a2x or wkhtmltopdf not found, can't convert documentation. This doesn't affect building the game,
+		but means that things like "make dist" and building a Windows installer will fail.])
+])
+
diff --git a/data/base/multiplay/maps/2c-Roughness.gam b/data/base/multiplay/maps/2c-Roughness.gam
diff --git a/data/base/multiplay/maps/2c-Roughness/dinit.bjo b/data/base/multiplay/maps/2c-Roughness/dinit.bjo
diff --git a/data/base/multiplay/maps/2c-Roughness/feat.bjo b/data/base/multiplay/maps/2c-Roughness/feat.bjo
diff --git a/data/base/multiplay/maps/2c-Roughness/game.map b/data/base/multiplay/maps/2c-Roughness/game.map
diff --git a/data/base/multiplay/maps/2c-Roughness/struct.bjo b/data/base/multiplay/maps/2c-Roughness/struct.bjo
diff --git a/data/base/multiplay/maps/2c-Roughness/ttypes.ttp b/data/base/multiplay/maps/2c-Roughness/ttypes.ttp
diff --git a/data/base/multiplay/maps/2c-Vision.gam b/data/base/multiplay/maps/2c-Vision.gam
diff --git a/data/base/multiplay/maps/2c-Vision/dinit.bjo b/data/base/multiplay/maps/2c-Vision/dinit.bjo
diff --git a/data/base/multiplay/maps/2c-Vision/feat.bjo b/data/base/multiplay/maps/2c-Vision/feat.bjo
diff --git a/data/base/multiplay/maps/2c-Vision/game.map b/data/base/multiplay/maps/2c-Vision/game.map
diff --git a/data/base/multiplay/maps/2c-Vision/struct.bjo b/data/base/multiplay/maps/2c-Vision/struct.bjo
diff --git a/data/base/multiplay/maps/2c-Vision/ttypes.ttp b/data/base/multiplay/maps/2c-Vision/ttypes.ttp
diff --git a/data/base/sequenceaudio/cam3/c003.txa b/data/base/sequenceaudio/cam3/c003.txa
@@ -2,7 +2,7 @@
 254	420	0	100	_("NORTHERN SECTOR")
 
 20	20	113	479	_("TRANSPORT MISSION: Northern Sector")
-20	447	113	479	_("Congratulations your successful evacuation of Beta Base.")
+20	447	113	479	_("Congratulations on your successful evacuation of Beta Base.")
 0	0	113	479	_("NEXUS has gained access to nuclear weapons and is determined to destroy the Project.")
 
 20	20	1000	1225	_("Dusk, December 3rd, 2100")

diff --git a/data/mods/multiplay/ntw/components/bodies/exfire.pie b/data/mods/multiplay/ntw/components/bodies/exfire.pie
@@ -131,6 +131,12 @@ POLYGONS 30
 	200 4 87 86 85 84 72 172 72 163 91 163 91 172 
 	200 4 91 90 89 88 72 229 72 223 91 223 91 229 
 	200 4 95 94 93 92 125 81 112 81 112 63 125 63 
-CONNECTORS 2
-	0 18  32 
-	0 7 -1 
+CONNECTORS 8
+	0 23 35
+	0 -33 25
+	0 23 55
+	0 0 0
+	0 0 0
+	0 -33 9
+	0 23 9
+	0 23 -11
diff --git a/data/mods/multiplay/ntw/components/bodies/exschool.pie b/data/mods/multiplay/ntw/components/bodies/exschool.pie
@@ -98,6 +98,12 @@ POLYGONS 21
 	200 4 65 64 62 63 66 226 63 230 21 230 60 217 
 	200 4 67 65 63 66 68 226 66 226 60 217 68 217 
 	A00 4 71 70 69 68 66 151 81 151 81 161 66 161 
-CONNECTORS 2
-	0 -14  38 
-	0 7 -1 
+CONNECTORS 8
+	0 23 35
+	0 -33 25
+	0 23 55
+	0 0 0
+	0 0 0
+	0 -33 9
+	0 23 9
+	0 23 -11
diff --git a/data/mods/multiplay/ntw/components/bodies/sabod1.pie b/data/mods/multiplay/ntw/components/bodies/sabod1.pie
@@ -19,6 +19,12 @@ POLYGONS 6
 	200 4 3 4 7 2 177 184 155 191 151 180 173 170 
 	200 4 1 6 5 0 173 170 151 180 155 191 177 184 
 	200 4 4 3 0 5 203 162 248 165 246 183 205 179 
-CONNECTORS 2
-	0 4  24 
-	0 -17  8 
+CONNECTORS 8
+	0 10 23
+	0 -25 13
+	0 10 43
+	0 0 0
+	0 0 0
+	0 -25 9
+	0 10 9
+	0 10 -11
diff --git a/data/mods/multiplay/ntw/components/bodies/sabod2.pie b/data/mods/multiplay/ntw/components/bodies/sabod2.pie
@@ -29,6 +29,12 @@ POLYGONS 10
 	200 4 9 12 4 10 148 104 163 106 172 102 150 102 
 	200 4 9 10 11 8 147 142 155 163 160 163 167 147 
 	200 4 8 11 5 13 136 129 139 136 157 153 158 148 
-CONNECTORS 2
-	0 -4  27 
-	0 -18  8 
+CONNECTORS 8
+	0 1 31
+	0 -21 21
+	0 1 51
+	0 0 0
+	0 0 0
+	0 -21 8
+	0 1 8
+	0 1 -12
diff --git a/data/mods/multiplay/ntw/components/bodies/sabod3.pie b/data/mods/multiplay/ntw/components/bodies/sabod3.pie
@@ -33,6 +33,12 @@ POLYGONS 12
 	200 4 7 2 3 6 153 59 147 90 176 88 173 66 
 	200 4 1 4 5 0 221 158 228 193 245 186 237 160 
 	200 4 12 8 9 13 218 160 209 156 208 186 219 191 
-CONNECTORS 2
-	0 8  23 
-	0 -29  8 
+CONNECTORS 8
+	0 23 35
+	0 -33 25
+	0 23 55
+	0 0 0
+	0 0 0
+	0 -33 9
+	0 23 9
+	0 23 -11
diff --git a/data/mods/multiplay/ntw/components/bodies/sebod1.pie b/data/mods/multiplay/ntw/components/bodies/sebod1.pie
@@ -31,6 +31,12 @@ POLYGONS 16
 	200 3 6 5 7 214 81 214 131 198 81 
 	200 3 7 5 4 214 131 201 82 214 82 
 	200 3 4 5 0 214 87 214 104 205 87 
-CONNECTORS 2
-	0 0  24 
-	0 -16  7 
+CONNECTORS 8
+	0 10 23
+	0 -25 13
+	0 10 43
+	0 0 0
+	0 0 0
+	0 -25 9
+	0 10 9
+	0 10 -11
diff --git a/data/mods/multiplay/ntw/components/bodies/sebod2.pie b/data/mods/multiplay/ntw/components/bodies/sebod2.pie
@@ -74,6 +74,12 @@ POLYGONS 44
 	200 3 24 11 22 235 156 235 167 229 156 
 	200 3 24 22 21 121 50 149 50 121 59 
 	200 3 24 21 11 232 156 236 167 229 167 
-CONNECTORS 2
-	0 16  33 
-	0 -11  9 
+CONNECTORS 8
+	0 1 31
+	0 -21 21
+	0 1 51
+	0 0 0
+	0 0 0
+	0 -21 8
+	0 1 8
+	0 1 -12
diff --git a/data/mods/multiplay/ntw/components/bodies/sebod3.pie b/data/mods/multiplay/ntw/components/bodies/sebod3.pie
@@ -107,6 +107,12 @@ POLYGONS 59
 	200 4 39 40 25 19 175 81 148 81 148 65 175 65 
 	200 3 2 41 12 220 256 253 243 253 256 
 	200 4 42 40 39 41 69 31 82 31 82 20 69 20 
-CONNECTORS 2
-	0 -6  35 
-	0 -24  9 
+CONNECTORS 8
+	0 23 35
+	0 -33 25
+	0 23 55
+	0 0 0
+	0 0 0
+	0 -33 9
+	0 23 9
+	0 23 -11
diff --git a/data/mods/multiplay/ntw/components/bodies/truck.pie b/data/mods/multiplay/ntw/components/bodies/truck.pie
@@ -60,5 +60,12 @@ POLYGONS 24
 	200 4 29 28 25 26 86 34 86 18 64 18 64 34 
 	200 6 3 2 0 15 17 1 179 94 196 94 196 51 192 45 183 45 179 51 
 	200 4 5 4 8 9 121 49 147 49 147 84 121 84 
-CONNECTORS 1
-	0 19  30 
+CONNECTORS 8
+	0 1 31
+	0 -21 21
+	0 1 51
+	0 0 0
+	0 0 0
+	0 -21 8
+	0 1 8
+	0 1 -12
diff --git a/data/mods/multiplay/old-1.10-balance/messages/strings/names.txt b/data/mods/multiplay/old-1.10-balance/messages/strings/names.txt
@@ -523,7 +523,7 @@ Mortar1Mk1-Pit			"Mortar Emplacement"
 Mortar2Mk1				"Bombard"
 Mortar2Mk1-Pit			"Bombard Emplacement"
 Mortar3ROTARYMk1			"Pepperpot"
-Mortar3ROTARYMk1-Pit		"Peperpot Emplacement"
+Mortar3ROTARYMk1-Pit		"Pepperpot Emplacement"
 RailGun1Mk1				"Needle Gun"
 RailGun2Mk1				"Rail Gun"
 RailGun3Mk1				"Gauss Cannon"
@@ -1954,3 +1954,8 @@ SK-Mantis-VTOL-PBB		_("Phosphor Bomb Bay Mantis VTOL")
 SK-Mantis-VTOL-HBB		_("Heap Bomb Bay Mantis VTOL")
 SK-Retre-VTOL-HBB		_("Heap Bomb Bay Retribution VTOL")
 SK-Retal-VTOL-Scourge		_("Scourge Retaliation VTOL")
+SK-Retre-VTOL-Plasmite	_("Plasmite Retribution VTOL")
+
+//Added for mp.wz (templates.txt)
+SK-Veng-Hover-Seraph           "*SK-Veng-Hover-Seraph*"
+Dragon-Hover-SeraphGauss       "*SK-Dragon-Hover-SeraphGauss*"