Merge remote branch 'origin/master' into samual/keepaway

diff --combined defaultXonotic.cfg
index fe5ea537199422521a33f7003e2a1ce0d6aa4874,8ae553921f5dac6a1c1ffb2dc66b7c6fdd663712..0bfa32f777e95e32d51fb3184fd0560455369ba7
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -353,7 -353,7 +353,7 @@@ seta sv_precacheitems 
  set sv_spectator_speed_multiplier 1.5
  seta sv_spectate 1 "if set to 1, new clients are allowed to spectate or observe the game, if set to 0 joining clients spawn as players immediately (no spectating)"
  seta sv_defaultcharacter 0 "master switch, if set to 1 the further configuration for replacing all player models, skins and colors is taken from the sv_defaultplayermodel, sv_defaultplayerskin and sv_defaultplayercolors variables"
- seta sv_defaultplayermodel "models/player/nexus.zym" "default model selection, only works if sv_defaultcharacter is set to 1"
+ seta sv_defaultplayermodel "models/player/erebus.iqm" "default model selection, only works if sv_defaultcharacter is set to 1"
  seta sv_defaultplayerskin 0 "each model has 1 or more skins (combination of model and skin = character), set which skin of the model you wish the default character to have, only works if sv_defaultcharacter is set to 1"
  seta sv_defaultplayermodel_red ""     "\"\" means see sv_defaultplayermodel"
  seta sv_defaultplayerskin_red 0
@@@ -604,8 -604,6 +604,8 @@@ set g_cts_respawn_waves 
  set g_cts_respawn_delay 0.25
  set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
  set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible"
 +set g_keepaway_respawn_delay 0
 +set g_keepaway_respawn_waves 0
  
  // overtime
  seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"
@@@ -1124,13 -1122,13 +1124,13 @@@ alias singleplayer_continue "set scmenu
  alias singleplayer_levellist "set scmenu_campaign_dump 1; togglemenu; wait; togglemenu"
  
  // Green's fullbright skins
- alias cl_fbskin_green "playermodel models/player/nexus.zym; playerskin 6; color 3 3"
- alias cl_fbskin_red "playermodel models/player/nexus.zym; playerskin 6; color 4 4"
- alias cl_fbskin_orange "playermodel models/player/nexus.zym; playerskin 6; color 14 14"
- alias cl_fbskin_off "playermodel models/player/nexus.zym; playerskin 0"
- alias sv_fbskin_green "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/nexus.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 51"
- alias sv_fbskin_red "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/nexus.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 68"
- alias sv_fbskin_orange "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/nexus.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 238"
+ alias cl_fbskin_green "playermodel models/player/erebus.iqm; playerskin 1; color 3 3"
+ alias cl_fbskin_red "playermodel models/player/erebus.iqm; playerskin 1; color 4 4"
+ alias cl_fbskin_orange "playermodel models/player/erebus.iqm; playerskin 1; color 14 14"
+ alias cl_fbskin_off "playermodel models/player/erebus.iqm; playerskin 0"
+ alias sv_fbskin_green "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
+ alias sv_fbskin_red "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
+ alias sv_fbskin_orange "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
  alias sv_fbskin_off "g_fullbrightplayers 0; sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\""
  
  seta sv_servermodelsonly 1
@@@ -1246,14 -1244,6 +1246,14 @@@ set g_balance_keyhunt_damageforcescale 
  seta g_keyhunt_teams_override 0
  set g_keyhunt_teams 0
  
 +// keepaway
 +set g_keepaway 0 "Keepaway: w00t"
 +set g_keepawayball_respawntime 5
 +set g_keepawayball_damageforcescale 1
 +set g_keepawayball_trail_color "0.2 0.4 1"
 +seta g_keepaway_teams_override 0
 +set g_keepaway_teams 0
 +
  // so it can be stuffcmd-ed still
  set cl_gravity 800    "but ignored anyway"