Code change and third person models scaled completely.

diff --git a/models/weapons/h_campingrifle.dpm b/models/weapons/h_campingrifle.dpm
deleted file mode 100644 (file)
index 97d227b..0000000
Binary files a/models/weapons/h_campingrifle.dpm and /dev/null differ

diff --git a/models/weapons/h_campingrifle.dpm.framegroups b/models/weapons/h_campingrifle.dpm.framegroups
deleted file mode 100644 (file)
index 474f093..0000000
--- a/models/weapons/h_campingrifle.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 39 20 0 // reload

diff --git a/models/weapons/h_campingrifle.iqm b/models/weapons/h_campingrifle.iqm
new file mode 100644 (file)
index 0000000..5993476
Binary files /dev/null and b/models/weapons/h_campingrifle.iqm differ

diff --git a/models/weapons/h_campingrifle.iqm.framegroups b/models/weapons/h_campingrifle.iqm.framegroups
new file mode 100644 (file)
index 0000000..474f093
--- /dev/null
+++ b/models/weapons/h_campingrifle.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 39 20 0 // reload

diff --git a/models/weapons/h_crylink.dpm b/models/weapons/h_crylink.dpm
deleted file mode 100644 (file)
index f708fba..0000000
Binary files a/models/weapons/h_crylink.dpm and /dev/null differ

diff --git a/models/weapons/h_crylink.dpm.framegroups b/models/weapons/h_crylink.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_crylink.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_crylink.iqm b/models/weapons/h_crylink.iqm
index e7d685bfb3ec1000926dfaec4ed3522e48465e9b..dd8c386c097758147b2b5e8a0cb927a819222caa 100644 (file)
Binary files a/models/weapons/h_crylink.iqm and b/models/weapons/h_crylink.iqm differ

diff --git a/models/weapons/h_electro.dpm b/models/weapons/h_electro.dpm
deleted file mode 100644 (file)
index e405532..0000000
Binary files a/models/weapons/h_electro.dpm and /dev/null differ

diff --git a/models/weapons/h_electro.dpm.framegroups b/models/weapons/h_electro.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_electro.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_electro.iqm b/models/weapons/h_electro.iqm
new file mode 100644 (file)
index 0000000..1a72e9d
Binary files /dev/null and b/models/weapons/h_electro.iqm differ

diff --git a/models/weapons/h_electro.iqm.framegroups b/models/weapons/h_electro.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_electro.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_fireball.dpm b/models/weapons/h_fireball.dpm
deleted file mode 100644 (file)
index d4cb641..0000000
Binary files a/models/weapons/h_fireball.dpm and /dev/null differ

diff --git a/models/weapons/h_fireball.dpm.framegroups b/models/weapons/h_fireball.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_fireball.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_fireball.iqm b/models/weapons/h_fireball.iqm
new file mode 100644 (file)
index 0000000..edf6907
Binary files /dev/null and b/models/weapons/h_fireball.iqm differ

diff --git a/models/weapons/h_fireball.iqm.framegroups b/models/weapons/h_fireball.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_fireball.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_gl.dpm b/models/weapons/h_gl.dpm
deleted file mode 100644 (file)
index 6adb433..0000000
Binary files a/models/weapons/h_gl.dpm and /dev/null differ

diff --git a/models/weapons/h_gl.dpm.framegroups b/models/weapons/h_gl.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_gl.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_gl.iqm b/models/weapons/h_gl.iqm
new file mode 100644 (file)
index 0000000..4422ab1
Binary files /dev/null and b/models/weapons/h_gl.iqm differ

diff --git a/models/weapons/h_gl.iqm.framegroups b/models/weapons/h_gl.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_gl.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_hagar.dpm b/models/weapons/h_hagar.dpm
deleted file mode 100644 (file)
index e588dab..0000000
Binary files a/models/weapons/h_hagar.dpm and /dev/null differ

diff --git a/models/weapons/h_hagar.dpm.framegroups b/models/weapons/h_hagar.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_hagar.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_hagar.iqm b/models/weapons/h_hagar.iqm
new file mode 100644 (file)
index 0000000..9d13202
Binary files /dev/null and b/models/weapons/h_hagar.iqm differ

diff --git a/models/weapons/h_hagar.iqm.framegroups b/models/weapons/h_hagar.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_hagar.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_hagar.iqm.md3 b/models/weapons/h_hagar.iqm.md3
new file mode 100644 (file)
index 0000000..012578b
Binary files /dev/null and b/models/weapons/h_hagar.iqm.md3 differ

