ChangeLog

@@ -1,3 +1,45 @@
+2012-02-21: Version 3.1-beta4
+ * General:
+   * Change: New keyboard shortcuts for unit selection:
+     * Ctrl+C: All cyborgs
+     * Shift+C: All cyborgs with weapons
+     * Shift+E: All cyborg engineers
+     * Shift+G: All ground based attack units including hovers
+     * Shift+M: All cyborg mechanics
+     * Shift+P: All transporters
+     * Shift+R: All tanks with repair turrets
+     * Shift+S: All sensor units
+     * Shift+T: All trucks
+   * Fix: Prevent features with low health from becoming indestructible (ticket:3134, commit:2fc761a304091080a91c5c3660c7b8e0196ffe2a)
+   * Fix: Correctly use unit speed modifiers (ticket:3140, commit:5a3925391ea12cda73a6feab687eeec646292091)
+   * Fix: Don't fire Lassat too many times when clicking fast (ticket:3163, commit:ea8d833e5c3e9dcd46f9ac799643ec0f513dadbe)
+   * Fix: Clear tile after destroying a feature (ticket:3155, commit:db74b52388325c511cbcf8c0f420693bb16890f1)
+   * Fix: Correctly check for needed OpenGL versions and extensions (commit:a7d2c06c280c867fea61173d25c25d69012db489)
+ * UI:
+   * Change: Add a 'Need more resources' indicator in the power bar when needed (commit:845d423cb28cfb1818d92719e759a40a61f27d9f)
+   * Fix: Show correct speed bars when designing VTOLs (ticket:3143, commit:2e0393130739d963b205f18ae55cfddb9a96e9e4)
+   * Fix: Play sound when getting attacked (ticket:3102, commit:001ef35faf1b1207db0e45ed18fbf072356372f6)
+   * Fix: Increase component limit in unit design GUI (ticket:3160, commit:60fb815bf3890724ec9479bd41445dd18a3e1725)
+   * Fix: Adapt minimap size to game resolution (ticket:2694, commit:bccb89cf37e5a91074ef43e6e6621e00d13c9fbc)
+ * Multiplayer:
+   * Change: Allow configuring preferred player colour (commit:cefd4179f7704e6207e4edc22e33c51363764cb6)
+   * Change: Make the Super Transport faster, lower armour, updated model (commit:78dd89477c44dc57b6ae88d244fa4e49d9a2a953)
+   * Change: Add in-game kick by right+left clicking over the player's channel icon (commit:9a005ac66ea5a3abc18a1fec004e22c187438b9d)
+   * Fix: Allow kicking players in non-alliance mode again (ticket:3121, commit:9a005ac66ea5a3abc18a1fec004e22c187438b9d)
+   * Fix: Make sure we run Nexus AI on the correct players when some players use javascript-based AIs (ticket:3137, commit:9d616939ecbf289d97baf7be7a2ec86b7e03d31c)
+   * Fix: Allow private messages to players 8 and 9 (ticket:3141, commit:e581b840d6ca3e5f0e22bcf3272b8589a68dc962)
+   * Fix: Update hosting screen for ten players, move Limits and Start Hosting buttons (ticket:3157, commit:ac3b802a44a8e99131198a1e11fd3cfeb355ea88)
+ * Campaign:
+   * Fix: Enable minimap and unit design in away missions when an HQ exists in the remote base (ticket:3182, commit:391ffb621e4d43d67d0cb61c5aa6c28a5375c81a)
+ * Mods:
+   * Change: Remove old-1.10-balance mod, since it was broken (commit:5694a6fded95e7128c6b8222f6895ba200b75432)
+ * Translations:
+   * Update: Russian (ticket:3184, commit:b7541ac45b9babe0dd0e0b0ffeb3cbd6b9477a2e, commit:519b83fbd3cd086b1c29f4215a2cbbd46114f534)
+   * Update: Turkish (ticket:3192, commit:2c9886131b24c488bd70d36a2b81437def0002c5)
+
+2012-02-20: Version 3.1-beta3
+ * Unpublished
+
 2012-02-08: Version 3.1-beta2
  * General:
    * Fix: Show unit designs in factories after loading a game (ticket:3094, commit:6f7e523bc18d9c508c104c3917712400b1c53b4f)
