.gitignore

@@ -1,22 +1,47 @@
 # Backup/temporary files:
 *~
+*.bak
 .*.swp
 
 # Generated binary files:
 *.o
+*.lo
 *.a
+*.la
 *.gmo
-*.mo
 *.pyc
 *.wz
-
+# Doxygen files
+/doc/code/html
+# LaTeX generated (binary) files
+*.aux
+*.log
+*.out
+*.pdf
+*.toc
+# windows generated binary files:
+*.obj
+*.lib
+*.pdb
+*.exe
+*.htm
+*.pdb
+*.idb
+*.ilk
+*.res
+*.manifest
+*.ncb
+*.suo
+*.user
+/devpkg/*
+build_tools/autorevision/Debug/*
+build_tools/autorevision/Release/*
 win32/debug
 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
@@ -46,12 +71,17 @@ win32/libs/vorbis/*-stamp
 win32/libs/vorbis/libvorbis-*/
 win32/libs/zlib/*-stamp
 win32/libs/zlib/zlib-*/
+win32/debug/*
+win32/release/*
+win32/__BUILD_CONFIG.USER
 
 # Autogenerated files:
 *.lex.[ch]
 *.tab.[ch]
+*.lex.[ch]pp
+*.tab.[ch]pp
 /src/autorevision.h
-/src/force-linker.cpp
+*.moc.h
 
 /doc/quickstartguide.html
 /doc/quickstartguide.pdf
@@ -60,19 +90,18 @@ win32/libs/zlib/zlib-*/
 # Generated executables:
 /build_tools/autorevision/autorevision
 /src/warzone2100
-/tests/t1000
-
-# trunk leftovers:
-/tests
-/tools
+/tests/astartest
+/tests/maptest
+/tests/pointtree.ppm
+/tests/pointtreetest
 
 # Autotool files:
 .deps
+.libs
 Makefile
 Makefile.in
 /aclocal.m4
 /autom4te.cache/*
-/build-stamp
 /config.*
 /configure
 /depcomp
@@ -82,6 +111,8 @@ Makefile.in
 /stamp-h1
 /po/POTFILES
 /po/remove-potcdate.sed
+/po/stamp-po
+/po/warzone2100.pot
 
 # Include this one Makefile
 !/pkg/dpkg/videos/Makefile
@@ -90,7 +121,6 @@ Makefile.in
 /lib/betawidget/.libs/
 /lib/betawidget/aclocal.m4
 /lib/betawidget/autom4te.cache/
-/lib/betawidget/betawidget_wrap_lua.cpp
 /lib/betawidget/config.*
 /lib/betawidget/configure
 /lib/betawidget/depcomp
@@ -102,6 +132,8 @@ Makefile.in
 /lib/betawidget/lua-5.1.3/
 /lib/betawidget/m4/
 /lib/betawidget/missing
+/lib/betawidget/src/*_wrap_lua.cpp
+/lib/betawidget/src/betawidget.pc
 /lib/betawidget/stamp-h1
 /lib/betawidget/tools/.dirstamp
 
@@ -114,13 +146,32 @@ cscope.out
 /waf
 /.waf-*
 
+# Eclipse CDT
+.project
+.cproject
+.settings/
+
 # KDevelop4
 /.kdev4/
-/warzone.kdev4
+/warzone*.kdev4
 /.kdev_include_paths
 
-# patches
+# Qt
+lib/framework/wzapp_moc.cpp
+
+tools/qwzm/config
+tools/qwzm/moc_qwzm.cpp
+tools/qwzm/moc_wzmglwidget.cpp
+tools/qwzm/qwzm
+tools/qwzm/ui_animationview.h
+tools/qwzm/ui_connectorview.h
+tools/qwzm/ui_qwzm.h
+
+# Patches
 *.patch
+*.diff
+*.rej
+*.orig
 
 # Debian stuff
 /debian
@@ -138,19 +189,61 @@ cscope.out
 /pkg/dpkg/warzone2100.substvars
 /pkg/dpkg/warzone2100/
 
-
 #Mac Stuff
 .DS_Store
 *.pbxuser
 *.perspectivev3
+macosx/Warzone.xcodeproj/xcuserdata/*
+macosx/Warzone.xcodeproj/project.xcworkspace/xcuserdata/*
+macosx/Warzone.xcworkspace/xcuserdata/*
+macosx/configs/codeident
 
 # build folders
 /macosx/build/
+/macosx/Build/
 /macosx/external/
 /macosx/prebuilt/
 /build
+/build_*/
+!/build_tools/
 /2.3
 /trunk
-/master
 /newnet
 /qt-trunk