diff --git a/models/weapons/h_hlac.dpm b/models/weapons/h_hlac.dpm
deleted file mode 100644 (file)
index 1baded8..0000000
Binary files a/models/weapons/h_hlac.dpm and /dev/null differ

diff --git a/models/weapons/h_hlac.dpm.framegroups b/models/weapons/h_hlac.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_hlac.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_hlac.iqm b/models/weapons/h_hlac.iqm
new file mode 100644 (file)
index 0000000..9b3f3ee
Binary files /dev/null and b/models/weapons/h_hlac.iqm differ

diff --git a/models/weapons/h_hlac.iqm.framegroups b/models/weapons/h_hlac.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_hlac.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_hookgun.dpm b/models/weapons/h_hookgun.dpm
deleted file mode 100644 (file)
index 536febc..0000000
Binary files a/models/weapons/h_hookgun.dpm and /dev/null differ

diff --git a/models/weapons/h_hookgun.dpm.framegroups b/models/weapons/h_hookgun.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_hookgun.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_hookgun.iqm b/models/weapons/h_hookgun.iqm
new file mode 100644 (file)
index 0000000..5ffdcbb
Binary files /dev/null and b/models/weapons/h_hookgun.iqm differ

diff --git a/models/weapons/h_hookgun.iqm.framegroups b/models/weapons/h_hookgun.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_hookgun.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_laser.iqm b/models/weapons/h_laser.iqm
index bf370a017796b60993e40a655003b75488949079..382ee624e51291f47289032845dd33dcba1e2157 100644 (file)
Binary files a/models/weapons/h_laser.iqm and b/models/weapons/h_laser.iqm differ

diff --git a/models/weapons/h_minstanex.dpm b/models/weapons/h_minstanex.dpm
deleted file mode 100644 (file)
index dbbc1a0..0000000
Binary files a/models/weapons/h_minstanex.dpm and /dev/null differ

diff --git a/models/weapons/h_minstanex.dpm.framegroups b/models/weapons/h_minstanex.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_minstanex.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_minstanex.iqm b/models/weapons/h_minstanex.iqm
new file mode 100644 (file)
index 0000000..62b8355
Binary files /dev/null and b/models/weapons/h_minstanex.iqm differ

diff --git a/models/weapons/h_minstanex.iqm.framegroups b/models/weapons/h_minstanex.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_minstanex.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_nex.dpm b/models/weapons/h_nex.dpm
deleted file mode 100644 (file)
index 76c1293..0000000
Binary files a/models/weapons/h_nex.dpm and /dev/null differ

diff --git a/models/weapons/h_nex.dpm.framegroups b/models/weapons/h_nex.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_nex.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_nex.iqm b/models/weapons/h_nex.iqm
new file mode 100644 (file)
index 0000000..c5b113b
Binary files /dev/null and b/models/weapons/h_nex.iqm differ

diff --git a/models/weapons/h_nex.iqm.framegroups b/models/weapons/h_nex.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_nex.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_porto.dpm b/models/weapons/h_porto.dpm
deleted file mode 100644 (file)
index 5040c06..0000000
Binary files a/models/weapons/h_porto.dpm and /dev/null differ

diff --git a/models/weapons/h_porto.dpm.framegroups b/models/weapons/h_porto.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_porto.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_porto.iqm b/models/weapons/h_porto.iqm
new file mode 100644 (file)
index 0000000..7a0ce95
Binary files /dev/null and b/models/weapons/h_porto.iqm differ

diff --git a/models/weapons/h_porto.iqm.framegroups b/models/weapons/h_porto.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_porto.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_rl.dpm b/models/weapons/h_rl.dpm
deleted file mode 100644 (file)
index af04093..0000000
Binary files a/models/weapons/h_rl.dpm and /dev/null differ

diff --git a/models/weapons/h_rl.dpm.framegroups b/models/weapons/h_rl.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_rl.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_rl.iqm b/models/weapons/h_rl.iqm
new file mode 100644 (file)
index 0000000..9f44e9a
Binary files /dev/null and b/models/weapons/h_rl.iqm differ

diff --git a/models/weapons/h_rl.iqm.framegroups b/models/weapons/h_rl.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_rl.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_seeker.dpm b/models/weapons/h_seeker.dpm
deleted file mode 100644 (file)
index d4cb641..0000000
Binary files a/models/weapons/h_seeker.dpm and /dev/null differ