@@ -270,7 +312,7 @@ master_20110320qt and before:
 
 2011-10-23: Version 2.3.9
  * General:
-   * Change: Show damage on all buildings (ticket:2634, commit: eabe72073c5e594f7849cd53460b25ae95b3371e)
+   * 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)
@@ -810,7 +852,7 @@ master_20110320qt and before:
    * Fix: Remove all fog of war darkening when satellite uplink built (r9216)
    * Fix: Faster game loading when vsync enabled (r9167, r9163)
    * Fix: Widget ID corruption leading to disappearing reticule and other GUI bugs (r9325)
-   * Fix: Miscellaneous crashes and asserts (r9153, ticket:1219, r9192, r9152, ticket: 1402, r9248, r9181, r9174)
+   * Fix: Miscellaneous crashes and asserts (r9153, ticket:1219, r9192, r9152, ticket:1402, r9248, r9181, r9174)
  * Graphics:
    * Change: Darken features and buildings that you cannot see due to fog of war (r9322, r9343)
    * Fix: Only lift fog of war for what you can see (r9199, r9204, r9216)

Makefile.am

@@ -51,11 +51,27 @@ EXTRA_DIST= \
 dist-hook:
 	rm -rf `find $(distdir) -type d -name .svn`
 
-javascript-doc:
+javascript-doc-base:
 	grep $(top_srcdir)/src/qtscript.cpp -e '//==' | sed 's/\/\/==//' > doc/globals.tex
 	grep $(top_srcdir)/src/qtscript.cpp -e '//__' | sed 's/\/\/__//' > doc/events.tex
 	grep $(top_srcdir)/src/qtscript.cpp -e '//--' | sed 's/\/\/--//' > doc/functions.tex
 	grep $(top_srcdir)/src/qtscriptfuncs.cpp -e '//--' | sed 's/\/\/--//' >> doc/functions.tex
 	grep $(top_srcdir)/src/qtscriptfuncs.cpp -e '//;;' | sed 's/\/\/;;//' > doc/objects.tex
-	cp $(top_srcdir)/doc/javascript.tex doc/
+	test $(abs_top_srcdir) = $(abs_top_builddir) || cp $(top_srcdir)/doc/javascript.tex doc/
+
+javascript-doc: javascript-doc-base
+if PDFLATEX
 	(cd doc ; pdflatex javascript.tex)
+else
+	echo "You need pdflatex installed!"
+endif
+
+javascript-doc-html: javascript-doc-base
+if HEVEA
+	(cd doc; hevea javascript.tex; hevea javascript.tex)
+if HACHA
+	(cd doc; hacha -o javascript-index.html javascript.html)
+endif
+else
+	echo "You need hevea installed!"
+endif

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[3.1git],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[3.1_beta4],[http://wz2100.net/],[warzone2100])
 
 AM_INIT_AUTOMAKE([1.10 tar-ustar])
 
@@ -59,6 +59,13 @@ AC_CHECK_PROG(WKHTMLTOPDF, wkhtmltopdf, wkhtmltopdf)
 AM_CONDITIONAL([A2X_AVAILABLE], test -n "$A2X")
 AM_CONDITIONAL([WKHTMLTOPDF_AVAILABLE], test -n "$WKHTMLTOPDF")
 
+AC_CHECK_PROG(PDFLATEX, pdflatex, pdflatex)
+AC_CHECK_PROG(HEVEA, hevea, hevea)
+AC_CHECK_PROG(HACHA, hacha, hacha)
+AM_CONDITIONAL(PDFLATEX, test -n "$PDFLATEX")
+AM_CONDITIONAL(HEVEA, test -n "$HEVEA")
+AM_CONDITIONAL(HACHA, test -n "$HACHA")
+
 # Enable Compiler/LibC GNU extensions
 AC_GNU_SOURCE
 
@@ -255,7 +262,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}])
 
