ChangeLog

@@ -1,3 +1,81 @@
+master_20110705
+ * General:
+   * Change: More script porting
+   * Change: Add fullscreen resolution switching support and trap cursor for Windows and Linux (commit:10a78a4a7ee3d4e3c22dc0f0f67575603a8397bf, commit:5893d2998e315a3717708df808b72f31e0f4a0e0, commit:2137dfaf1d9aef4c7679268170a757493061beaa, commit:3d5c00fe4aafe5bd9685b4fafb794027cd7ac5c9)
+   * Fix: Correctly load droid targets (ticket:2737, commit:10f674077dda2ff38188c31d00dd35f1b0e8885e)
+   * Fix: Load droid rotation (commit:dbea296778027f219c31f584f7bdbcb6a738a6d0)
+   * Fix: Put autosaves into the correct directory (ticket:2730, commit:7c6261c37c64619c2371530e7a786d4f47b90816)
+   * Fix: Don't crash when clicking on radar blips (ticket:2731, commit:10249e509519958cad4411fa2bd40385a824c35b)
+   * Fix: Correctly end the game on win/loss (ticket:2766, commit:7842a7d981c67b2d6cb32d5a989bc8adbe317c42)
+ * AIs:
+   * Semperfi: Fix attacks of opportunity with allies; do not try to hug an allied oil derrick, believing it to be hostile; do not crash if we check whether an oil feature is allied to us (commit:5066a04949a34866c955760364478dc2cec4bc6f)
+   * Dydo AI: Remove it, since it doesn't work properly and might have caused crashes (commit:d82ce97a770bf90ad41d7d14c2b6e9b420c58358)
+ * Graphics:
+   * Change: Add support for normal maps (commit:8aca9437a4c425bb0c02c9ab30e8aa31265bceea)
+ * UI:
+   * Fix: Show correct flag colors (commit:5fa3d50f0ccce83700b4fe6c2dea733ead822848)
+   * Fix: Don't get confused in the game setup screen when pressing escape (ticket:2697, commit:7bf5a23cdd19311890dfc0c92647b2d03e3b9188)
+ * Translations:
+   * Update: Hungarian (ticket:2738, ticket:2747, ticket:2754, ticket:2782, commit:50764d1beecc5605b09fccb843c0eb2b3f695616, commit:dd60a26657e3898ae44a30c2bf918f4d5f2c8033, commit:7e55df069b28ded87b465eabed7991aab2957697, commit:c3fc0e01cb07542464ba4ca5b588dd093632624b)
+   * Update: Dutch (ticket:2761, commit:3df67f1f223a65849c132bc46c7f33a916c1598b)
+   * Update: Brazilian (ticket:2786, commit:1c1bc823ccf3cfa5476448c3003ab01ecab84098)
+   * Update: Turkish (ticket:2794, commit:2242dac95fb1e9ff8c516e35bbe89944280fd807)
+
+master_20110519
+ * General:
+   * Change: Based on Qt now
+   * Change: Started porting game scripts to Javascript (QtScript)
+   * Change: Started porting savegames to ini files, saved in "savegames" (not "savegame" like before)
+   * New: Two new 2 player maps - Vision and Roughness (commit:9bf8e6b91724ccd9ecc5ef20a40ecc4afa7ca1a7, commit:7fc26087cde4420898d8d896b7b8fd2b538f39fd)
+   * Change: Limited map-mod support (ticket:2610, commit:2083b1f4b7469aae9d09aa4f50120f1ef3142191, commit:a3cff8758beba8adef804d3620e747fefb54e038, commit:b893e4dec544d402bdb9e31bb93a1f3b5593bd6e)
+   * Change: Double the open speed of gates (commit:18e13e2918cbfed27e68e164849aaefc6cc4c853)
+   * Fix: Make UPnP work again (ticket:2631, commit:89063105fa5ffe51fa6317ed0fead9a3f050f5bd)
+   * Fix: Make fullscreen work, using the primary screen only (commit:a0ed219ad70608ae6e7a4d45ed5de032625416ac, commit:b808220f9b9338605ac1765640d5ce5a0ff5f6b9)
+   * Fix: Make units follow their orders better (ticket:2391, commit:54a1771b647fc0c6c5c271e4127d407be2442ffe)
+   * Fix: Make localized sounds in sequences.wz work in all cases (ticket:2728, commit:1c57015f228ff069a6013c7d69fc294e72229b47)
+ * Graphics:
+   * Change: Allow video resolutions up to 1024x1024 (ticket:2682, commit:36a2fe771ce52b364fcd20171d0476b9e115e000)
+   * Change: Add an option to show videos with black or 50% dimmed scanlines (ticket:2095, commit:f934b1bfc36a8e6de0ef3da4dddbdb4b5bc04bf8)
+   * Change: Show power generator effects for all players (commit:049165197b779a24b378e54dfb8a4fe89783a708)
+   * Fix: Make units not flicker (commit:de3be04ac59a194fd88b1611805c2c908ae8be6f)
+ * Multiplayer balance (ticket:2687, commit:d2d87a65fd29a0a4e7cb9fe6fd85e08cd89b7018):
+   * 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 (ticket:2560, commit:59b6c670deb82fe3eb5ac978f005e88a42cc2361)
+ * Translations:
+   * New: Hungarian (commit:8bc7aa208c9daeb4b382aa1e48bb78dbfe849a98, commit:846cf99978839963c3c298a0b07fccb492211601)
+   * New: Catalan (ticket:2616, commit:38088f37bc525bd94e20c6986adf3304c5a72d44)
+   * Update: German (ticket:2681, ticket:2502, ticket:2729, commit:2d0230cbecbe93e6b567a844c4aad50912158ef1, commit:99c47f42715006dd45e79fe8655a85076946839d, commit:4071ab708eb5956a1b59d1029fa123ff40089553)
+   * Update: Spanish (ticket:2690, commit:961cd68ee47f36917ed332ea58e724ef359f88b2)
+   * Update: Dutch (ticket:2720, ticket:2723, commit:f1a56c232ab6eda2d1b8a05338333074fb2cb802, commit:fd1e836cb03313aec98f3dcb5f3a7eccc5f17879, commit:c70c92b9dcb77b15f7ec122385389c26d65001db)
+   * Update: Turkish (ticket:2727, commit:444f2d6e24408033c602c0633a83825fd6c2eb01)
+
+master_20110320qt and before:
+ * Stuff. Lots of stuff.
+
 0000-00-00: SVN
  * General:
    * Fix: Tells user if mod entered on the command line / shorcut is enabled, or is invalid. Output is to stdout or stderr (r7586)

Makefile.am

@@ -1,5 +1,6 @@
 SUBDIRS = \
 	  win32 \
+	  3rdparty/miniupnpc \
 	  lib/framework \
 	  lib/exceptionhandler \
 	  lib/script \
@@ -9,6 +10,7 @@ SUBDIRS = \
 	  lib/sound \
 	  lib/netplay \
 	  lib/widget \
+	  lib/qtgame \
 	  src \
 	  data \
 	  po \

autorevision.conf

@@ -1 +1 @@
-wc_uri=master
+wc_uri=master_20110705

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[master],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[master_20110705],[http://wz2100.net/],[warzone2100])
 
 AM_INIT_AUTOMAKE([1.10 tar-ustar])
 
@@ -19,10 +19,13 @@ 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 +48,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}])
 
@@ -126,6 +128,16 @@ esac
 AM_CONDITIONAL([MINGW32], test "x$host_os_mingw32" = "xyes")
 
 
+# Check for X11 (for qtgame)
+if test "x$host_os_mingw32" != "xyes" ; then
+	X_LIBS=""
+	AC_PATH_X
+	if test x$no_x != "xyes"; then
+		X_LIBS="-lX11 -lXrandr ${X_LIBS}"
+	fi
+	AC_SUBST(X_LIBS)
+fi
+
 # Set compilers to use when building for the build system in a cross compile build
 # Fallback to the system compilers
 AC_ARG_VAR([CXX_FOR_BUILD], [C++ compiler that produces binaries that will run
@@ -226,7 +238,7 @@ AS_IF([test "x$enable_sound" != "xyes"],[
 # Add later for stricter checking: -Wextra -Wmissing-declarations -Wstrict-prototypes
 AC_ARG_ENABLE([debug],
 	AS_HELP_STRING([--enable-debug[=yes/relaxed/profile/debugprofile/optimised/no]],[Compile debug version [[yes]]]),
-	[ enable_debug=${enableval} ], [ enable_debug=yes ])
+	[ enable_debug=${enableval} ], [ enable_debug=no ])
 AC_MSG_CHECKING([whether to compile in debug mode])
 AC_MSG_RESULT([${enable_debug}])
 
@@ -396,6 +408,9 @@ WZ_CPPFLAGS="${WZ_CPPFLAGS} -DWZ_DATADIR=\"\\\"\${datadir}/\${PACKAGE}\\\"\""
 WZ_CPPFLAGS="${WZ_CPPFLAGS} -DLOCALEDIR=\"\\\"\${localedir}\\\"\""
 WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)"
 
+# 3rdparty libs
+WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty"
+
 
 AC_SUBST([WZ_CPPFLAGS], [${WZ_CPPFLAGS}])
 AC_SUBST([WZ_CFLAGS], [${WZ_CFLAGS}])
@@ -414,16 +429,17 @@ AC_CONFIG_FILES([Makefile
 		pkg/nsis/Makefile
 		win32/Makefile
 		tests/Makefile
+		3rdparty/miniupnpc/Makefile
 		lib/framework/Makefile
 		lib/exceptionhandler/Makefile
 		lib/gamelib/Makefile
 		lib/ivis_opengl/Makefile
 		lib/netplay/Makefile
-		lib/netplay/miniupnpc/Makefile
 		lib/script/Makefile
 		lib/sequence/Makefile
 		lib/sound/Makefile
 		lib/widget/Makefile
+		lib/qtgame/Makefile
 		src/Makefile])
 AC_OUTPUT
 

data/base/multiplay/maps/2c-Roughness/droid.ini

@@ -0,0 +1,28 @@
+
+[droid_1412]
+id = 1412
+position = 3392, 1216, 177
+rotation = 0, 0, 0
+startpos = 0
+template = ConstructionDroid
+
+[droid_1411]
+id = 1411
+position = 3776, 1984, 179
+rotation = 0, 0, 0
+startpos = 0
+template = ConstructionDroid
+
+[droid_1413]
+id = 1413
+position = 8768, 10944, 177
+rotation = 0, 0, 0
+startpos = 1
+template = ConstructionDroid
+
+[droid_1414]
+id = 1414
+position = 8384, 10176, 179
+rotation = 0, 0, 0
+startpos = 1
+template = ConstructionDroid