Merge remote-tracking branch 'origin/divVerent/new-laser-by-morphed'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 18 Feb 2012 17:00:22 +0000 (18:00 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 18 Feb 2012 17:00:22 +0000 (18:00 +0100)
14 files changed:
models/weapons/g_laser.md3
models/weapons/laser.tga [new file with mode: 0644]
models/weapons/laser_gloss.tga [new file with mode: 0644]
models/weapons/laser_glow.tga [new file with mode: 0644]
models/weapons/laser_norm.tga [new file with mode: 0644]
models/weapons/laser_reflect.tga [new file with mode: 0644]
models/weapons/laser_shirt.tga [new file with mode: 0644]
models/weapons/v_laser.md3
scripts/weapons.shader
textures/laser.tga [deleted file]
textures/laser_bump.tga [deleted file]
textures/laser_gloss.tga [deleted file]
textures/laser_glow.tga [deleted file]
textures/laser_shirt.tga [deleted file]

index d1f168a61cfca337a173aaf03d38414cc3d26ce3..fd3f1e74a32950b2fa23247771c841d18445c160 100644 (file)
Binary files a/models/weapons/g_laser.md3 and b/models/weapons/g_laser.md3 differ
diff --git a/models/weapons/laser.tga b/models/weapons/laser.tga
new file mode 100644 (file)
index 0000000..2e49562
Binary files /dev/null and b/models/weapons/laser.tga differ
diff --git a/models/weapons/laser_gloss.tga b/models/weapons/laser_gloss.tga
new file mode 100644 (file)
index 0000000..9599a94
Binary files /dev/null and b/models/weapons/laser_gloss.tga differ
diff --git a/models/weapons/laser_glow.tga b/models/weapons/laser_glow.tga
new file mode 100644 (file)
index 0000000..8221e75
Binary files /dev/null and b/models/weapons/laser_glow.tga differ
diff --git a/models/weapons/laser_norm.tga b/models/weapons/laser_norm.tga
new file mode 100644 (file)
index 0000000..80f646a
Binary files /dev/null and b/models/weapons/laser_norm.tga differ
diff --git a/models/weapons/laser_reflect.tga b/models/weapons/laser_reflect.tga
new file mode 100644 (file)
index 0000000..8f9aca5
Binary files /dev/null and b/models/weapons/laser_reflect.tga differ
diff --git a/models/weapons/laser_shirt.tga b/models/weapons/laser_shirt.tga
new file mode 100644 (file)
index 0000000..3c42a16
Binary files /dev/null and b/models/weapons/laser_shirt.tga differ
index dc5e2674505c1f02c3652980c5e130f6ecce69c0..9e35e636feca4e7a524a14975090cc186f7d06ef 100644 (file)
Binary files a/models/weapons/v_laser.md3 and b/models/weapons/v_laser.md3 differ
index 1243955c8b66cf7c69663922d64b9f26a0f9fc34..5a2532e6408eece8229a61845602b289da8f2212 100644 (file)
@@ -62,11 +62,11 @@ rl
                rgbgen lightingDiffuse
        }
 }
-laser
+models/weapons/laser
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/laser.tga
+               map models/weapons/laser.tga
                rgbgen lightingDiffuse
        }
 }
diff --git a/textures/laser.tga b/textures/laser.tga
deleted file mode 100644 (file)
index c0f2bc7..0000000
Binary files a/textures/laser.tga and /dev/null differ
diff --git a/textures/laser_bump.tga b/textures/laser_bump.tga
deleted file mode 100644 (file)
index 2180e6e..0000000
Binary files a/textures/laser_bump.tga and /dev/null differ
diff --git a/textures/laser_gloss.tga b/textures/laser_gloss.tga
deleted file mode 100644 (file)
index fc54840..0000000
Binary files a/textures/laser_gloss.tga and /dev/null differ
diff --git a/textures/laser_glow.tga b/textures/laser_glow.tga
deleted file mode 100644 (file)
index 90e32e7..0000000
Binary files a/textures/laser_glow.tga and /dev/null differ
diff --git a/textures/laser_shirt.tga b/textures/laser_shirt.tga
deleted file mode 100644 (file)
index 279c0e7..0000000
Binary files a/textures/laser_shirt.tga and /dev/null differ