Merge branch 'master' into Mario/monsters

diff --combined defaultXonotic.cfg
index 27558826273719777d492ea379ab903739128cdc,2af290f9abd445b5170f7af1c3ed86859b6d1a9a..16a2542f6ff27dbdc841cd64d099cee70624fb48
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -442,14 -442,6 +442,14 @@@ seta menu_sandbox_edit_material "
  
  bind f7 menu_showsandboxtools
  
 +seta menu_monsters_edit_spawn ""
 +seta menu_monsters_edit_name ""
 +seta menu_monsters_edit_skin 0
 +seta menu_monsters_edit_color ""
 +seta menu_monsters_edit_movetarget 1
 +
 +seta menu_td_edit_spawn ""
 +
  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"
  
@@@ -1361,6 -1353,9 +1361,9 @@@ set r_showbboxes 
  // we REALLY need the end pos nudging DP bug workaround for trace-to-end-of-solid to work
  collision_endposnudge 1
  
+ // FIXME remove this when the engine feature FINALLY MAYBE works
+ r_glsl_skeletal 0
+ 
  // animation tuning
  set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire
  set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff)
@@@ -1569,8 -1564,6 +1572,8 @@@ exec vehicles.cf
  exec crosshairs.cfg
  exec gamemodes.cfg
  exec notifications.cfg
 +exec monsters.cfg
 +exec za.cfg
  
  // load console command aliases and settings
  exec commands.cfg