Merge branch 'master' into divVerent/speedlimit
authorRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 21:24:15 +0000 (23:24 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 21:24:15 +0000 (23:24 +0200)
1  2 
qcsrc/server/cl_physics.qc
qcsrc/server/sv_main.qc

Simple merge
@@@ -198,9 -198,9 +198,10 @@@ void StartFrame (void
        sv_warsowbunny_topspeed = cvar("sv_warsowbunny_topspeed");
        sv_warsowbunny_turnaccel = cvar("sv_warsowbunny_turnaccel");
        sv_warsowbunny_backtosideratio = cvar("sv_warsowbunny_backtosideratio");
 +      sv_speedlimit = cvar("sv_speedlimit");
        teamplay = cvar ("teamplay");
        sys_frametime = cvar("sys_ticrate") * cvar("slowmo");
+       sv_doublejump = cvar("sv_doublejump");
  
        if (timeoutStatus == 1) // just before the timeout (when timeoutStatus will be 2)
                orig_slowmo = cvar("slowmo"); // slowmo will be restored after the timeout