Merge branch 'master' into Mario/qc_physics_prehax

Conflicts:
	qcsrc/server/autocvars.qh
	qcsrc/server/g_triggers.qc
	qcsrc/server/g_triggers.qh
	qcsrc/server/miscfunctions.qc
	qcsrc/server/mutators/mutator_dodging.qc
	qcsrc/server/t_plats.qc
	qcsrc/server/target_music.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

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

diff --cc qcsrc/common/weapons/w_porto.qc
Simple merge

diff --cc qcsrc/common/weapons/weapons.qc
Simple merge

diff --cc qcsrc/server/autocvars.qh
index 17595123f62314fc3a21816f038f0ca8d024d6fc,f84eb008b2a7aef5f6ba26a84d6c9218fca563ed..58ce4f3c0b1deb9dc7b414705068735512ac5b23
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -618,34 -618,33 +618,34 @@@ float autocvar_sv_dodging_height_thresh
  float autocvar_sv_dodging_horiz_speed;
  float autocvar_sv_dodging_horiz_speed_frozen;
  float autocvar_sv_dodging_ramp_time;
- float autocvar_sv_dodging_sound;
+ bool autocvar_sv_dodging_sound;
  float autocvar_sv_dodging_up_speed;
  float autocvar_sv_dodging_wall_distance_threshold;
- float autocvar_sv_dodging_wall_dodging;
- float autocvar_sv_dodging_frozen;
- float autocvar_sv_dodging_frozen_doubletap;
- float autocvar_sv_doublejump;
- float autocvar_sv_eventlog;
- float autocvar_sv_eventlog_console;
- float autocvar_sv_eventlog_files;
- float autocvar_sv_eventlog_files_counter;
+ bool autocvar_sv_dodging_wall_dodging;
+ bool autocvar_sv_dodging_frozen;
+ bool autocvar_sv_dodging_frozen_doubletap;
+ bool autocvar_sv_doublejump;
+ bool autocvar_sv_eventlog;
+ bool autocvar_sv_eventlog_console;
+ bool autocvar_sv_eventlog_files;
+ int autocvar_sv_eventlog_files_counter;
  string autocvar_sv_eventlog_files_nameprefix;
  string autocvar_sv_eventlog_files_namesuffix;
- float autocvar_sv_eventlog_files_timestamps;
+ bool autocvar_sv_eventlog_files_timestamps;
  float autocvar_sv_friction;
  float autocvar_sv_friction_on_land;
 +var float autocvar_sv_friction_slick = 0.5;
  float autocvar_sv_gameplayfix_q2airaccelerate;
- float autocvar_sv_gentle;
+ int autocvar_sv_gentle;
  #define autocvar_sv_gravity cvar("sv_gravity")
  string autocvar_sv_intermission_cdtrack;
 -string autocvar_sv_jumpspeedcap_max;
 +float autocvar_sv_jumpspeedcap_max;
  float autocvar_sv_jumpspeedcap_max_disable_on_ramps;
 -string autocvar_sv_jumpspeedcap_min;
 +float autocvar_sv_jumpspeedcap_min;
  float autocvar_sv_jumpvelocity;
- float autocvar_sv_logscores_bots;
- float autocvar_sv_logscores_console;
- float autocvar_sv_logscores_file;
+ bool autocvar_sv_logscores_bots;
+ bool autocvar_sv_logscores_console;
+ bool autocvar_sv_logscores_file;
  string autocvar_sv_logscores_filename;
  float autocvar_sv_mapchange_delay;
  float autocvar_sv_maxairspeed;
@@@ -717,23 -716,22 +717,23 @@@ float autocvar_timelimit_decrement
  float autocvar_timelimit_min;
  float autocvar_timelimit_max;
  float autocvar_timelimit_overtime;
- float autocvar_timelimit_overtimes;
+ int autocvar_timelimit_overtimes;
  float autocvar_timelimit_suddendeath;
  #define autocvar_utf8_enable cvar("utf8_enable")
- float autocvar_waypoint_benchmark;
+ bool autocvar_waypoint_benchmark;
 -bool autocvar_sv_gameplayfix_gravityunaffectedbyticrate;
 +float autocvar_sv_gameplayfix_gravityunaffectedbyticrate;
 +bool autocvar_sv_gameplayfix_upwardvelocityclearsongroundflag;
  float autocvar_g_trueaim_minrange;
- float autocvar_g_debug_defaultsounds;
+ bool autocvar_g_debug_defaultsounds;
  float autocvar_g_grab_range;
- float autocvar_g_sandbox_info;
- float autocvar_g_sandbox_readonly;
+ int autocvar_g_sandbox_info;
+ bool autocvar_g_sandbox_readonly;
  string autocvar_g_sandbox_storage_name;
  float autocvar_g_sandbox_storage_autosave;
- float autocvar_g_sandbox_storage_autoload;
+ bool autocvar_g_sandbox_storage_autoload;
  float autocvar_g_sandbox_editor_flood;