diff --git a/models/weapons/h_seeker.dpm.framegroups b/models/weapons/h_seeker.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_seeker.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_seeker.iqm b/models/weapons/h_seeker.iqm
new file mode 100644 (file)
index 0000000..f866725
Binary files /dev/null and b/models/weapons/h_seeker.iqm differ

diff --git a/models/weapons/h_seeker.iqm.framegroups b/models/weapons/h_seeker.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_seeker.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_shotgun.iqm b/models/weapons/h_shotgun.iqm
index 985a612f695a566f77377946756c24a77cdec41b..de7328f8b999fde3f5f6b00f12973ede1e47c337 100644 (file)
Binary files a/models/weapons/h_shotgun.iqm and b/models/weapons/h_shotgun.iqm differ

diff --git a/models/weapons/h_tuba.dpm b/models/weapons/h_tuba.dpm
deleted file mode 100644 (file)
index e405532..0000000
Binary files a/models/weapons/h_tuba.dpm and /dev/null differ

diff --git a/models/weapons/h_tuba.dpm.framegroups b/models/weapons/h_tuba.dpm.framegroups
deleted file mode 100644 (file)
index 0a59625..0000000
--- a/models/weapons/h_tuba.dpm.framegroups
+++ /dev/null
@@ -1,4 +0,0 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload

diff --git a/models/weapons/h_tuba.iqm.framegroups b/models/weapons/h_tuba.iqm.framegroups
new file mode 100644 (file)
index 0000000..0a59625
--- /dev/null
+++ b/models/weapons/h_tuba.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

diff --git a/models/weapons/h_uzi.iqm b/models/weapons/h_uzi.iqm
index d995ffae129b1a70afabf54a759997b6272b810c..912dbfd74b6c7f74d64969eb62147f6cf74ef64c 100644 (file)
Binary files a/models/weapons/h_uzi.iqm and b/models/weapons/h_uzi.iqm differ

diff --git a/models/weapons/v_campingrifle.md3 b/models/weapons/v_campingrifle.md3
index e9ef2c367e174e9723ed616c06e120b01f851100..251e79f75cf7390d99a516981b7cf14de58fc58b 100644 (file)
Binary files a/models/weapons/v_campingrifle.md3 and b/models/weapons/v_campingrifle.md3 differ

diff --git a/models/weapons/v_crylink.md3 b/models/weapons/v_crylink.md3
index 80ef5d648606f419237bb9d1c23a8065ab0f40fe..2c9da73fbc57bb3a239a75e96823d2943d48ea3e 100644 (file)
Binary files a/models/weapons/v_crylink.md3 and b/models/weapons/v_crylink.md3 differ

diff --git a/models/weapons/v_electro.md3 b/models/weapons/v_electro.md3
index 2f65d73ac142f48107df570529f257d47735a391..67105bcf6f1686260de4501e9d485f8a1e69b112 100644 (file)
Binary files a/models/weapons/v_electro.md3 and b/models/weapons/v_electro.md3 differ

diff --git a/models/weapons/v_fireball.md3 b/models/weapons/v_fireball.md3
index 6bb210d2802946c8869c397d9215f2b1b4baeb10..a5e847c37b375d7222611e30f63d6ce38fbfccd3 100644 (file)
Binary files a/models/weapons/v_fireball.md3 and b/models/weapons/v_fireball.md3 differ

diff --git a/models/weapons/v_gl.md3 b/models/weapons/v_gl.md3
index 41ceb9b9cd828c054aa5bbef28b64338950423f3..d705024dd873cc7bd86faacd036f363d5a6559d5 100644 (file)
Binary files a/models/weapons/v_gl.md3 and b/models/weapons/v_gl.md3 differ

diff --git a/models/weapons/v_hagar.md3 b/models/weapons/v_hagar.md3
index 18664703f9918e69d3167b1938a197ac8d38baf6..19a245343322da6aa2dbfbb7de9b9a96c63264cf 100644 (file)
Binary files a/models/weapons/v_hagar.md3 and b/models/weapons/v_hagar.md3 differ

diff --git a/models/weapons/v_hlac.md3 b/models/weapons/v_hlac.md3
index 7a26c18106fa5a0a544c8cefffe3acf446f778f3..3bbc34d567d126fcf47fca6b40a6b4b02de58251 100644 (file)
Binary files a/models/weapons/v_hlac.md3 and b/models/weapons/v_hlac.md3 differ

