From: Mario <mario.mario@y7mail.com>
Date: Mon, 23 Dec 2013 08:33:01 +0000 (+1100)
Subject: Merge branch 'master' into terencehill/music_player
X-Git-Tag: xonotic-v0.8.1~157^2~6
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=387861a0bee1121b0869bfaf8cff5b703ffc1ad2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/music_player
---

387861a0bee1121b0869bfaf8cff5b703ffc1ad2
diff --cc defaultXonotic.cfg
index 580705ecc,dd16de9bc..4d25b2464
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1060,12 -1063,10 +1063,12 @@@ makesaved vid_gl1
  makesaved vid_gl20
  makesaved v_idlescale
  makesaved v_kicktime
 +makesaved music_playlist_list0
 +makesaved music_playlist_random0
  
  // ticrate
- //sys_ticrate 0.0166667
- sys_ticrate 0.0333333
+ //sys_ticrate 0.0166667 // 60fps. This would be ideal, but kills home routers.
+ sys_ticrate 0.0333333 // Use 30fps instead.
  cl_netfps 60 // should match or be a multiple
  sv_gameplayfix_delayprojectiles 0
  sv_gameplayfix_q2airaccelerate 1