Merge commit 'origin/master' into diabolik/nexmodel

diff --git a/models/weapons/g_nex.md3 b/models/weapons/g_nex.md3
index 1df904fc3b0cecb44a7459be28ec8b63b372de7c..5594558b852a17822540fb2a5b9c658fa38008e2 100644 (file)
Binary files a/models/weapons/g_nex.md3 and b/models/weapons/g_nex.md3 differ

diff --git a/models/weapons/h_nex.iqm b/models/weapons/h_nex.iqm
index 22642efad854f3b847c658c9c1fda2f130d8d0a3..8b52897ffa6537a7b30f2801642f0cfb17cf2d62 100644 (file)
Binary files a/models/weapons/h_nex.iqm and b/models/weapons/h_nex.iqm differ

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

diff --git a/textures/nexgun.tga b/textures/nexgun.tga
index 9a0a9e10339817560a2e3dcc1db9a49ea178b729..240695f03c7f0b2aede35eb56e8c5cca54d2a6c4 100644 (file)
Binary files a/textures/nexgun.tga and b/textures/nexgun.tga differ

diff --git a/textures/nexgun_gloss.tga b/textures/nexgun_gloss.tga
index 6e634fafa6b395765dd73a04abcae1c906bda8b8..73088a05220a92570517644cbfcd38316e1b0943 100644 (file)
Binary files a/textures/nexgun_gloss.tga and b/textures/nexgun_gloss.tga differ

diff --git a/textures/nexgun_glow.tga b/textures/nexgun_glow.tga
index 162895fa53be294951a91e523403f2ea590dde55..c58c009cb814567d8fa656342392b0d4ccea1ba9 100644 (file)
Binary files a/textures/nexgun_glow.tga and b/textures/nexgun_glow.tga differ

diff --git a/textures/nexgun_norm.tga b/textures/nexgun_norm.tga
index 29fc33bc2c58b267bd29663e5be9243d27bdf014..2dfcf0341abfee2613f50760c6f7d7e394fbdbfd 100644 (file)
Binary files a/textures/nexgun_norm.tga and b/textures/nexgun_norm.tga differ

diff --git a/textures/nexgun_pants.tga b/textures/nexgun_pants.tga
deleted file mode 100644 (file)
index c23cc0c..0000000
Binary files a/textures/nexgun_pants.tga and /dev/null differ

diff --git a/textures/nexgun_reflect.tga b/textures/nexgun_reflect.tga
deleted file mode 100644 (file)
index 86a5dfb..0000000
Binary files a/textures/nexgun_reflect.tga and /dev/null differ

diff --git a/textures/nexgun_shirt.tga b/textures/nexgun_shirt.tga
index ca2681a82fbed1e784cc5600f02af3c01cff6710..eea7a6456df2e34212c58031574e88e985fcb045 100644 (file)
Binary files a/textures/nexgun_shirt.tga and b/textures/nexgun_shirt.tga differ