Merge branch 'master' into divVerent/crypto2

Conflicts:
	all

all

@@ -670,6 +670,8 @@ case "$cmd" in
 			fi
 		fi
 		set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic -mygames "$@"
+		# change this to:
+		#set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@"
 
 		# if pulseaudio is running: USE IT
 		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
@@ -1010,7 +1012,21 @@ case "$cmd" in
 			esac
 			# now rebrand the binaries...
 			for f in $targetfiles; do
-				verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+				#verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+				case "$f" in
+					xonotic*.exe)
+						verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$f"
+						(
+							d=`mktemp -d -t rebrand.XXXXXX`
+							cd "$d"
+							echo "-mygames" > darkplaces.opt
+							zip -9r darkplaces.zip darkplaces.opt
+							cat darkplaces.zip
+							cd "$d0"
+							rm -rf "$d"
+						) >> "$f"
+						;;
+				esac
 			done
 		fi
 		;;
@@ -1220,16 +1236,19 @@ case "$cmd" in
 		;;
 	release-zip)
 		stamp=`cat Xonotic/stamp.txt`
-		verbose zip -9yr Xonotic-$stamp-common.zip \
+		verbose zip -9yr Xonotic-$stamp-engine.zip \
 			Xonotic/*.dll \
+			Xonotic/bin64/*.dll \
+			Xonotic/*.app \
+			Xonotic/xonotic-* \
+			Xonotic/xonotic.exe
+		verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
+		verbose zip -9yr Xonotic-$stamp-common.zip \
 			Xonotic/source/*/ \
 			Xonotic/Docs \
 			Xonotic/misc \
 			Xonotic/fteqcc \
 			Xonotic/server \
-			Xonotic/*.app \
-			Xonotic/xonotic-* \
-			Xonotic/xonotic.exe \
 			Xonotic/key_0.d0pk \
 			Xonotic/data/font-nimbussansl-$stamp.pk3
 		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip

misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl

@@ -3,5 +3,4 @@
 export DYLD_LIBRARY_PATH="${0%/*}"
 	# same dir as the executable
 
-exec "$0"-bin "$@" -notexturenonpoweroftwo +"gl_lockarrays 0"
-
+exec "$0"-bin "$@" -notexturenonpoweroftwo

misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-agl

@@ -3,4 +3,4 @@
 export DYLD_LIBRARY_PATH="${0%/*}"
 	# same dir as the executable
 
-exec "$0"-bin "$@" -notexturenonpoweroftwo +"gl_lockarrays 0"
+exec "$0"-bin "$@" -notexturenonpoweroftwo

misc/tools/change-icon-of-exe.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+d=`pwd`
+t=`mktemp -d -t change-icon-of-exe.XXXXXX`
+cp "$1" "$t/darkplaces-icon.ico"
+cp "$2" "$t/darkplaces.exe"
+cat >"$t/darkplaces.rc" <<EOF
+#include <windows.h> // include for version info constants
+
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "darkplaces-icon.ico"
+
+1 VERSIONINFO
+FILEVERSION 1,0,0,0
+PRODUCTVERSION 1,0,0,0
+FILETYPE VFT_APP
+{
+  BLOCK "StringFileInfo"
+	 {
+		 BLOCK "040904E4"
+		 {
+			 VALUE "CompanyName", "Forest Hale Digital Services"
+			 VALUE "FileVersion", "1.0"
+			 VALUE "FileDescription", "DarkPlaces Game Engine"
+			 VALUE "InternalName", "darkplaces.exe"
+			 VALUE "LegalCopyright", "id Software, Forest Hale, and contributors"
+			 VALUE "LegalTrademarks", ""
+			 VALUE "OriginalFilename", "darkplaces.exe"
+			 VALUE "ProductName", "DarkPlaces"
+			 VALUE "ProductVersion", "1.0"
+		 }
+	 }
+}
+EOF
+cd "$t"
+wine "c:/Program Files/ResEdit/ResEdit.exe" -convert darkplaces.rc darkplaces.exe
+cd "$d"
+mv "$t/darkplaces.exe" "$EXECUTABLE"
+rm -rf "$t"

misc/tools/xonotic.brand

@@ -1,4 +1,4 @@
-flags="-nexuiz"
+flags="-nexuiz -mygames"
 name=Xonotic
 dirname1=data
 dirname2=