diff --git a/models/weapons/v_laser.md3 b/models/weapons/v_laser.md3
index 3f87cf4e0e895629f090073d3719dd0c59a1ef28..21f84e05e6120c880ac9e60715a6c67527c7816c 100644 (file)
Binary files a/models/weapons/v_laser.md3 and b/models/weapons/v_laser.md3 differ

diff --git a/models/weapons/v_minstanex.md3 b/models/weapons/v_minstanex.md3
index 4d3153e88d625282d50fde681b97de5cfab83c16..d583e1a616ee5e9cf4d0bf3f7e4f8fccf634c7c3 100644 (file)
Binary files a/models/weapons/v_minstanex.md3 and b/models/weapons/v_minstanex.md3 differ

diff --git a/models/weapons/v_nex.md3 b/models/weapons/v_nex.md3
index fef59502712c3fe0fe1f19f440357655f8544633..9144fa0a04f7a199d97d603cd2b8bdd422333a42 100644 (file)
Binary files a/models/weapons/v_nex.md3 and b/models/weapons/v_nex.md3 differ

diff --git a/models/weapons/v_porto.md3 b/models/weapons/v_porto.md3
index 18faccf214a16dd0e1d3948c170b7ce0782a9d64..41beb93b29c0b9b45e8809ac7c58a6105858be1b 100644 (file)
Binary files a/models/weapons/v_porto.md3 and b/models/weapons/v_porto.md3 differ

diff --git a/models/weapons/v_rl.md3 b/models/weapons/v_rl.md3
index c1e995169c8ce6141c1779bd0dcdf35c8f321f13..2506269e838e9936ae1eb3e2062837085b49c5b3 100644 (file)
Binary files a/models/weapons/v_rl.md3 and b/models/weapons/v_rl.md3 differ

diff --git a/models/weapons/v_seeker.md3 b/models/weapons/v_seeker.md3
index d6555162ef85b6510bec1816e1e7def702241572..146809f9a8d578965e1ddb9c98dca107b1e92848 100644 (file)
Binary files a/models/weapons/v_seeker.md3 and b/models/weapons/v_seeker.md3 differ

diff --git a/models/weapons/v_shotgun.md3 b/models/weapons/v_shotgun.md3
index 0a064bedc86332fa550888e9b40bd5f011892f88..d4a6287991b207781085069e89aaaf83d0ac254a 100644 (file)
Binary files a/models/weapons/v_shotgun.md3 and b/models/weapons/v_shotgun.md3 differ

