Merge branch 'master' of /var/cache/git/xonotic/xonotic

diff --git a/all b/all
index f69738a26ef7ab18a96fbd94df9ed2affba29c52..b451ac7d26f29254f61b9fddf260ce1511fe592b 100755 (executable)
--- a/all
+++ b/all
@@ -1788,7 +1788,7 @@ case "$cmd" in
                verbose "$SELF" update-maps
                ;;
        release-qc)
-               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+               verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
                verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
                ;;
        release-buildpk3-transform-raw)

diff --git a/misc/tools/rsync-updater/update-xonotic.bat b/misc/tools/rsync-updater/update-xonotic.bat
index db76dd522bcda263f02ae83a876cd7391b159d53..fb3972a53c8425c0729029b1b10d7b252fba55fe 100644 (file)
--- a/misc/tools/rsync-updater/update-xonotic.bat
+++ b/misc/tools/rsync-updater/update-xonotic.bat
@@ -75,6 +75,7 @@ set excludes=%excludes% --exclude=/fteqcc/fteqcc.osx
 \r
 if "%ProgramFiles(x86)%" == "" goto bit32\r
 :bit64\r
+       if not "%XONOTIC_INCLUDE_32BIT%" == "" goto endbit\r
        set excludes=%excludes% --exclude=/xonotic.exe\r
        set excludes=%excludes% --exclude=/xonotic-sdl.exe\r
        set excludes=%excludes% --exclude=/xonotic-dedicated.exe\r

diff --git a/misc/tools/rsync-updater/update-xonotic.sh b/misc/tools/rsync-updater/update-xonotic.sh
index 095e2a6fd350d9e8f256ecbf14660bfc9d292c3d..d34c7e34842a28f9e100109cb701b88e5c9c6121 100755 (executable)
--- a/misc/tools/rsync-updater/update-xonotic.sh
+++ b/misc/tools/rsync-updater/update-xonotic.sh
@@ -62,8 +62,10 @@ case `uname`:`uname -m` in
                excludes="$excludes --exclude=/Xonotic*.app"
                excludes="$excludes --exclude=/xonotic-osx-*"
                excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
-               excludes="$excludes --exclude=/xonotic-linux32-*"
-               excludes="$excludes --exclude=/fteqcc/fteqcc.linux32"
+               if [ -z "$XONOTIC_INCLUDE_32BIT" ]; then
+                       excludes="$excludes --exclude=/xonotic-linux32-*"
+                       excludes="$excludes --exclude=/fteqcc/fteqcc.linux32"
+               fi
                ;;
        Linux:i?86)
                excludes="$excludes --exclude=/Xonotic*.app"

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 9bf255fb44f0c1c7268774f87389cb6f786447ad..667ef7a1fd195e2e5f9daafb935bb48ed9bfe951 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -134,6 +134,16 @@ while(@ARGV)
        {
                $options->{order} = [split /\s*,\s*/, shift @ARGV];
        }
+       elsif($_ eq '-sRGB')
+       {
+               push @{$options->{bsp}}, "-sRGBtex", "-sRGBcolor";
+               push @{$options->{light}}, "-sRGBtex", "-sRGBcolor", "-sRGBlight";
+       }
+       elsif($_ eq '-nosRGB')
+       {
+               push @{$options->{bsp}}, "-nosRGBtex", "-nosRGBcolor";
+               push @{$options->{light}}, "-nosRGBtex", "-nosRGBcolor", "-nosRGBlight";
+       }
        elsif($_ =~ /^--no(-.*)/)
        {
                if($curmode eq 'maps')

diff --git a/server/server.cfg b/server/server.cfg
index 4c574d8708473f893b923c1f8ab8bdf53e12ce86..8ea3838517dcff4ed8be10cef6527e9d257d2c1a 100644 (file)
--- a/server/server.cfg
+++ b/server/server.cfg
@@ -166,6 +166,8 @@ sv_weaponstats_file http://www.xonotic.org/weaponbalance/
 //g_ban_sync_uri "http://94.23.21.40/~xonotic/bans/" // sync bans using this ban list provider (disabled by default, uncomment this line to enable)
 //g_ban_sync_trusted_servers "" // accept bans that were initially set on the server IPs listed here (if not set, your bans are just sent to the sync URIs, but no bans are retrieved from there)
 
+//g_spawnshieldtime 1  // time for which players are protected after spawn
+
 
 /////////////////////////////////////////////////////////////////////
 // "Obvious" mutators that are allowed on a "pure" server