From: Sahil Singhal Date: Sat, 15 May 2010 14:15:13 +0000 (-0400) Subject: Code change and third person models scaled completely. X-Git-Tag: xonotic-v0.1.0preview~605^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6eb01933fb35777b5f60f0b7f5b51847224b5d52;p=xonotic%2Fxonotic-data.pk3dir.git 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 index 97d227b39..000000000 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 index 474f093a9..000000000 --- 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 index 000000000..599347672 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 index 000000000..474f093a9 --- /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 index f708fbab7..000000000 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 index 0a59625b6..000000000 --- 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 e7d685bfb..dd8c386c0 100644 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 index e405532ab..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..1a72e9d13 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 index 000000000..0a59625b6 --- /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 index d4cb641d3..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..edf6907d0 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 index 000000000..0a59625b6 --- /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 index 6adb43325..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..4422ab1a1 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 index 000000000..0a59625b6 --- /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 index e588dab1f..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..9d1320286 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 index 000000000..0a59625b6 --- /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 index 000000000..012578ba8 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 index 1baded800..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..9b3f3ee04 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 index 000000000..0a59625b6 --- /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 index 536febc7c..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..5ffdcbbee 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 index 000000000..0a59625b6 --- /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 bf370a017..382ee624e 100644 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 index dbbc1a00d..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..62b835574 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 index 000000000..0a59625b6 --- /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 index 76c1293c4..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..c5b113bdf 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 index 000000000..0a59625b6 --- /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 index 5040c06fc..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..7a0ce9519 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 index 000000000..0a59625b6 --- /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 index af0409322..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..9f44e9a5c 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 index 000000000..0a59625b6 --- /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 index d4cb641d3..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..f866725b1 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 index 000000000..0a59625b6 --- /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 985a612f6..de7328f8b 100644 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 index e405532ab..000000000 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 index 0a59625b6..000000000 --- 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 index 000000000..0a59625b6 --- /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 d995ffae1..912dbfd74 100644 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 e9ef2c367..251e79f75 100644 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 80ef5d648..2c9da73fb 100644 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 2f65d73ac..67105bcf6 100644 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 6bb210d28..a5e847c37 100644 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 41ceb9b9c..d705024dd 100644 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 18664703f..19a245343 100644 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 7a26c1810..3bbc34d56 100644 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 3f87cf4e0..21f84e05e 100644 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 4d3153e88..d583e1a61 100644 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 fef595027..9144fa0a0 100644 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 18faccf21..41beb93b2 100644 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 c1e995169..2506269e8 100644 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 d6555162e..146809f9a 100644 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 0a064bedc..d4a628799 100644 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 c076cf0a6..910b2271f 100644 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 8633a9c97..22f545830 100644 --- 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 e83137696..f0ac7307b 100644 --- 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 e19c01b34..c1cb49d0e 100644 --- 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 6bccb7e3f..c1d30ba02 100644 --- 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 559ced33d..380e849fe 100644 --- 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 f23893ac1..06ff58857 100644 --- 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 f182ed397..ecd30d769 100644 --- 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 79240494f..6b2270af2 100644 --- 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 27bc8bd91..00e8fd890 100644 --- 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 f9196a8e8..7a9103ccf 100644 --- 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 55872df4f..55bbc51f8 100644 --- 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 68cd5e959..348a79c70 100644 --- 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 5307a3c68..691a25251 100644 --- 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 9074ba849..eab14f4f5 100644 --- 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 index 000000000..67fdf6b20 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 index 000000000..269fb58d9 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 index 000000000..cdb53f8b4 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 index 000000000..9f7cd2eaf 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 index 000000000..9735bcfd2 Binary files /dev/null and b/textures/rl_shirt.tga differ