Merge branch 'master' into mirceakitsune/weapon_display

diff --git a/data/models/weapons/g_grabber.md3 b/data/models/weapons/g_grabber.md3
index 1b787b0f3a83b9afe6db127b8ce22270dc97057a..3f8281f2e300f7156afa1d3df400095ca9ddf23c 100644 (file)
Binary files a/data/models/weapons/g_grabber.md3 and b/data/models/weapons/g_grabber.md3 differ

diff --git a/data/models/weapons/v_grabber.md3 b/data/models/weapons/v_grabber.md3
index a929f8970c5d8ffdd70bcf2f4f82d600c6c8870a..6392468003a289af7e2174d0455abe06bee8193d 100644 (file)
Binary files a/data/models/weapons/v_grabber.md3 and b/data/models/weapons/v_grabber.md3 differ

diff --git a/data/textures/grabber.tga b/data/textures/grabber.tga
index d8b9694da84a4040e05585c93aa95997dba85bd8..ae091ebb4287caa93b6e619e323c40d8b5784048 100644 (file)
Binary files a/data/textures/grabber.tga and b/data/textures/grabber.tga differ

diff --git a/data/textures/grabber_bump.tga b/data/textures/grabber_bump.tga
index f6175082f95896cb225c0456b95be8c8dcaa1cbf..124fd9b8f09507c5e136731d41a554d570536ec9 100644 (file)
Binary files a/data/textures/grabber_bump.tga and b/data/textures/grabber_bump.tga differ

diff --git a/data/textures/grabber_gloss.tga b/data/textures/grabber_gloss.tga
index 27d2215ed77636ea45f4fd39b3627bd226b1c4a7..62ac00358e07c51169938ee618fbc36ef839fbc1 100644 (file)
Binary files a/data/textures/grabber_gloss.tga and b/data/textures/grabber_gloss.tga differ

diff --git a/data/textures/grabber_reflect.tga b/data/textures/grabber_reflect.tga
index 54b55f88be57fbe8c53f549dd6d3adb65560cd47..ec1f7fe59993c9d2a2b6ea83c45fdc5e4c37fa0e 100644 (file)
Binary files a/data/textures/grabber_reflect.tga and b/data/textures/grabber_reflect.tga differ

diff --git a/misc/source/media/models/weapons/g_grabber.blend b/misc/source/media/models/weapons/g_grabber.blend
index d89243d8e484f77ba3e6d7408e251943fd537639..4767b4383f06c7a32399a217bfe3860ca9aa71bb 100644 (file)
Binary files a/misc/source/media/models/weapons/g_grabber.blend and b/misc/source/media/models/weapons/g_grabber.blend differ

diff --git a/misc/source/media/models/weapons/v_grabber.blend b/misc/source/media/models/weapons/v_grabber.blend
index 8e4a471cbf789aa64a3ff4854ffd70acf77a79fc..9f25519b12628a72d60348db85538dfb577c09c6 100644 (file)
Binary files a/misc/source/media/models/weapons/v_grabber.blend and b/misc/source/media/models/weapons/v_grabber.blend differ