.gitignore

@@ -256,6 +256,7 @@ data/config/*
 data/etc/*
 data/fonts/
 devpkg/*
+[Dd]ebug/
 *.opensdf
 *.aps
 *.sdf

3rdparty/quesoglc/GL/glc.h

@@ -47,7 +47,11 @@
 #  define __WIN32__
 #endif
 
-#ifdef __WIN32__
+// NOTE: For mingw-w64, we must define _GDI32_ otherwise we would be making WINGDIAPI DECLSPEC_IMPORT
+// which we do not want (that is for shared libs, aka dlls).  See wingdi.h to see where the check is.
+// refs: http://sourceforge.net/p/mingw-w64/patches/41/
+#if defined(__WIN32__) && !defined(WINGDIAPI)
+#  define _GDI32_
 #  include <windows.h>
 #endif
 

AUTHORS

@@ -1,29 +1,61 @@
 Original game developed by Pumpkin Studios, and published by EIDOS Interactive.
 
-The Warzone 2100 Project team:
+The Warzone 2100 Project team (current GPL version):
 Christian Ohm (cybersphinx) 	programmer
 Per I. Mathisen (per / sendai)	programmer
+Stephen Swaney (stiv) programmer, web programmer
 - (Cyp) 	programmer
-- (dak180) 	MacOSX Packaging
-- (Safety0ff) 	programmer
-- (vexed) 	programmer
-Rene Jochum (fastdeath / pcdummy) 	Webmaster/Hosting, programmer
+- (vexed) 	programmer+++
 
 
 
-Current or former contributors to the GPL version:
+Current or former contributors to the GPL version (alphabetical order):
+- ([ARCH]T4l0n) Artist
+- (adimosh)
+- (Alpha93) Translator
+- (Amiral JCDG) Translator
+- (aubergine) Artist
+- (bornemix) Programming
+- (Bulldozer) MacOSX Packaging
+- (Delphinio) NTW
+- (duda) Artist & Maps
+- (DylanDog) AI script
+- (Emdek) Translator
+- (Flail13) flaME (Map Editor)
+- (Jorzi) Artist
+- (littlepig) Programming
+- (MaNGusT) Artist
+- (mecatxis) Translator
+- (mtomi78) Translator
+- (NanoTech) Mac programming
+- (NoQ) Maps / programming
+- (olexandr1986) Translator
+- (Olrox) Artist
+- (Rimbok) Translator
+- (Romano FC) Translator
+- (Saberuneko) Translator
+- (stwf) MacOSX Packaging
+- (themousemaster) Walkthrough / Docs
+- (Tucalipe) Translator
+- (urgood2 ) Translator
+- (Zerovirus) Artist
+- (Bulldozer) MacOSX Packaging
+- (dak180) 	former MacOSX Packaging
+- (Duha) Addons site
 - (Hatsjoe) 	2D Graphics
-- (Pseudonym404) 	Programming + original 64bit support
 - (i-NoD) 	Programming
+- (Pseudonym404) 	Programming + original 64bit support
+- (Safety0ff) 	programmer
 - (vs2k5) 	Programming
 Adam Holland (coppercore) 	Testing
 Angus Lees (gus) 	Debian Packaging
 Ari Johnson (iamtheari) 	Programming and MacOSX Packaging + original MacOSX port
 Ben Russon (grizzly) 	Support
-Mr.Marney (Berg) 	Models, textures
+Mr.Marney (Berg) 	Models, textures, Site theme designer, programmer
 Ben Latimore (BlueMaxima) 	guide/manual
 Bruce V. Edwards (cathuria) 	2D/3D Graphics
 Carl Hee (Watermelon) 	Programming + Multiturrets
+Christian Scholz (cnceo)	2D Graphics
 Denis Dupeyron (charun) 	Programming
 Dennis Luxen (pret) 	Programming
 Dennis Schridde (devurandom) 	Programming and general Linux and Windows Packaging
@@ -32,25 +64,30 @@ Dmitri Shuralyov (shurcool) 	Programming
 Don Edwards 	2D Graphics support
 Elio Gubser (elio, ohyeh) 	2D Graphics
 Freddie Witherden (EvilGuru) 	Programming and MacOSX Packaging
+Garrett Wiens-Kind (Neuralize) Artist
 Gerard Krol (gerard_) 	Programming, Textures
 Giel van Schijndel (Giel) 	Programming and Debian Linux and Windows Packaging
 Guangcong Luo (Zarel) 	Programming, Balancing, and Documentation
 Hylke van der Schaaf (TheNoid) 	Programming
+Ivan Vasilov (Wolftrak) MacOSX Packaging
 Kevin Malec (Kevin`) 	Websupport
 Kim Metcalfe (lav-coyote25) 	Documentation, Maps and Support
 Marcus Rast (charon) 	Programming
 Martin Koller (mkoller) 	Programming
 Mike Gilmore (Chojun) 	Programming
 Phil Procario (GrimMoroe, grimandmandy) 	3D Graphics
+Rene Jochum (fastdeath / pcdummy) 	former Webmaster, programmer
 Rodolphe Suescun (rodzilla) 	Programming
 Roman C. troman 	Programming
 Scott Balneaves (sbalneav) 	Programming
 Stefan Huehner (shuehner) 	Programming + original 64bit support
 Steven Koenig (kreuvf) 	Documentation, translation
 Thomas Barlow (Mysteryem) 	3D Graphics
-Tim Perrei (kamaze) 	Webmaster/Hosting, Programming
+Tim Perrei (kamaze) 	former Webmaster, Programming
+Vladimir Salnikov (crab_) Warzone Guide Database
 Victor Qamly (vqamly) 	Programming
-Christian Scholz (cnceo)	2D Graphics
+
+
 
 Non-project members whose content has been used in Warzone:
 Bart Everson 	Terrain textures

ChangeLog

@@ -1,3 +1,24 @@
+2014-12-29: Version 3.1.2
+ * General:
+   * Change: Some updated textures and models (commit:90f9ef01e8c684792507c49c86c99b1f72db473b)
+   * Change: No longer enforce a 255 max limit on number of structure types (commit:8f7b9c8f07502c2e0cb86fd2c7d6085dfae1896d, ticket:4205)
+   * Fix: Race condition bugs (commit:4986580f0845f47553713c2b3afbdfa82296d12a, ticket:4213, ticket:3228)
+   * Fix: Throttling of danger function was not working (commit:9827d7a2a99602016d55c9cc8cb18d375fb7b5a8, ticket:4212)
+   * Fix: Stop auto-repair from repairing unfinished structures (commit:8f7b9c8f07502c2e0cb86fd2c7d6085dfae1896d, ticket:4205)
+   * Fix: Fix wall rotation bug (commit:b562febeec102801e098a69c484fdc5c65fbdec3)
+   * Fix: Highground map for balance issues (commit:ec99d98a47fc25f5b1e2193bdf6c7a2d39faf712)
+   * Fix: Update the Roughness map to improve terrain texturing (commit:9eb558eba4d2ce66569ea69592836231bc87e1ae)
+   * Fix: Add some Host & client version checks (commit:b92a1d9328223f50911833fe5a0aa285bc3fd02c commit:3e746930ebe6d5f8de759f899eb31fe62d32493a)
+   * Fix: Add missing bitmaps to distribution packages (commit:992dcecac2a4aefab6d6283abe2d7b3465c9042a)
+   * Fix: Add missing bison/flex files to distribution packages (commit:63b1860973138ad8d0b4642599bce874cf72ac28, ticket:4151)
+   * Change: Linux crash dumps are now written to our config directory. (commit:ff1ac373abec15ca4095a82b76d0e584741a15d4, ticket:3885)
+
+ * Translations:
+   * Update: Portuguese-Brazillian translation by Tucalipe (ticket:4164)
+   * Update: Hungarian translation by Mészáros Tamás & Szalai Kálmán & MeszarosTomi (ticket:4250 ticket:4264 ticket:4266 )
+   * Update: Italian translation by Alpha93 (ticket:4174)
+   * Update: Greek translation by Nikos (ticket:3703)
+
 2013-12-11: Version 3.1.1
  * General:
    * Change: Updated textures by Christian Scholz (cnceo) (commit:1f5432d81c621f28dc091ba50aa0fb16b6e5d1e1)

Makefile.am

@@ -40,6 +40,19 @@ ACLOCAL_AMFLAGS = -I m4
 distcleancheck_listfiles =  find . -type f -print | grep -v 'autorevision.cache'
 
 EXTRA_DIST= \
+	lib/framework/resource_lexer.lpp \
+	lib/framework/resource_parser.ypp \
+	lib/framework/strres_lexer.lpp \
+	lib/framework/strres_parser.ypp \
+	lib/gamelib/audp_lexer.lpp \
+	lib/gamelib/audp_parser.ypp \
+	lib/script/chat_lexer.lpp \
+	lib/script/chat_parser.ypp \
+	lib/script/script_lexer.lpp \
+	lib/script/script_parser.ypp \
+	src/level_lexer.lpp \
+	src/scriptvals_lexer.lpp \
+	src/scriptvals_parser.ypp \
 	build_tools/autorevision \
 	autogen.sh \
 	config.rpath \

build_tools/autorevision.bat

@@ -1,3 +1,5 @@
+setlocal
+set PATH=%PATH%;D:\Git\bin
 echo "Building autorevision.h... (msysgit must be in system path)"
 cd %1..\
 echo %1
@@ -14,4 +16,5 @@ echo "Failed! Is msysgit in your system path?"
 exit
 :good
 echo "File has been generated."
+endlocal
 exit

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[3.1.1],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[3.1.2],[http://wz2100.net/],[warzone2100])
 
 AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-xz])
 

data/base/images/frontend.img

@@ -208,3 +208,5 @@
 0,0,image_filter_r.png
 0,0,image_reload.png
 0,0,image_reload_r.png
+0,0,image_upgrade.png
+0,0,image_upgrade_r.png