Merge remote branch 'refs/remotes/origin/diabolik/weaponscalesource'

diff --git a/models/weapons/h_weapons/blend/h_electro.blend b/models/weapons/h_weapons/blend/h_electro.blend
index a5fb4455330a66f349b442cd03da7390a0ac0390..c37664bed3e8b756c2c7caf679b3c32f7cdf7384 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_electro.blend and b/models/weapons/h_weapons/blend/h_electro.blend differ

diff --git a/models/weapons/h_weapons/blend/h_gl.blend b/models/weapons/h_weapons/blend/h_gl.blend
index 72688d3ad863ef50262f8c661f052c224b7fa538..6378f8e2701c26b4180968118ad79e8b84f93f96 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_gl.blend and b/models/weapons/h_weapons/blend/h_gl.blend differ

diff --git a/models/weapons/h_weapons/blend/h_hlac.blend b/models/weapons/h_weapons/blend/h_hlac.blend
index 2cb904abfd454c8998f8e291fef8256d268c43c2..ed420bd57868369c53a52caee7a7afbafa5f324a 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_hlac.blend and b/models/weapons/h_weapons/blend/h_hlac.blend differ

diff --git a/models/weapons/h_weapons/blend/h_hookgun.blend b/models/weapons/h_weapons/blend/h_hookgun.blend
index 5e69c129baa02da6e2e8c5574f211810db930cc0..227ed9bfd81c29cd7ac93ccf160c9bedd6e7763c 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_hookgun.blend and b/models/weapons/h_weapons/blend/h_hookgun.blend differ

diff --git a/models/weapons/h_weapons/blend/h_laser.blend b/models/weapons/h_weapons/blend/h_laser.blend
index 08f062e6fd070e689c8a48c4b2175a7c764bed88..8a5a5b0a129068b982a647a01e1fb7c3691f5859 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_laser.blend and b/models/weapons/h_weapons/blend/h_laser.blend differ

diff --git a/models/weapons/h_weapons/blend/h_minstanex.blend b/models/weapons/h_weapons/blend/h_minstanex.blend
index 7755700eae1fdff88f537c6a1ad5e28f2b273b1d..87837f06fbf426fdf08e46242f628d2cebc3cde8 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_minstanex.blend and b/models/weapons/h_weapons/blend/h_minstanex.blend differ

diff --git a/models/weapons/h_weapons/blend/h_nex.blend b/models/weapons/h_weapons/blend/h_nex.blend
index f54024b0472bc1138d2f8117f7953be035fd43d5..0084381bdbd5d5aac63d71d434e42d22ad89c245 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_nex.blend and b/models/weapons/h_weapons/blend/h_nex.blend differ

diff --git a/models/weapons/h_weapons/blend/h_porto.blend b/models/weapons/h_weapons/blend/h_porto.blend
index 97f4b4dce70a26e951b37183fb8c6dc801a5b970..b5fd6e3b3cde1b77048927955c1ba5cfe433029e 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_porto.blend and b/models/weapons/h_weapons/blend/h_porto.blend differ

diff --git a/models/weapons/h_weapons/blend/h_shotgun.blend b/models/weapons/h_weapons/blend/h_shotgun.blend
index e0d7ceb05eedc7a2910abada6504893863f0bbfa..62258371b3479465ad07caa4aec1e6cfaa6207a5 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_shotgun.blend and b/models/weapons/h_weapons/blend/h_shotgun.blend differ

diff --git a/models/weapons/h_weapons/blend/h_uzi.blend b/models/weapons/h_weapons/blend/h_uzi.blend
index da6996b7356b8565278d40c890cccfa1789f9e2d..2c0044a3d9f2e02d04f492e9c950e48886be4349 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_uzi.blend and b/models/weapons/h_weapons/blend/h_uzi.blend differ

diff --git a/models/weapons/h_weapons/blend/v_hagar.blend b/models/weapons/h_weapons/blend/v_hagar.blend
deleted file mode 100644 (file)
index fadee89..0000000
Binary files a/models/weapons/h_weapons/blend/v_hagar.blend and /dev/null differ

