Merge branch 'pending-release' into LegendaryGuard/rename_weapon_filenames

diff --cc models/weapons/h_ok_nex.iqm
index abc34f40649f1c0fa5714bc18d7d1c84d6fa4c1a,0000000000000000000000000000000000000000..d4dce98eed7aeb5468a694f1aeb21486289973c4
mode 100644,000000..100644
Binary files differ

diff --cc models/weapons/h_ok_rpc.iqm
index 2870b04d89522c008fdf770fa78157f9c03ba3b6,0000000000000000000000000000000000000000..89acc47622b34b004ba86e4805ee24030a50fdb2
mode 100644,000000..100644
Binary files differ

diff --cc models/weapons/h_ok_rpc.iqm.framegroups
index fae30c94d638986eb92afeb08f2306e4261e10e5,0000000000000000000000000000000000000000..1a93d58d86014c79ea30f1d373d55ba33d749028
mode 100644,000000..100644
--- 1/models/weapons/h_ok_rpc.iqm.framegroups
--- /dev/null
+++ b/models/weapons/h_ok_rpc.iqm.framegroups
@@@ -1,10 -1,0 +1,9 @@@
- Generated framegroups file for h_uzi
 +/*
- 1 61 30 0 // h_uzi mgafire
- 62 61 30 0 // h_uzi mgafire
- 123 101 3 1 // h_uzi mgaidle
- 224 61 30 0 // h_uzi mgafire
- 285 61 30 0 // h_uzi mgafire
++Generated framegroups file for h_ok_rl
 +Used by DarkPlaces to simulate frame groups in DPM models.
 +*/
 +
++1 61 30 0 // h_ok_rl fire
++62 61 30 0 // h_ok_rl fire
++123 101 3 1 // h_ok_rl idle
++224 61 30 0 // h_ok_rl fire

diff --cc models/weapons/v_devastator.md3
index 534e616aca9d58c9b9ad090550e9c4fe47b50132,0000000000000000000000000000000000000000..a243610583b01bd80335257ecf7672118a3b20c1
mode 100644,000000..100644
Binary files differ

diff --cc models/weapons/v_vortex.md3
index 4cafdd10ffe3bd9acb4e910b119ba4a17e7418f8,0000000000000000000000000000000000000000..bb67413fe6e56aa35ba78a5c5d24c9f6441d10f8
mode 100644,000000..100644
Binary files differ

