Merge branch 'master' into mirceakitsune/damage_effects

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
index e8d303ff6d6ff9d042eb90041299d51eb66a3b11,8facbf500ff9a8e2b28567b7b96bd85c88c85ebf..f2f5ac86dc24b8ab339691071925d43d766c7193
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -197,7 -197,7 +197,11 @@@ void CSQC_Init(void
        hud_configure_prev = -1;
        tab_panel = -1;
  
++
 +      precache_model("models/null.md3");
++
+       draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin")));
++
  }
  
  // CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc)

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/server/g_damage.qc
Simple merge

diff --cc qcsrc/server/w_minstanex.qc
Simple merge

diff --cc qcsrc/server/w_nex.qc
Simple merge