Merge branch 'master' into Mario/monsters

diff --cc qcsrc/common/csqcmodel_settings.qh
index 8e794cc76a39612198e1a32c09020dbc5d4cd03a,cfe012275cdeb6105f4009c6e76d79baf46beae4..3f6dea7d11f2c8f2032f727059a5d3c9235c9a33
--- 1/qcsrc/common/csqcmodel_settings.qh
--- 2/qcsrc/common/csqcmodel_settings.qh
+++ b/qcsrc/common/csqcmodel_settings.qh
@@@ -47,11 -47,8 +47,11 @@@
                CSQCMODEL_ENDIF \
                CSQCMODEL_PROPERTY(512, float, ReadChar, WriteChar, anim_upper_action) \
                CSQCMODEL_PROPERTY(512, float, ReadApproxPastTime, WriteApproxPastTime, anim_upper_time) \
-               CSQCMODEL_PROPERTY(1024, float, ReadAngle, WriteAngle, v_angle_x) \
        CSQCMODEL_ENDIF \
 +      CSQCMODEL_IF(!isplayer) \
 +              CSQCMODEL_PROPERTY(2048, float, ReadByte, WriteByte, monsterid) \
 +      CSQCMODEL_ENDIF \
+       CSQCMODEL_PROPERTY(1024, float, ReadAngle, WriteAngle, v_angle_x) \
        CSQCMODEL_PROPERTY_SCALED(4096, float, ReadByte, WriteByte, scale, 16, 0, 255)
  // TODO get rid of colormod/glowmod here, find good solution for nex charge glowmod hack; also get rid of some useless properties on non-players that only exist for CopyBody
  

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