]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/ca_arena_mutators
authorterencehill <piuntn@gmail.com>
Tue, 12 Feb 2013 14:29:25 +0000 (15:29 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 12 Feb 2013 14:29:25 +0000 (15:29 +0100)
1  2 
qcsrc/client/autocvars.qh
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
index 53719e075f9099273be8a139820681786c3194ff,e8972ca8e4c75c317bbfceea7495d2e80451abaa..7a75446e2f0c48382b0fdf774d050e19acfa87fc
@@@ -1264,13 -1260,9 +1260,9 @@@ void readlevelcvars(void
      if(!g_weapon_stay)
          g_weapon_stay = cvar("g_weapon_stay");
  
 -      if not(inWarmupStage && !g_ca)
 +      if not(inWarmupStage)
                game_starttime = cvar("g_start_delay");
  
-       sv_pitch_min = cvar("sv_pitch_min");
-       sv_pitch_max = cvar("sv_pitch_max");
-       sv_pitch_fixyaw = cvar("sv_pitch_fixyaw");
        readplayerstartcvars();
  }