Merge branch 'master' into mirceakitsune/damage_effects

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/common/util.qc
index 9e4bdf7e74c90fcb0df4f4fcf062bfee62d691ea,09a58c0997bc9a312b3cdd12307e814200562453..1930d7c6fc4a04f2c7d33d029631f79bae308c29
--- 1/qcsrc/common/util.qc
--- 2/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@@ -2213,18 -2213,22 +2213,38 @@@ float ReadApproxPastTime(
  }
  #endif
  
 +#ifndef MENUQC
 +.float skeleton_bones_index;
 +void Skeleton_SetBones(entity e)
 +{
 +      // set skeleton_bones to the total number of bones on the model
 +      if(e.skeleton_bones_index == e.modelindex)
 +              return; // same model, nothing to update
 +
 +      float skelindex;
 +      skelindex = skel_create(e.modelindex);
 +      e.skeleton_bones = skel_get_numbones(skelindex);
 +      skel_delete(skelindex);
 +      e.skeleton_bones_index = e.modelindex;
 +}
 +#endif
++
+ string to_execute_next_frame;
+ void execute_next_frame()
+ {
+       if(to_execute_next_frame)
+       {
+               localcmd("\n", to_execute_next_frame, "\n");
+               strunzone(to_execute_next_frame);
+               to_execute_next_frame = string_null;
+       }
+ }
+ void queue_to_execute_next_frame(string s)
+ {
+       if(to_execute_next_frame)
+       {
+               s = strcat(s, "\n", to_execute_next_frame);
+               strunzone(to_execute_next_frame);
+       }
+       to_execute_next_frame = strzone(s);
+ }

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