Merge branch 'original' (except gldebug, msaa)

This commit is contained in:
mittorn
2018-04-19 20:47:41 +00:00
25 changed files with 246 additions and 560 deletions

View File

@@ -764,8 +764,8 @@ void CL_CharEvent( int key )
if( cls.key_dest == key_console && !Con_Visible( ))
{
if((char)key == ',' || (char)key == '?' )
return; // don't pass ',' when we open the console
if((char)key == '`' || (char)key == '?' )
return; // don't pass '`' when we open the console
}
// distribute the key down event to the apropriate handler