diff --git a/models/weapons/v_tuba.md3 b/models/weapons/v_tuba.md3
index c076cf0a618df27f7eb5a8789e4f077805f1230a..910b2271ff54a601a553b0bfc840f5087c52b3ca 100644 (file)
Binary files a/models/weapons/v_tuba.md3 and b/models/weapons/v_tuba.md3 differ

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 8633a9c97ea7adb66f2ad4708b232cf7bf215c45..22f5458309f520be8948c73b868da2fe362c7c57 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -2326,7 +2326,7 @@ vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter
                        {
                                // center
                                vecs_y = 0;
-                               vecs_z -= 4;
+                               vecs_z -= 2;
                        }
                        else
                        {
@@ -2339,7 +2339,7 @@ vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter
                        {
                                // center
                                vecs_y = 0;
-                               vecs_z -= 4;
+                               vecs_z -= 2;
                        }
                        else
                        {
@@ -2377,7 +2377,7 @@ vector shotorg_adjust(vector vecs, float y_is_right, float visual)
                else
                {
                        vecs_y = 0;
-                       vecs_z -= 4;
+                       vecs_z -= 2;
                }
        }
        else if ((s = cvar_string("g_shootfromfixedorigin")) != "")

diff --git a/qcsrc/server/w_campingrifle.qc b/qcsrc/server/w_campingrifle.qc
index e8313769631a7c6b57a653dee4527f1f4b39f099..f0ac7307bededa0d525fa31b0ff19ececbbe21fd 100644 (file)
--- a/qcsrc/server/w_campingrifle.qc
+++ b/qcsrc/server/w_campingrifle.qc
@@ -176,7 +176,7 @@ float w_campingrifle(float req)
        {               
                precache_model ("models/weapons/g_campingrifle.md3");
                precache_model ("models/weapons/v_campingrifle.md3");
-               precache_model ("models/weapons/h_campingrifle.dpm");
+               precache_model ("models/weapons/h_campingrifle.iqm");
                precache_sound ("weapons/campingrifle_reload.wav");
                precache_sound ("weapons/campingrifle_fire.wav");
                precache_sound ("weapons/campingrifle_fire2.wav");

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index e19c01b343f88f597cb634959db2f0a4545c069c..c1cb49d0ebb896c4b50f3985e95bb7eeb704a38a 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -270,7 +270,7 @@ float w_electro(float req)
        {
                precache_model ("models/weapons/g_electro.md3");
                precache_model ("models/weapons/v_electro.md3");
-               precache_model ("models/weapons/h_electro.dpm");
+               precache_model ("models/weapons/h_electro.iqm");
                precache_sound ("weapons/electro_bounce.wav");
                precache_sound ("weapons/electro_fire.wav");
                precache_sound ("weapons/electro_fire2.wav");

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index 6bccb7e3f6dbfd2f7c455456197ea6586d0c2073..c1d30ba0211f53bbd9297b4bcf2a96797a8a5851 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -337,7 +337,7 @@ float w_fireball(float req)
        {
                precache_model ("models/weapons/g_fireball.md3");
                precache_model ("models/weapons/v_fireball.md3");
-               precache_model ("models/weapons/h_fireball.dpm");
+               precache_model ("models/weapons/h_fireball.iqm");
                precache_model ("models/sphere/sphere.md3");
                precache_sound ("weapons/fireball_fire.wav");
                precache_sound ("weapons/fireball_fire2.wav");

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 559ced33d8193be473e668cb6445cb70ecfd8866..380e849fe35c276d259d84e7d76b1c398edb6d09 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -201,7 +201,7 @@ float w_glauncher(float req)
        {
                precache_model ("models/weapons/g_gl.md3");
                precache_model ("models/weapons/v_gl.md3");
-               precache_model ("models/weapons/h_gl.dpm");
+               precache_model ("models/weapons/h_gl.iqm");
                precache_sound ("weapons/grenade_bounce1.wav");
                precache_sound ("weapons/grenade_bounce2.wav");
                precache_sound ("weapons/grenade_bounce3.wav");

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index f23893ac18c5719f037dbb97acc7283f7532b423..06ff58857860d4fd5d35910ede418287cb55fd0f 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -141,7 +141,7 @@ float w_hagar(float req)
        {
                precache_model ("models/weapons/g_hagar.md3");
                precache_model ("models/weapons/v_hagar.md3");
-               precache_model ("models/weapons/h_hagar.dpm");
+               precache_model ("models/weapons/h_hagar.iqm");
                precache_sound ("weapons/hagar_fire.wav");
        }
        else if (req == WR_SETUP)

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index f182ed3971d795c16b86822eee9e69f5d6683779..ecd30d76911d0b8f016eada99910014eb7cf9d31 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -196,7 +196,7 @@ float w_hlac(float req)
        {
         precache_model ("models/weapons/g_hlac.md3");
                precache_model ("models/weapons/v_hlac.md3");
-               precache_model ("models/weapons/h_hlac.dpm");
+               precache_model ("models/weapons/h_hlac.iqm");
                precache_sound ("weapons/lasergun_fire.wav");
 
        }

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index 79240494febd784750c5b494a07da924e6ac06d0..6b2270af2f26726a3120dbc6ad802a66d0ffbb81 100644 (file)
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -217,7 +217,7 @@ float w_hook(float req)
        {
                precache_model ("models/weapons/g_hookgun.md3");
                precache_model ("models/weapons/v_hookgun.md3");
-               precache_model ("models/weapons/h_hookgun.dpm");
+               precache_model ("models/weapons/h_hookgun.iqm");
                precache_sound ("weapons/hook_impact.wav"); // done by g_hook.qc
                precache_sound ("weapons/hook_fire.wav");
                precache_sound ("weapons/hookbomb_fire.wav");

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 27bc8bd91dae9d0e38b51f73fa1298602a17699d..00e8fd890a0ea2f2a7bf22ac9328fc52daf9ac3c 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -210,7 +210,7 @@ float w_minstanex(float req)
                precache_model ("models/nexflash.md3");
                precache_model ("models/weapons/g_minstanex.md3");
                precache_model ("models/weapons/v_minstanex.md3");
-               precache_model ("models/weapons/h_minstanex.dpm");
+               precache_model ("models/weapons/h_minstanex.iqm");
                precache_sound ("weapons/minstanexfire.wav");
                precache_sound ("weapons/nexwhoosh1.wav");
                precache_sound ("weapons/nexwhoosh2.wav");

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index f9196a8e8c979a0fb1eaa12d38b4fc1d90c97a89..7a9103ccfabf2cd619919b4863fbfcdc9a1ccaa9 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -61,7 +61,7 @@ float w_nex(float req)
                precache_model ("models/nexflash.md3");
                precache_model ("models/weapons/g_nex.md3");
                precache_model ("models/weapons/v_nex.md3");
-               precache_model ("models/weapons/h_nex.dpm");
+               precache_model ("models/weapons/h_nex.iqm");
                precache_sound ("weapons/nexfire.wav");
                precache_sound ("weapons/nexwhoosh1.wav");
                precache_sound ("weapons/nexwhoosh2.wav");

diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index 55872df4fcfd89ee4a73821baca67ace1c154add..55bbc51f8c4bc44624187cabe4fcdba3ddc74cce 100644 (file)
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -257,7 +257,7 @@ float w_porto(float req)
        {
                precache_model ("models/weapons/g_porto.md3");
                precache_model ("models/weapons/v_porto.md3");
-               precache_model ("models/weapons/h_porto.dpm");
+               precache_model ("models/weapons/h_porto.iqm");
                precache_model ("models/portal.md3");
                precache_sound ("porto/bounce.wav");
                precache_sound ("porto/create.wav");

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index 68cd5e9597152a4bd33dc64ee037dd7692035711..348a79c700630c8cd78663c1014ea95394e897a0 100644 (file)
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -520,7 +520,7 @@ float w_rlauncher(float req)
                precache_model ("models/flash.md3");
                precache_model ("models/weapons/g_rl.md3");
                precache_model ("models/weapons/v_rl.md3");
-               precache_model ("models/weapons/h_rl.dpm");
+               precache_model ("models/weapons/h_rl.iqm");
                precache_sound ("weapons/rocket_det.wav");
                precache_sound ("weapons/rocket_fire.wav");
                precache_sound ("weapons/rocket_mode.wav");

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index 5307a3c68936e0b4d10df0668d222cd4c9a0514c..691a25251aebc1e3377414f057735158124d9d45 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -453,7 +453,7 @@ float w_seeker(float req)
        {
                precache_model ("models/weapons/g_seeker.md3");
                precache_model ("models/weapons/v_seeker.md3");
-               precache_model ("models/weapons/h_seeker.dpm");
+               precache_model ("models/weapons/h_seeker.iqm");
                precache_sound ("weapons/tag_fire.wav");
                precache_sound ("weapons/flac_fire.wav");
                precache_sound ("weapons/seeker_fire.wav");

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 9074ba84926ad12e4d85729cf2b55a1cc14c9318..eab14f4f516d62da409e3c2ada398c8afb81b9ce 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -228,7 +228,7 @@ float w_tuba(float req)
        {
                precache_model ("models/weapons/g_tuba.md3");
                precache_model ("models/weapons/v_tuba.md3");
-               precache_model ("models/weapons/h_tuba.dpm");
+               precache_model ("models/weapons/h_tuba.iqm");
 
                //float i;
                //for(i = -18; i <= +27; ++i)

diff --git a/textures/rl.tga b/textures/rl.tga
new file mode 100644 (file)
index 0000000..67fdf6b
Binary files /dev/null and b/textures/rl.tga differ

diff --git a/textures/rl_gloss.jpg b/textures/rl_gloss.jpg
new file mode 100644 (file)
index 0000000..269fb58
Binary files /dev/null and b/textures/rl_gloss.jpg differ

diff --git a/textures/rl_norm.tga b/textures/rl_norm.tga
new file mode 100644 (file)
index 0000000..cdb53f8
Binary files /dev/null and b/textures/rl_norm.tga differ

diff --git a/textures/rl_pants.tga b/textures/rl_pants.tga
new file mode 100644 (file)
index 0000000..9f7cd2e
Binary files /dev/null and b/textures/rl_pants.tga differ

diff --git a/textures/rl_shirt.tga b/textures/rl_shirt.tga
new file mode 100644 (file)
index 0000000..9735bcf
Binary files /dev/null and b/textures/rl_shirt.tga differ