@@ -465,7 +472,6 @@ AC_CONFIG_FILES([Makefile
 		doc/Makefile
 		icons/Makefile
 		data/Makefile
-		data/mods/multiplay/Makefile
 		data/music/Makefile
 		pkg/nsis/Makefile
 		win32/Makefile

data/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = mods/multiplay music
+SUBDIRS = music
 
 stamp:
 	touch stamp

data/base/effects/fxaalsh2.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 211
 TEXTURE 0 page-21-fx.png 256 256
 LEVELS 2
 LEVEL 1
@@ -11,8 +11,7 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 207 72 207 55 210 55
 	200 3 3 1 0 207 72 210 55 210 72
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	-7 0 0
 LEVEL 2
 POINTS 4
@@ -23,6 +22,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 207 72 207 55 210 55
 	200 3 3 1 0 207 72 210 55 210 72
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	7 0 0

data/base/effects/fxaalsht.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 211
 TEXTURE 0 page-21-fx.png 256 256
 LEVELS 4
 LEVEL 1
@@ -11,8 +11,7 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 207 72 207 55 210 55
 	200 3 3 1 0 207 72 210 55 210 72
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	-5 -5 -6
 LEVEL 2
 POINTS 4
@@ -23,8 +22,7 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 207 72 207 55 210 55
 	200 3 3 1 0 207 72 210 55 210 72
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	5 -5 -6
 LEVEL 3
 POINTS 4
@@ -35,8 +33,7 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 207 72 207 55 210 55
 	200 3 3 1 0 207 72 210 55 210 72
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	-5 5 6
 LEVEL 4
 POINTS 4
@@ -47,6 +44,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 207 72 207 55 210 55
 	200 3 3 1 0 207 72 210 55 210 72
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	5 5 6

data/base/effects/fxcam20.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 211
 TEXTURE 0 page-21-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 192 69 192 54 203 54
 	200 3 3 1 0 192 69 203 54 203 69
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	0 0 0

data/base/effects/fxcammo.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 211
 TEXTURE 0 page-21-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 192 69 192 54 203 54
 	200 3 3 1 0 192 69 203 54 203 69
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	0 0 0

data/base/effects/fxgammo.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 211
 TEXTURE 0 page-18-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 74 134 1 134 1 127
 	200 3 3 1 0 74 134 1 127 74 127
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	0 0 0

data/base/effects/fxgammoh.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 211
 TEXTURE 0 page-18-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 28 137 -1 137 -1 150
 	200 3 3 1 0 28 137 -1 150 28 150
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	0 0 0

data/base/effects/fxgammom.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 211
 TEXTURE 0 page-18-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 74 134 1 134 1 127
 	200 3 3 1 0 74 134 1 127 74 127
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	0 0 0

data/base/effects/fxhplme.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 212
 TEXTURE 0 page-23-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 227 194 202 194 202 181
 	200 3 3 1 0 227 194 202 181 227 181
-CONNECTORS 2
-	1 2 0
+CONNECTORS 1
 	0 0 0

data/base/effects/fxlflsh.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 212
 TEXTURE 0 page-18-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 19 159 0 159 0 152
 	200 3 3 1 0 19 159 0 152 19 152
-CONNECTORS 2
-	1 2 0
+CONNECTORS 1
 	0 0 0

data/base/effects/fxmflare.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 222
 TEXTURE 0 page-23-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 157 253 157 226 184 226
 	200 3 3 1 0 157 253 184 226 184 253
-CONNECTORS 2
-	2 2 0
+CONNECTORS 1
 	0 0 0

data/base/effects/fxmplme.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 212
 TEXTURE 0 page-23-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 227 194 202 194 202 181
 	200 3 3 1 0 227 194 202 181 227 181
-CONNECTORS 2
-	1 2 0
+CONNECTORS 1
 	0 0 0

data/base/effects/fxplammo.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 212
 TEXTURE 0 page-18-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 59 159 40 159 40 152
 	200 3 3 1 0 59 159 40 152 59 152
-CONNECTORS 2
-	1 2 0
+CONNECTORS 1
 	0 0 0

data/base/effects/fxsplme.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 212
 TEXTURE 0 page-23-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 254 194 229 194 229 181
 	200 3 3 1 0 254 194 229 181 254 181
-CONNECTORS 2
-	1 2 0
+CONNECTORS 1
 	0 0 0

data/base/effects/fxtracer.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 211
 TEXTURE 0 page-21-fx.png 256 256
 LEVELS 1
 LEVEL 1
@@ -11,6 +11,5 @@ POINTS 4
 POLYGONS 2
 	200 3 3 2 1 203 65 203 54 206 54
 	200 3 3 1 0 203 65 206 54 206 65
-CONNECTORS 2
-	1 1 0
+CONNECTORS 1
 	0 0 0