Merge branch 'master' into terencehill/music_player
authorMario <mario.mario@y7mail.com>
Mon, 23 Dec 2013 08:33:01 +0000 (19:33 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 23 Dec 2013 08:33:01 +0000 (19:33 +1100)
1  2 
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