diff --cc qcsrc/common/mutators/mutator/overkill/okhmg.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/oknex.qc
index ded9d70a3706ad70c6494bd360f876a2eac4ae94,a30a2bf52136b162cf8384e7ceec8c1a7d0cf14d..d1569b9a47f13159bf1117cc59e34fdef592f8ae
--- 1/qcsrc/common/mutators/mutator/overkill/oknex.qc
--- 2/qcsrc/common/mutators/mutator/overkill/oknex.qc
+++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc
@@@ -324,10 -326,10 +326,10 @@@ METHOD(OverkillNex, wr_zoom, bool(entit
  METHOD(OverkillNex, wr_impacteffect, void(entity thiswep, entity actor))
  {
        entity this = actor;
-       vector org2 = w_org + w_backoff * 6;
+       vector org2 = w_org + w_backoff * 2;
        pointparticles(EFFECT_VORTEX_IMPACT, org2, '0 0 0', 1);
        if(!w_issilent)
 -              sound(this, CH_SHOTS, SND_NEXIMPACT, VOL_BASE, ATTN_NORM);
 +              sound(this, CH_SHOTS, SND_VORTEX_IMPACT, VOL_BASE, ATTN_NORM);
  }
  
  METHOD(OverkillNex, wr_init, void(entity thiswep))

diff --cc qcsrc/common/mutators/mutator/overkill/okrpc.qh
Simple merge

diff --cc qcsrc/common/weapons/weapon/blaster.qh
index 9f07959d66b8928f69dc4e288c51380e4df389eb,944e86405d595f3882532c0e887ef419e1b308c0..557b96133fa76fba1165e560c7ad1d6339d9474f
--- 1/qcsrc/common/weapons/weapon/blaster.qh
--- 2/qcsrc/common/weapons/weapon/blaster.qh
+++ b/qcsrc/common/weapons/weapon/blaster.qh
@@@ -13,11 -13,12 +13,12 @@@ CLASS(Blaster, Weapon
  /* flash mdl */ ATTRIB(Blaster, m_muzzlemodel, Model, MDL_Null);
  /* flash eff */ ATTRIB(Blaster, m_muzzleeffect, entity, EFFECT_BLASTER_MUZZLEFLASH);
  #endif
 -/* crosshair */ ATTRIB(Blaster, w_crosshair, string, "gfx/crosshairlaser");
 +/* crosshair */ ATTRIB(Blaster, w_crosshair, string, "gfx/crosshairblaster");
  /* crosshair */ ATTRIB(Blaster, w_crosshair_size, float, 0.5);
 -/* wepimg    */ ATTRIB(Blaster, model2, string, "weaponlaser");
 +/* wepimg    */ ATTRIB(Blaster, model2, string, "weaponblaster");
  /* refname   */ ATTRIB(Blaster, netname, string, "blaster");
  /* wepname   */ ATTRIB(Blaster, m_name, string, _("Blaster"));
+ /* legacy    */ ATTRIB(Blaster, m_deprecated_netname, string, "laser");
  
  #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \

diff --cc qcsrc/common/weapons/weapon/devastator.qh
index bb3418aa051a826643391f84eac71e8d958c52f3,7a10bf62a17358ff085a8464d70fcdc24f1b7bfb..e9081e6b7a88b15ffdf34a9fc632bd15df782267
--- 1/qcsrc/common/weapons/weapon/devastator.qh
--- 2/qcsrc/common/weapons/weapon/devastator.qh
+++ b/qcsrc/common/weapons/weapon/devastator.qh
@@@ -13,11 -13,12 +13,12 @@@ CLASS(Devastator, Weapon
  /* flash mdl */ ATTRIB(Devastator, m_muzzlemodel, Model, MDL_DEVASTATOR_MUZZLEFLASH);
  /* flash eff */ ATTRIB(Devastator, m_muzzleeffect, entity, EFFECT_ROCKET_MUZZLEFLASH);
  #endif
 -/* crosshair */ ATTRIB(Devastator, w_crosshair, string, "gfx/crosshairrocketlauncher");
 +/* crosshair */ ATTRIB(Devastator, w_crosshair, string, "gfx/crosshairdevastator");
  /* crosshair */ ATTRIB(Devastator, w_crosshair_size, float, 0.7);
 -/* wepimg    */ ATTRIB(Devastator, model2, string, "weaponrocketlauncher");
 +/* wepimg    */ ATTRIB(Devastator, model2, string, "weapondevastator");
  /* refname   */ ATTRIB(Devastator, netname, string, "devastator");
  /* wepname   */ ATTRIB(Devastator, m_name, string, _("Devastator"));
+ /* legacy    */ ATTRIB(Devastator, m_deprecated_netname, string, "rocketlauncher");
  
  #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \

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

diff --cc qcsrc/common/weapons/weapon/machinegun.qh
index 0139e209d9ea78e3167bd70837093440fdfd9547,a4097f947e252dfa01d49ba4c99459d7ca3cc962..2aa738fe61d88f8ab35167027d7553e23f670772
--- 1/qcsrc/common/weapons/weapon/machinegun.qh
--- 2/qcsrc/common/weapons/weapon/machinegun.qh
+++ b/qcsrc/common/weapons/weapon/machinegun.qh
@@@ -13,11 -13,12 +13,12 @@@ CLASS(MachineGun, Weapon
  /* flash mdl */ ATTRIB(MachineGun, m_muzzlemodel, Model, MDL_MACHINEGUN_MUZZLEFLASH);
  /* flash eff */ ATTRIB(MachineGun, m_muzzleeffect, entity, EFFECT_MACHINEGUN_MUZZLEFLASH);
  #endif
 -/* crosshair */ ATTRIB(MachineGun, w_crosshair, string, "gfx/crosshairuzi");
 +/* crosshair */ ATTRIB(MachineGun, w_crosshair, string, "gfx/crosshairmachinegun");
  /* crosshair */ ATTRIB(MachineGun, w_crosshair_size, float, 0.6);
 -/* wepimg    */ ATTRIB(MachineGun, model2, string, "weaponuzi");
 +/* wepimg    */ ATTRIB(MachineGun, model2, string, "weaponmachinegun");
  /* refname   */ ATTRIB(MachineGun, netname, string, "machinegun");
  /* wepname   */ ATTRIB(MachineGun, m_name, string, _("MachineGun"));
+ /* legacy    */ ATTRIB(MachineGun, m_deprecated_netname, string, "uzi");
  
  #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \

diff --cc qcsrc/common/weapons/weapon/mortar.qh
index d3c397ea8e0e4d576ff58a7fa068777620122fca,6d44e75644ca0f2efe5865a2f855d46cec3f2c46..ab27ab1e69d50b1f8cf5d9660752488154f991e4
--- 1/qcsrc/common/weapons/weapon/mortar.qh
--- 2/qcsrc/common/weapons/weapon/mortar.qh
+++ b/qcsrc/common/weapons/weapon/mortar.qh
@@@ -13,11 -13,12 +13,12 @@@ CLASS(Mortar, Weapon
  /* flash mdl */ ATTRIB(Mortar, m_muzzlemodel, Model, MDL_Null);
  /* flash eff */ ATTRIB(Mortar, m_muzzleeffect, entity, EFFECT_GRENADE_MUZZLEFLASH);
  #endif
 -/* crosshair */ ATTRIB(Mortar, w_crosshair, string, "gfx/crosshairgrenadelauncher");
 +/* crosshair */ ATTRIB(Mortar, w_crosshair, string, "gfx/crosshairmortar");
  /* crosshair */ ATTRIB(Mortar, w_crosshair_size, float, 0.7);
 -/* wepimg    */ ATTRIB(Mortar, model2, string, "weapongrenadelauncher");
 +/* wepimg    */ ATTRIB(Mortar, model2, string, "weaponmortar");
  /* refname   */ ATTRIB(Mortar, netname, string, "mortar");
  /* wepname   */ ATTRIB(Mortar, m_name, string, _("Mortar"));
+ /* legacy    */ ATTRIB(Mortar, m_deprecated_netname, string, "grenadelauncher");
  
  #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \

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

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

diff --cc qcsrc/common/weapons/weapon/vaporizer.qh
index bc900206869673ca323c681f7da3139f18f203db,87249f7364b9b6525e9ac74153d4d3902cecd1dd..7760be3b29eff777a5599bd0f2812b65e2044c91
--- 1/qcsrc/common/weapons/weapon/vaporizer.qh
--- 2/qcsrc/common/weapons/weapon/vaporizer.qh
+++ b/qcsrc/common/weapons/weapon/vaporizer.qh
@@@ -13,12 -13,13 +13,13 @@@ CLASS(Vaporizer, Weapon
  /* flash mdl */ ATTRIB(Vaporizer, m_muzzlemodel, Model, MDL_Null);
  /* flash eff */ ATTRIB(Vaporizer, m_muzzleeffect, entity, EFFECT_VORTEX_MUZZLEFLASH);
  #endif
 -/* crosshair */ ATTRIB(Vaporizer, w_crosshair, string, "gfx/crosshairminstanex");
 +/* crosshair */ ATTRIB(Vaporizer, w_crosshair, string, "gfx/crosshairvaporizer");
  /* crosshair */ ATTRIB(Vaporizer, w_crosshair_size, float, 0.6);
 -/* reticle   */ ATTRIB(Vaporizer, w_reticle, string, "gfx/reticle_nex");
 -/* wepimg    */ ATTRIB(Vaporizer, model2, string, "weaponminstanex");
 +/* reticle   */ ATTRIB(Vaporizer, w_reticle, string, "gfx/reticle_vortex");
 +/* wepimg    */ ATTRIB(Vaporizer, model2, string, "weaponvaporizer");
  /* refname   */ ATTRIB(Vaporizer, netname, string, "vaporizer");
  /* wepname   */ ATTRIB(Vaporizer, m_name, string, _("Vaporizer"));
+ /* legacy    */ ATTRIB(Vaporizer, m_deprecated_netname, string, "minstanex");
  
  #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \

diff --cc qcsrc/common/weapons/weapon/vortex.qc
index 2bc84b2b8bdf8807f662d916eaaaebf05a3550b8,4d4e43ec6cb7ea0356eb8317da2fe5833457d4e0..9e82c10602f2e3b541cf7598268113995338414d
--- 1/qcsrc/common/weapons/weapon/vortex.qc
--- 2/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@@ -321,10 -321,10 +321,10 @@@ METHOD(Vortex, wr_zoom, bool(entity thi
  METHOD(Vortex, wr_impacteffect, void(entity thiswep, entity actor))
  {
        entity this = actor;
-       vector org2 = w_org + w_backoff * 6;
+       vector org2 = w_org + w_backoff * 2;
        pointparticles(EFFECT_VORTEX_IMPACT, org2, '0 0 0', 1);
        if(!w_issilent)
 -              sound(this, CH_SHOTS, SND_NEXIMPACT, VOL_BASE, ATTN_NORM);
 +              sound(this, CH_SHOTS, SND_VORTEX_IMPACT, VOL_BASE, ATTN_NORM);
  }
  METHOD(Vortex, wr_init, void(entity thiswep))
  {

diff --cc qcsrc/common/weapons/weapon/vortex.qh
index f2b2953fb20103fb03e76f1922b2b77eefd7a36e,2d80a7a61ae89b1266299984f8a783605d9426ab..571a982a47932969a9faf5d75d25eabf4267d95b
--- 1/qcsrc/common/weapons/weapon/vortex.qh
--- 2/qcsrc/common/weapons/weapon/vortex.qh
+++ b/qcsrc/common/weapons/weapon/vortex.qh
@@@ -13,12 -13,13 +13,13 @@@ CLASS(Vortex, Weapon
  /* flash mdl */ ATTRIB(Vortex, m_muzzlemodel, Model, MDL_Null);
  /* flash eff */ ATTRIB(Vortex, m_muzzleeffect, entity, EFFECT_VORTEX_MUZZLEFLASH);
  #endif
 -/* crosshair */ ATTRIB(Vortex, w_crosshair, string, "gfx/crosshairnex");
 +/* crosshair */ ATTRIB(Vortex, w_crosshair, string, "gfx/crosshairvortex");
  /* crosshair */ ATTRIB(Vortex, w_crosshair_size, float, 0.65);
 -/* reticle   */ ATTRIB(Vortex, w_reticle, string, "gfx/reticle_nex");
 -/* wepimg    */ ATTRIB(Vortex, model2, string, "weaponnex");
 +/* reticle   */ ATTRIB(Vortex, w_reticle, string, "gfx/reticle_vortex");
 +/* wepimg    */ ATTRIB(Vortex, model2, string, "weaponvortex");
  /* refname   */ ATTRIB(Vortex, netname, string, "vortex");
  /* wepname   */ ATTRIB(Vortex, m_name, string, _("Vortex"));
+ /* legacy    */ ATTRIB(Vortex, m_deprecated_netname, string, "nex");
  
  #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \