Merge branch 'master' into divVerent/csqcmodel

Conflicts:
	qcsrc/common/constants.qh

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/common/constants.qh
index 38cf75946ca530ef27ea63ea091faf14469919fa,7e5e99edbf9a5a2c64476c7e526c305a70284c6f..55834f1a6d36bd5f84f20475a908f737c8a6a0a4
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -576,28 -575,8 +576,34 @@@ float HUD_MENU_ENABLE            = 0
  #define SERVERFLAG_TEAMPLAY 2
  #define SERVERFLAG_PLAYERSTATS 4
  
 +var vector autocvar_sv_player_maxs = '16 16 45';
 +var vector autocvar_sv_player_mins = '-16 -16 -24';
 +var vector autocvar_sv_player_viewoffset = '0 0 20';
 +var vector autocvar_sv_player_crouch_maxs = '16 16 25';
 +var vector autocvar_sv_player_crouch_mins = '-16 -16 -24';
 +var vector autocvar_sv_player_crouch_viewoffset = '0 0 20';
 +noref var vector autocvar_sv_player_headsize = '24 24 12';
 +
 +#define PL_VIEW_OFS autocvar_sv_player_viewoffset
 +#define PL_MIN autocvar_sv_player_mins
 +#define PL_MAX autocvar_sv_player_maxs
 +#define PL_CROUCH_VIEW_OFS autocvar_sv_player_crouch_viewoffset
 +#define PL_CROUCH_MIN autocvar_sv_player_crouch_mins
 +#define PL_CROUCH_MAX autocvar_sv_player_crouch_maxs
 +#define PL_HEAD autocvar_sv_player_headsize
 +
 +// helpers
 +#define PL_VIEW_OFS_z autocvar_sv_player_viewoffset_z
 +#define PL_MIN_z autocvar_sv_player_mins_z
 +#define PL_MAX_z autocvar_sv_player_maxs_z
 +#define PL_CROUCH_VIEW_OFS_z autocvar_sv_player_crouch_viewoffset_z
 +#define PL_CROUCH_MIN_z autocvar_sv_player_mins_z
 +#define PL_HEAD_x autocvar_sv_player_headsize_x
 +#define PL_HEAD_y autocvar_sv_player_headsize_y
 +#define PL_HEAD_z autocvar_sv_player_headsize_z
++
+ // spawnpoint prios
+ #define SPAWN_PRIO_NEAR_TEAMMATE_FOUND    200
+ #define SPAWN_PRIO_NEAR_TEAMMATE_SAMETEAM 100
+ #define SPAWN_PRIO_RACE_PREVIOUS_SPAWN     50
+ #define SPAWN_PRIO_GOOD_DISTANCE           10

diff --cc qcsrc/server/autocvars.qh
Simple merge

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

diff --cc qcsrc/server/defs.qh
Simple merge

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

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

diff --cc qcsrc/server/progs.src
Simple merge