Merge branch 'master' into mario/monsters

diff --combined commands.cfg
index f0e4f7c270dca89bb0273c16d038e2c87ef28b4f,413953df5242e03cf5fdc934e237d89860f2cb4c..fda08fc2e4f50d8f62a798e8e23ae0f1621f4723
--- 1/commands.cfg
--- 2/commands.cfg
+++ b/commands.cfg
@@@ -11,6 -11,10 +11,10 @@@ alias if_dedicated "${* asis}
  _if_dedicated alias if_client ""
  if_client alias if_dedicated ""
  
+ // for easy access by QC
+ if_dedicated set is_dedicated 1
+ if_client    set is_dedicated 0
+ 
  if_dedicated "alias" qc_cmd_sv     "sv_cmd $$*"
  if_client    "alias" qc_cmd_sv     "sv_cmd $$*"
  // if_client    "alias" qc_cmd_sv     "echo This command only works on servers: sv_cmd $${* !}"
@@@ -152,9 -156,6 +156,9 @@@ alias reportcvar           "qc_cmd_cm
  alias selectteam           "qc_cmd_cmd    selectteam           ${* ?}" // Attempt to choose a team to join into
  alias selfstuff            "qc_cmd_cmd    selfstuff            ${* ?}" // Stuffcmd a command to your own client
  alias sentcvar             "qc_cmd_cmd    sentcvar             ${* ?}" // New system for sending a client cvar to the server
 +alias editmob                    "qc_cmd_cmd    mobedit                          ${* ?}" // Edit a monster's properties
 +alias killmob                    "qc_cmd_cmd    mobkill                          ${* ?}" // Kill a monster
 +alias spawnmob                           "qc_cmd_cmd    mobspawn                         ${* ?}" // Spawn a monster infront of the player
  alias spectate             "qc_cmd_cmd    spectate             ${* ?}" // Become an observer
  alias suggestmap           "qc_cmd_cmd    suggestmap           ${* ?}" // Suggest a map to the mapvote at match end
  //alias tell               "qc_cmd_cmd    tell                 ${* ?}" // Send a message directly to a player
@@@ -173,11 -174,6 +177,11 @@@ alias spec "spectate
  
  // mutator aliases
  alias sandbox "cmd g_sandbox ${* ?}"
 +alias spawnturret "cmd turretspawn ${* ?}"
 +alias debugmonsters "cmd debugmonsters ${* ?}"
 +alias upgradeturret "cmd buffturret ${* ?}"
 +alias rmturret "cmd turretremove ${* ?}"
 +alias repairturret "cmd repairturret ${* ?}"
  
  
  // ============================================================
@@@ -189,7 -185,6 +193,7 @@@ alias allspec              "qc_cmd_s
  alias anticheat            "qc_cmd_sv     anticheat            ${* ?}" // Create an anticheat report for a client
  alias bbox                 "qc_cmd_sv     bbox                 ${* ?}" // Print detailed information about world size
  alias bot_cmd              "qc_cmd_sv     bot_cmd              ${* ?}" // Control and send commands to bots
 +alias butcher                    "qc_cmd_sv     butcher                          ${* ?}" // Remove all monsters on the map
  alias cointoss             "qc_cmd_sv     cointoss             ${* ?}" // Flip a virtual coin and give random result
  alias database             "qc_cmd_sv     database             ${* ?}" // Extra controls of the serverprogs database
  alias defer_clear          "qc_cmd_sv     defer_clear          ${* ?}" // Clear all queued defer commands for a specific client

diff --combined defaultXonotic.cfg
index 933726190d643ccf4be62c03bc178c52a4376cd1,4ea9639e5c3ccdbf81ca2f997586455bb455af4b..a7c08d1942e1c885987df266c6dd46e271dab444
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -436,12 -436,6 +436,12 @@@ seta menu_sandbox_edit_material "
  
  bind f7 menu_showsandboxtools
  
 +seta menu_monsters_spawn_monster ""
 +seta menu_monsters_edit_name ""
 +seta menu_monsters_edit_skin 0
 +seta menu_monsters_edit_color ""
 +seta menu_monsters_edit_movetarget 1
 +
  set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps"
  set g_botclip_collisions 1 "0 = disable collision testing against botclips, might be useful on some defrag maps"
  
@@@ -1444,6 -1438,8 +1444,8 @@@ r_shadow_glossintensity 
  // use fake light if map has no lightmaps
  r_fakelight 1
  
+ r_water_hideplayer 1 // hide your own feet/player model in refraction views, this way you don't see half of your body under water
+ 
  // strength sound settings
  set sv_strengthsound_antispam_time 0.1 "minimum distance of strength sounds"
  set sv_strengthsound_antispam_refire_threshold 0.04 "apply minimum distance only if refire of the gun is smaller than this"
@@@ -1556,8 -1552,6 +1558,8 @@@ exec turrets.cf
  exec vehicles.cfg
  exec crosshairs.cfg
  exec gamemodes.cfg
 +exec monsters.cfg
 +exec za.cfg
  
  // load console command aliases and settings
  exec commands.cfg