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

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

commit 71325abca0f5371d7745b69decad9ae2e88cc716
Merge: 45a05fe 73b1c24
Author: Raz0r <mrraz...@gmail.com>
Date:   Tue Jul 18 15:02:58 2017 +1000

    Merge pull request #799 from deathsythe47/master
    
    add cl_drawRecording

 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 bf5d85b,2553d9e..ece737d
--- a/codemp/client/cl_main.cpp
+++ b/codemp/client/cl_main.cpp
@@@ -2762,27 -2758,28 +2764,29 @@@ void CL_Init( void ) 
  
        cl_lanForcePackets = Cvar_Get ("cl_lanForcePackets", "1", CVAR_ARCHIVE);
  
+       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);
 -      cl_guidServerUniq = Cvar_Get ("cl_guidServerUniq", "1", CVAR_ARCHIVE);
 +      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" );
  
        // ~ and `, as keys and characters
 -      cl_consoleKeys = Cvar_Get( "cl_consoleKeys", "~ ` 0x7e 0x60", 
CVAR_ARCHIVE);
 +      cl_consoleKeys = Cvar_Get( "cl_consoleKeys", "~ ` 0x7e 0x60 0xb2", 
CVAR_ARCHIVE, "Which keys are used to toggle the console");
 +      cl_consoleUseScanCode = Cvar_Get( "cl_consoleUseScanCode", "1", 
CVAR_ARCHIVE, "Use native console key detection" );
  
        // userinfo
 -      Cvar_Get ("name", "Padawan", CVAR_USERINFO | CVAR_ARCHIVE );
 -      Cvar_Get ("rate", "25000", CVAR_USERINFO | CVAR_ARCHIVE );
 -      Cvar_Get ("snaps", "40", CVAR_USERINFO | CVAR_ARCHIVE );
 -      Cvar_Get ("model", DEFAULT_MODEL"/default", CVAR_USERINFO | 
CVAR_ARCHIVE );
 -      Cvar_Get ("forcepowers", "7-1-032330000000001333", CVAR_USERINFO | 
CVAR_ARCHIVE );
 +      Cvar_Get ("name", "Padawan", CVAR_USERINFO | CVAR_ARCHIVE, "Player 
name" );
 +      Cvar_Get ("rate", "25000", CVAR_USERINFO | CVAR_ARCHIVE, "Data rate" );
 +      Cvar_Get ("snaps", "40", CVAR_USERINFO | CVAR_ARCHIVE, "Client 
snapshots per second" );
 +      Cvar_Get ("model", DEFAULT_MODEL"/default", CVAR_USERINFO | 
CVAR_ARCHIVE, "Player model" );
 +      Cvar_Get ("forcepowers", "7-1-032330000000001333", CVAR_USERINFO | 
CVAR_ARCHIVE, "Player forcepowers" );
  //    Cvar_Get ("g_redTeam", DEFAULT_REDTEAM_NAME, CVAR_SERVERINFO | 
CVAR_ARCHIVE);
  //    Cvar_Get ("g_blueTeam", DEFAULT_BLUETEAM_NAME, CVAR_SERVERINFO | 
CVAR_ARCHIVE);
 -      Cvar_Get ("color1",  "4", CVAR_USERINFO | CVAR_ARCHIVE );
 -      Cvar_Get ("color2", "4", CVAR_USERINFO | CVAR_ARCHIVE );
 -      Cvar_Get ("handicap", "100", CVAR_USERINFO | CVAR_ARCHIVE );
 -      Cvar_Get ("sex", "male", CVAR_USERINFO | CVAR_ARCHIVE );
 -      Cvar_Get ("password", "", CVAR_USERINFO);
 +      Cvar_Get ("color1",  "4", CVAR_USERINFO | CVAR_ARCHIVE, "Player saber1 
color" );
 +      Cvar_Get ("color2", "4", CVAR_USERINFO | CVAR_ARCHIVE, "Player saber2 
color" );
 +      Cvar_Get ("handicap", "100", CVAR_USERINFO | CVAR_ARCHIVE, "Player 
handicap" );
 +      Cvar_Get ("sex", "male", CVAR_USERINFO | CVAR_ARCHIVE, "Player sex" );
 +      Cvar_Get ("password", "", CVAR_USERINFO, "Password to join server" );
        Cvar_Get ("cg_predictItems", "1", CVAR_USERINFO | CVAR_ARCHIVE );
  
        //default sabers

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

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to