Merge branch 'master' into divVerent/crypto2

diff --git a/all b/all
index 74b4f3d4c2898c7d511bd56e4aab0e33ebd40882..162d060a98a836c860bb45304e6c33873051e82c 100755 (executable)
--- a/all
+++ b/all
@@ -1042,13 +1042,13 @@ case "$cmd" in
                ;;
        release-engine-win32)
                verbose "$SELF" release-compile win32 \
-                       'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I$HOME/dp.win32/include -L$HOME/dp.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
+                       'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-g++ -g -Wl,--dynamicbase -Wl,--nxcompat -I$HOME/dp.win32/include -L$HOME/dp.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=1' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
                        release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
                ;;
        release-engine-win64)
                verbose "$SELF" release-compile win64 \
-                       'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
+                       'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-g++ -g -Wl,--dynamicbase -Wl,--nxcompat -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=1' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \
                        'sv-release cl-release' 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
                        # release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'

diff --git a/data/font-dejavu.pk3dir/font-dejavu.cfg b/data/font-dejavu.pk3dir/font-dejavu.cfg
index 4b3200f21d4cfe300e14f7363c40f36efdbe341a..ba9b4147cf34a807a5ef1e402fa20c7a9179ebc6 100644 (file)
--- a/data/font-dejavu.pk3dir/font-dejavu.cfg
+++ b/data/font-dejavu.pk3dir/font-dejavu.cfg
@@ -8,6 +8,6 @@ loadfont chat fonts/DejaVuSans-Bold,gfx/vera-sans $con_chatsize
 loadfont centerprint fonts/DejaVuSansMono,gfx/conchars 9
 loadfont infobar fonts/DejaVuSansMono,gfx/conchars 8
 loadfont user0 fonts/DejaVuSans-Bold,gfx/vera-sans 9.6 12 12.8 16
-loadfont user1 fonts/DejaVuSans-Bold,gfx/vera-sans 8 10 14 $sbar_fontsize $scr_centersize // csqc font
+loadfont user1 fonts/DejaVuSans-Bold,gfx/vera-sans 8 10 14 $hud_fontsize $scr_centersize // csqc font
 loadfont user2 fonts/DejaVuSans-Bold,gfx/vera-sans 16 24 32 // csqc bigfont
-sbar_columns_set
+scoreboard_columns_set

diff --git a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
index fbf2d9896f03fc761a692dd3fccbf1727149e44e..4afab42f1296bab6d02029c86d70215b3e616d8f 100644 (file)
--- a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
+++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
@@ -3,12 +3,12 @@ utf8_enable 1
 r_font_hinting 1 // sorry, setting 2 (full autohinting) totally fails for unifont for now
 r_font_disable_freetype 0
 r_font_size_snapping 2
-loadfont console fonts/unifont-5.1.20080907,gfx/conchars $con_textsize
-loadfont notify fonts/n019004l.pfb,gfx/conchars $con_notifysize
-loadfont chat fonts/n019004l.pfb,gfx/conchars $con_chatsize
-loadfont centerprint fonts/unifont-5.1.20080907,gfx/conchars 9
-loadfont infobar gfx/conchars 8
-loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/conchars 9.6 12 12.8 16
-loadfont user1 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/conchars 4 5 6 7 8 9 10 12 $sbar_fontsize $scr_centersize // csqc font
-loadfont user2 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/conchars 10 12 14 16 20 24 28 32 // csqc bigfont
-sbar_columns_set
+loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize
+loadfont notify fonts/n019004l.pfb,gfx/vera-sans $con_notifysize
+loadfont chat fonts/n019004l.pfb,gfx/vera-sans $con_chatsize
+loadfont centerprint fonts/unifont-5.1.20080907,gfx/vera-sans 9
+loadfont infobar gfx/vera-sans 8
+loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 9.6 12 12.8 16
+loadfont user1 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 4 5 6 7 8 9 10 12 $sbar_fontsize $scr_centersize // csqc font
+loadfont user2 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 10 12 14 16 20 24 28 32 // csqc bigfont
+scoreboard_columns_set

diff --git a/misc/buildfiles/win64/zlib1.dll b/misc/buildfiles/win64/zlib1.dll
index dd9a376d49d323e4aa3b0e993e85b0bc532d5d6d..4194c0d1825b96b30ccef1a4d59d00c7a5f8e888 100644 (file)
Binary files a/misc/buildfiles/win64/zlib1.dll and b/misc/buildfiles/win64/zlib1.dll differ

diff --git a/server/rcon2irc/rcon2irc.pl b/server/rcon2irc/rcon2irc.pl
index c1c2a4efb5c16d649fe972f0e29f87c80ae53b0f..b5d3c89e859405277dbfec3c27d9d60cf4e6e3b4 100755 (executable)
--- a/server/rcon2irc/rcon2irc.pl
+++ b/server/rcon2irc/rcon2irc.pl
@@ -1321,12 +1321,20 @@ sub cond($)
                return irc_joinstage(0);
        } ],
        
-       # Catch joins of people in a channel the bot is in and catch our own joins of a channel
+       # Catch joins of people in a channel the bot is in and catch our own joins of a channel,
+       # detect channel join message and note hostname length to get the maximum allowed line length
        [ irc => q{:(([^! ]*)![^ ]*) JOIN (#.+)} => sub {
                my ($hostmask, $nick, $chan) = @_;
+
+               if ($nick eq $store{irc_nick}) {
+                       $store{irc_maxlen} = 510 - length($hostmask);
+                       $store{irc_joined_channel} = 1;
+                       print "* detected maximum line length for channel messages: $store{irc_maxlen}\n";
+               }
+
                return 0 unless ($store{irc_quakenet_users});
                
-               if ($nick eq $config{irc_nick}) {
+               if ($nick eq $store{irc_nick}) {
                        out irc => 0, "PRIVMSG Q :users $chan"; # get auths for all users
                } else {
                        $store{quakenet_hosts}->{$nick} = $hostmask;
@@ -1395,14 +1403,6 @@ sub cond($)
                return 0;
        } ],
 
-       # detect channel join message and note hostname length to get the maximum allowed line length
-       [ irc => q{(:(?i:(??{$store{irc_nick}}))![^ ]* )(?i:JOIN) :(?i:(??{$config{irc_channel}}))} => sub {
-               $store{irc_maxlen} = 510 - length($1);
-               $store{irc_joined_channel} = 1;
-               print "* detected maximum line length for channel messages: $store{irc_maxlen}\n";
-               return 0;
-       } ],
-
        # chat: Xonotic server -> IRC channel
        [ dp => q{\001(.*?)\^7: (.*)} => sub {
                my ($nick, $message) = map { color_dp2irc $_ } @_;
@@ -1727,7 +1727,7 @@ schedule sub {
        my ($timer) = @_;
 
        # log on to IRC when needed
-       if(exists $store{dp_hostname} && !exists $store{irc_logged_in})
+       if(exists $store{dp_hostname} && !exists $store{irc_seen_welcome})
        {
                $store{irc_nick_requested} = $config{irc_nick};
                out irc => 1, "NICK $config{irc_nick}", "USER $config{irc_user} localhost localhost :$store{dp_hostname}";