+/master
+/3.0
+
+#misc (MSVC)
+*.orig
+*.bak
+*.exe
+*.obj
+*.suo
+*.ncb
+*.htm
+*.mep
+*.manifest
+*.res
+*.idb
+*.pdb
+*.diff
+*.dep
+*.user
+*.lib
+*.dll
+data/*.dll
+data/config/*
+data/etc/*
+data/fonts/
+devpkg/*
+*.opensdf
+*.sdf
+*.ipch
+*.tlog
+*.lastbuildstate
+*.cache*
+*manifest.*
+*.exp
+
+# profiler stuff
+win32/CodeAnalyst

ChangeLog

@@ -1,4 +1,29 @@
-2011-05-xx: Version 2.3.8
+2011-10-23: Version 2.3.9
+ * General:
+   * Change: Show damage on all buildings (ticket:2634, commit: eabe72073c5e594f7849cd53460b25ae95b3371e)
+   * Change: Use Ctrl-V instead of Tab to paste in edit boxes (ticket:2830, commit:d2f4b5a162151d3dac14e45931e727b181c9ef22)
+   * Change: Mouse wheel scrolling in research and build menus (ticket:2110, commit:6a41d3f59f962800b2e0e3eba7e696f48dc46b36)
+   * Fix: Make units follow their orders better (ticket:2391, commit:2c31de52476f81f6ef368a38483c912c08c69c22)
+   * Fix: Make sure files in sequences.wz override included ones, so localized videos are always used (ticket:2728, commit:4830009833b8b89c9dde0080fe862505246c6b8a)
+   * Fix: Maps can never override game data (ticket:2825, commit:1838d20c1db487f3e03a5cf8e0f4f3a668b20a5c)
+   * Fix: Make mod savegames work properly (ticket:2735, ticket:2825, commit:5886695119364b59f94aa81c3db8d0952dcf59b9)
+   * Fix: Prevent VTOLs from getting stuck on buildings (ticket:2534, commit:d1c93494dee2f1b929776edadc3bad1f7d364491, commit:419ae406336d006c8042e820e9cdec47ecb9d8ff)
+ * UI:
+   * Fix: Properly update player colours in the map preview (commit:c52d627b85ac038fdcc6203bc5f4499b8c4a6c2c)
+ * Multiplayer:
+   * Change: Some AI improvements from master (commit:2e13cb5420fa65554535f9c9dea7026fa992b21c, commit:07542186d48dbf0069ec503e845f4f9986438ad3)
+ * Translations:
+   * Update: Dutch (ticket:2723, commit:4545d492f2c0a47edc69e88540d3f1f389bb7154, commit:ae0143c47b959d9b10a0f16a1631d8ab2e5cd2f6)
+   * Update: Turkish (ticket:2727, ticket:2794, ticket:2831, ticket:2840, commit:09ac275217921068ef15e09fadf9be73c00f31f7, commit:bbda88a5ff8aaf7b548c1bc4e9caa7bd60bc4708, commit:a406df2af1c80256dcba47d26537a840d558679e, commit:fcec0a3062972edbeeebc6a10e90b661cab0b88a)
+   * Update: German (ticket:2729, commit:205120cc0e70bd892cc220c36ee10fb3b724c9ce)
+   * Update: Hungarian (ticket:2738, ticket:2747, ticket:2754, ticket:2782, ticket:2865, commit:03c83546afbdfa63ac25d813391394e7d82cddb9, commit:994e8f9022bdd7d6ffebe721c5c85bd4808ab90e, commit:7bb82c66d56c179e486ce3f0df2c1b097d4793ef, commit:7189dcf2a4885b09b35c749d74cf3820a3d51b23, commit:67686dd337997ba18cd0e607dc0125f4fa79f2a2)
+   * Update: Spanish (ticket:2788, commit:d721bb662cae4a91e3bcdf629393c595fa39ab89)
+   * Update: Brazilian (ticket:2786, commit:29e8872533efdcb5b3a642e9f83d7df7e1a309cf)
+   * Update: Simplified Chinese (ticket:2858, ticket:2869, commit:989e65c43e370a2298bcf5224b356db3f9747a35, commit:64067a5b668584067151db44d8e15f68961b3625, commit:81da3ed3071330985efe96538b4f0bd068ec32f6)
+   * Update: Danish (commit:4e6dfcf01d4521b1aa5b34150a626e2dc746887f)
+   * Update: Romanian (ticket:2906, commit:54635f94b834a1eaef210957c2b3c92fcc3b459a, commit:22a632936d46283aa96996c558547bbec5f6dde8)
+
+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)
@@ -14,7 +39,7 @@
    * 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):
+ * Multiplayer balance (ticket:2687, commit:71eac1c4a332be3af4ab8c9bc4cafd65dabe7f13):
    * HP increased:
      * Leopard 85 → 107
      * Panther 145 → 193

Makefile.am

@@ -14,6 +14,7 @@ EXTRA_DIST= \
 	autorevision.conf \
 	config.rpath \
 	configure.ac \
+	pkg/dpkg \
 	macosx
 
 # get rid of SVN stuff in the tarball

configure.ac

@@ -19,10 +19,14 @@ AC_CANONICAL_HOST
 
 # Checks for programs.
 AC_PROG_CC_STDC
+AC_CHECK_PROG(CCOMPILER, ${CC}, ccompiler)
+test -z "${CCOMPILER}" && AC_MSG_ERROR(No C compiler found!)
 AC_PROG_RANLIB
 
 # We need a C++ compiler for build_tools/autorevision
 AC_PROG_CXX
+AC_CHECK_PROG(CXXCOMPILER, ${CXX}, cxxcompiler)
+test -z "${CXXCOMPILER}" && AC_MSG_ERROR(No C++ compiler found!)
 
 AC_PROG_YACC
 if test "x$YACC" != "xbison -y" ; then
@@ -45,7 +49,6 @@ test -z "${UNZIP}" && AC_MSG_ERROR(Unzip not found!)
 # --filesync was added in zip 3.0, older versions need -u
 ZIP_UPDATE="-u"
 zip -q --filesync filesynctest.zip $srcdir/ChangeLog 2> /dev/null && export ZIP_UPDATE="--filesync"
-echo $srcdir
 rm -f filesynctest.zip
 AC_SUBST([ZIP_UPDATE], [${ZIP_UPDATE}])
 
@@ -524,7 +527,7 @@ AS_IF([test -z "$PERL"],[
 
 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,
+	AC_MSG_WARN([a2x (asciidoc) 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.])
 ])
 

data/Makefile.am

@@ -16,12 +16,14 @@ BASELIST = \
 	effects \
 	features \
 	gamedesc.lev \
+	novideo.ogg \
 	images \
 	messages \
 	misc \
 	multiplay \
 	script \
 	sequenceaudio \
+	sequences \
 	stats \
 	structs \
 	tagdefinitions \