Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

diff --git a/misc/infrastructure/keygen/response.d0ir b/misc/infrastructure/keygen/response.d0ir
index fe65eb8bc4e973d865b3dc40bd707d6238285493..3439f7f072523fb06ea629a857a3927d662f41d0 100755 (executable)
--- a/misc/infrastructure/keygen/response.d0ir
+++ b/misc/infrastructure/keygen/response.d0ir
@@ -162,7 +162,7 @@ if((my $key = $cgi->param('key')))
                        or die "cannot start crypto-keygen-standalone";
                my $err = <$errfh>;
                close $errfh
-                       or die "xonotic-keygen failed: $err";
+                       or die "crypto-keygen-standalone failed: $err";
                1;
        }
        or do
@@ -190,15 +190,15 @@ Content-type: text/html
        <form action="response.d0ir" method="post" enctype="multipart/form-data">
        To generate and sign a key IN GAME, follow these steps on the console:
        <ol>
-               <li>crypto_keygen $default_ca http://rm.endoftheinternet.org/~xonotic/keygen/?ca=$default_ca&amp;key=</li>
+               <li>crypto_keygen $default_ca http://xonotic.org/ca/?ca=$default_ca&amp;key=</li>
        </ol>
        To generate and sign a key MANUALLY, follow these steps on a UNIX command line:
        <ol>
-               <li>./xonotic-keygen -p key_$default_ca.d0pk -o key_$default_ca.d0si</li>
-               <li>./xonotic-keygen -p key_$default_ca.d0pk -I key_$default_ca.d0si -o request.d0iq -O camouflage.d0ic
+               <li>./crypto-keygen-standalone -p key_$default_ca.d0pk -o key_$default_ca.d0si</li>
+               <li>./crypto-keygen-standalone -p key_$default_ca.d0pk -I key_$default_ca.d0si -o request.d0iq -O camouflage.d0ic
                <li>Upload the request.d0iq file: <input type="file" name="key"><input type="submit"></li>
                <li>Save the response.d0ir file you are getting</li>
-               <li>./xonotic-keygen -p key_$default_ca.d0pk -I key_$default_ca.d0si -c camouflage.d0ic -J response.d0ir -o key_$default_ca.d0si</li>
+               <li>./crypto-keygen-standalone -p key_$default_ca.d0pk -I key_$default_ca.d0si -c camouflage.d0ic -J response.d0ir -o key_$default_ca.d0si</li>
                <li>Delete request.d0iq, camouflage.d0ic, response.d0ir</li>
        </ol>
        Your key_$default_ca.d0si key is now signed.

diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index 93d5c49404b45a1a52d5c72ac071062a63618cd6..efacb863c21a4c11568bc90b96b8fbe172c33470 100755 (executable)
--- a/misc/tools/compress-texture
+++ b/misc/tools/compress-texture
@@ -16,6 +16,17 @@ f=
 fourcchack=
 case "$tool" in
        compressonator-dxtc)
+               # we still have to preprocess the image to premultiply alpha, as it seems
+               case "$format" in
+                       dxt2)
+                               fourcchack=DXT2
+                               format=dxt2
+                               ;;
+                       dxt4)
+                               fourcchack=DXT4
+                               format=dxt4
+                               ;;
+               esac
                ;;
        *)
                case "$format" in