Merge remote-tracking branch 'origin/Mario/respawn_delays'
authorSamual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 04:36:52 +0000 (23:36 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 04:36:52 +0000 (23:36 -0500)
commit3b2bc1bdee04f4c454279bf14ac8ed6b37c6ddb5
tree72b77398b215d85fdff78d7e49dbc75e9cc9a9cf
parent04ab0ff7c3c5fcfe9780eadccfd5abd03d25b181
parent7b8cf8f401e34912a9ce0e77f2e924cba896a683
Merge remote-tracking branch 'origin/Mario/respawn_delays'

# By Mario
# Via Mario
* origin/Mario/respawn_delays:
  Fix some issues brought up in the tracker
  Only use g_respawn_delay_max if it's higher than normal respawn delay
  Add a new option for forced respawn: g_respawn_delay_max. Forces players to spawn after this many seconds or optionally respawn after normal delay
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh