[openjk] 02/14: Merge remote-tracking branch 'origin/master'

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit dac8819e51c00b048db00f88fef5d8b3555623fa
Merge: 89cebbc 71325ab
Author: Ensiform <ensiform at gmail.com>
Date:   Sun Jul 30 15:09:44 2017 -0500

    Merge remote-tracking branch 'origin/master'

 codemp/client/cl_main.cpp | 4 ++++
 codemp/client/cl_scrn.cpp | 4 +++-
 codemp/client/client.h    | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --cc codemp/client/cl_main.cpp
index 7d316a7,ece737d..7d60b23
--- a/codemp/client/cl_main.cpp
+++ b/codemp/client/cl_main.cpp
@@@ -2758,13 -2760,15 +2760,15 @@@ void CL_Init( void ) 
  
  	cl_motdString = Cvar_Get( "cl_motdString", "", CVAR_ROM );
  
 -	Cvar_Get( "cl_maxPing", "800", CVAR_ARCHIVE, "Max. ping for servers when searching the serverlist" );
 +	Cvar_Get( "cl_maxPing", "800", CVAR_ARCHIVE_ND, "Max. ping for servers when searching the serverlist" );
  
 -	cl_lanForcePackets = Cvar_Get ("cl_lanForcePackets", "1", CVAR_ARCHIVE);
 +	cl_lanForcePackets = Cvar_Get ("cl_lanForcePackets", "1", CVAR_ARCHIVE_ND);
  
+ 	cl_drawRecording = Cvar_Get("cl_drawRecording", "1", CVAR_ARCHIVE);
+ 
  	// enable the ja_guid player identifier in userinfo by default in OpenJK
 -	cl_enableGuid = Cvar_Get("cl_enableGuid", "1", CVAR_ARCHIVE, "Enable GUID userinfo identifier" );
 -	cl_guidServerUniq = Cvar_Get ("cl_guidServerUniq", "1", CVAR_ARCHIVE, "Use a unique guid value per server" );
 +	cl_enableGuid = Cvar_Get("cl_enableGuid", "1", CVAR_ARCHIVE_ND, "Enable GUID userinfo identifier" );
 +	cl_guidServerUniq = Cvar_Get ("cl_guidServerUniq", "1", CVAR_ARCHIVE_ND, "Use a unique guid value per server" );
  
  	// ~ and `, as keys and characters
  	cl_consoleKeys = Cvar_Get( "cl_consoleKeys", "~ ` 0x7e 0x60 0xb2", CVAR_ARCHIVE, "Which keys are used to toggle the console");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git