- float autocvar_g_sandbox_editor_maxobjects;
- float autocvar_g_sandbox_editor_free;
+ int autocvar_g_sandbox_editor_maxobjects;
+ int autocvar_g_sandbox_editor_free;
  float autocvar_g_sandbox_editor_distance_spawn;
  float autocvar_g_sandbox_editor_distance_edit;
  float autocvar_g_sandbox_object_scale_min;

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

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

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

diff --cc qcsrc/server/g_damage.qc
index 14f74d00e511808c217b780cdc1f43bc398045aa,788eb345fa3d81702103714db1e6295747301097..24e1e534f906259f14f841d001523d3eee91257e
--- 1/qcsrc/server/g_damage.qc
--- 2/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@@ -25,10 -25,9 +25,10 @@@
      #include "g_hook.qh"
      #include "scores.qh"
      #include "spawnpoints.qh"
 +      #include "../common/movetypes/movetypes.qh"
  #endif
  
- float Damage_DamageInfo_SendEntity(entity to, float sf)
+ float Damage_DamageInfo_SendEntity(entity to, int sf)
  {
        WriteByte(MSG_ENTITY, ENT_CLIENT_DAMAGEINFO);
        WriteShort(MSG_ENTITY, self.projectiledeathtype);

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

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

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

diff --cc qcsrc/server/miscfunctions.qc
index 2ce05407baaf3b9249b4b4c5d79a79f70bbc2cb5,7660b7e03dae09a975b737c23ae48372640205d5..63435ab998615ca556477b84c794ebab24e9ccfd
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -810,10 -822,10 +810,10 @@@ void soundtoat(float _dest, entity e, v
      entno = num_for_edict(e);
      idx = precache_sound_index(samp);
  
-     float sflags;
+     int sflags;
      sflags = 0;
  
 -    _atten = floor(_atten * 64);
 +    attenu = floor(attenu * 64);
      vol = floor(vol * 255);
  
      if (vol != 255)
@@@ -1262,7 -1274,8 +1262,7 @@@ void SetCustomizer(entity e, float(void
      e.uncustomizeentityforclient_set = !!uncustomizer;
  }
  
- void Net_LinkEntity(entity e, float docull, float dt, float(entity, float) sendfunc)
 -
+ void Net_LinkEntity(entity e, float docull, float dt, bool(entity, int) sendfunc)
  {
      vector mi, ma;
  

diff --cc qcsrc/server/mutators/gamemode_ctf.qc
index a582594b02532976d051c91274c8b09afb640c6a,0cbcf714c906f956c979c47257a496634ebf894e..c8aa595bced3351e1bbd2f8ca17a532c5aff2e8d
--- 1/qcsrc/server/mutators/gamemode_ctf.qc
--- 2/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@@ -641,9 -643,8 +641,9 @@@ void ctf_CheckStalemate(void
        }
  }
  
- void ctf_FlagDamage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+ void ctf_FlagDamage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
  {
 +      self.move_velocity = self.velocity;
        if(ITEM_DAMAGE_NEEDKILL(deathtype))
        {
                // automatically kill the flag and return it

diff --cc qcsrc/server/mutators/gamemode_keyhunt.qc
Simple merge

diff --cc qcsrc/server/mutators/gamemode_onslaught.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator_dodging.qc
index e55894964877de8c2aa2d20b78fe6274891a48ec,58d24a4d820c526376026c84bfa1c774e1506545..130a864089c6369172e3e6e1af562b48558a8c0f
--- 1/qcsrc/server/mutators/mutator_dodging.qc
--- 2/qcsrc/server/mutators/mutator_dodging.qc
+++ b/qcsrc/server/mutators/mutator_dodging.qc
@@@ -243,14 -89,14 +243,14 @@@ void PM_dodging(
        }
  
        // the up part of the dodge is a single shot action
 -      if (self.dodging_single_action == 1) {
 -              self.flags &= ~FL_ONGROUND;
 +      if (self.dodging_single_action == 1)
 +      {
 +              UNSET_ONGROUND(self);
  
 -              self.velocity =
 -                        self.velocity
 -                      + (autocvar_sv_dodging_up_speed * v_up);
 +              self.velocity += PHYS_DODGING_UP_SPEED * v_up;
  
-               if (autocvar_sv_dodging_sound == 1)
 +#ifdef SVQC
+               if (autocvar_sv_dodging_sound)
                        PlayerSound(playersound_jump, CH_PLAYER, VOICETYPE_PLAYERSOUND);
  
                animdecide_setaction(self, ANIMACTION_JUMP, true);

diff --cc qcsrc/server/mutators/mutator_nades.qc
Simple merge

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

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

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

diff --cc qcsrc/server/tturrets/system/system_main.qc
Simple merge

diff --cc qcsrc/server/tturrets/system/system_misc.qc
Simple merge

diff --cc qcsrc/server/vehicles/racer.qc
Simple merge

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

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