Merge branch 'master' into divVerent/crypto2

diff --combined all
index 657db2680d08cde1ef5fe2c1c1672ce3c35644d4,2d40e1290031a09809a32ad0b09ff4596f27ac5f..8f34fdc99587fa1856166432035884ca2f85a54c
--- 1/all
--- 2/all
+++ b/all
@@@ -119,7 -119,6 +119,7 @@@ darkplaces                    
  fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
  div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
  netradiant                    |                                                   | master      |
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable
  
@@@ -443,21 -442,18 +443,21 @@@ case "$cmd" i
                fi
                case "$1" in
                        -c)
 +                              cleand0=true
                                cleandp=true
                                cleanqcc=true
                                cleanqc=true
                                shift
                                ;;
                        -n)
 +                              cleand0=false
                                cleandp=false
                                cleanqcc=false
                                cleanqc=false
                                shift
                                ;;
                        *)
 +                              cleand0=false
                                cleandp=false
                                cleanqcc=false
                                cleanqc=true # version info
@@@ -512,16 -508,6 +512,16 @@@
                        fi
                fi
  
 +              enter "$d0/d0_blind_id" verbose
 +              if ! [ -f Makefile ]; then
 +                      verbose sh autogen.sh
 +                      verbose ./configure
 +              fi
 +              if $cleand0; then
 +                      verbose make $MAKEFLAGS clean
 +              fi
 +              verbose make $MAKEFLAGS
 +
                enter "$d0/fteqcc" verbose
                if $cleanqcc; then
                        verbose make $MAKEFLAGS clean
@@@ -553,13 -539,12 +553,13 @@@
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
 -                      export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$PATH"
 +                      export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
                elif [ x"`uname`" = x"Darwin" ]; then
 -                      export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
 +                      export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs"
                        export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                        client=-sdl
                else
 +                      export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"
                        client=-sdl
                fi
                case "$1" in
@@@ -819,22 -804,16 +819,16 @@@
                ;;
  
        # release building goes here
-       release-mkdir)
-               mkdir -p Xonotic/"$1"
-               ;;
        release-prepare)
- #"$SELF" each git clean -fxd
+               #"$SELF" each git clean -fxd
+               rm -rf Xonotic
                mkdir -p Xonotic
-               "$SELF" release-copy Docs/
-               "$SELF" release-copy misc/
-               "$SELF" release-copy server/
-               "$SELF" release-copy xonotic-linux-glx.sh
-               "$SELF" release-copy xonotic-linux-sdl.sh
-               "$SELF" release-mkdir data
-               "$SELF" release-mkdir fteqcc
-               ;;
-       release-copy)
-               rsync --exclude=.git -vaSHPAX "$1" Xonotic/"$1"
+               git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh | {
+                       cd Xonotic
+                       mkdir data fteqcc
+                       tar xvf -
+                       rm -rf misc/builddeps misc/buildfiles
+               }
                ;;
        release-compile-run)
                host=$1
@@@ -914,7 -893,7 +908,7 @@@
                # version numnber and stuff like that
                ;;
        release-qc)
-               verbose make -C Xonotic/data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
+               verbose make -C data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
                ;;
        release-buildpk3-transform-raw)
                dir=$1
@@@ -956,7 -935,19 +950,19 @@@
                                ;;
                esac
                rm -rf Xonotic/temp
-               rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp"
+               mkdir -p Xonotic/temp
+               {
+                       cd "$src"
+                       git archive --format=tar HEAD
+               } | {
+                       cd Xonotic/temp
+                       tar xvf -
+               }
+               if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
+                       cp "$src"/progs.dat Xonotic/temp/
+                       cp "$src"/csprogs.dat Xonotic/temp/
+                       cp "$src"/menu.dat Xonotic/temp/
+               fi
                "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
                cd Xonotic/temp
                zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
@@@ -981,11 -972,11 +987,11 @@@
                ;;
        release)
                "$SELF" release-prepare
+               "$SELF" release-engine
                "$SELF" release-maps
                "$SELF" release-finish
                "$SELF" release-qc
                "$SELF" release-pack
-               "$SELF" release-engine
                ;;
        *)
                echo "Usage:"