diff --git a/models/weapons/v_weapons/v_campingrifle.blend b/models/weapons/v_weapons/v_campingrifle.blend
new file mode 100644 (file)
index 0000000..346798b
Binary files /dev/null and b/models/weapons/v_weapons/v_campingrifle.blend differ

diff --git a/models/weapons/v_weapons/v_crylink.blend b/models/weapons/v_weapons/v_crylink.blend
new file mode 100644 (file)
index 0000000..8f6f0d2
Binary files /dev/null and b/models/weapons/v_weapons/v_crylink.blend differ

diff --git a/models/weapons/v_weapons/v_electro.blend b/models/weapons/v_weapons/v_electro.blend
new file mode 100644 (file)
index 0000000..1fa9edb
Binary files /dev/null and b/models/weapons/v_weapons/v_electro.blend differ

diff --git a/models/weapons/v_weapons/v_gl.blend b/models/weapons/v_weapons/v_gl.blend
new file mode 100644 (file)
index 0000000..33e6eca
Binary files /dev/null and b/models/weapons/v_weapons/v_gl.blend differ

diff --git a/models/weapons/v_weapons/v_hagar.blend b/models/weapons/v_weapons/v_hagar.blend
new file mode 100644 (file)
index 0000000..fadee89
Binary files /dev/null and b/models/weapons/v_weapons/v_hagar.blend differ

diff --git a/models/weapons/v_weapons/v_hlac.blend b/models/weapons/v_weapons/v_hlac.blend
new file mode 100644 (file)
index 0000000..8e1862e
Binary files /dev/null and b/models/weapons/v_weapons/v_hlac.blend differ

diff --git a/models/weapons/v_weapons/v_hookgun.blend b/models/weapons/v_weapons/v_hookgun.blend
new file mode 100644 (file)
index 0000000..8960f85
Binary files /dev/null and b/models/weapons/v_weapons/v_hookgun.blend differ

diff --git a/models/weapons/v_weapons/v_laser.blend b/models/weapons/v_weapons/v_laser.blend
new file mode 100644 (file)
index 0000000..e8157ff
Binary files /dev/null and b/models/weapons/v_weapons/v_laser.blend differ

diff --git a/models/weapons/v_weapons/v_minstanex.blend b/models/weapons/v_weapons/v_minstanex.blend
new file mode 100644 (file)
index 0000000..6d27ea9
Binary files /dev/null and b/models/weapons/v_weapons/v_minstanex.blend differ

diff --git a/models/weapons/v_weapons/v_nex.blend b/models/weapons/v_weapons/v_nex.blend
new file mode 100644 (file)
index 0000000..88e8bbb
Binary files /dev/null and b/models/weapons/v_weapons/v_nex.blend differ

diff --git a/models/weapons/v_weapons/v_porto.blend b/models/weapons/v_weapons/v_porto.blend
new file mode 100644 (file)
index 0000000..2907c08
Binary files /dev/null and b/models/weapons/v_weapons/v_porto.blend differ

diff --git a/models/weapons/v_weapons/v_rl.blend b/models/weapons/v_weapons/v_rl.blend
new file mode 100644 (file)
index 0000000..422dbaa
Binary files /dev/null and b/models/weapons/v_weapons/v_rl.blend differ

diff --git a/models/weapons/v_weapons/v_seeker.blend b/models/weapons/v_weapons/v_seeker.blend
new file mode 100644 (file)
index 0000000..161401e
Binary files /dev/null and b/models/weapons/v_weapons/v_seeker.blend differ

diff --git a/models/weapons/v_weapons/v_shotgun.blend b/models/weapons/v_weapons/v_shotgun.blend
new file mode 100644 (file)
index 0000000..b28a266
Binary files /dev/null and b/models/weapons/v_weapons/v_shotgun.blend differ

diff --git a/models/weapons/v_weapons/v_uzi.blend b/models/weapons/v_weapons/v_uzi.blend
new file mode 100644 (file)
index 0000000..968b299
Binary files /dev/null and b/models/weapons/v_weapons/v_uzi.blend differ