]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: c91887d)
Merge remote-tracking branch 'origin/master' into samual/runningman_separate
authorSamual Lenks <samual@xonotic.org>
Thu, 14 Feb 2013 21:50:33 +0000 (16:50 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 14 Feb 2013 21:50:33 +0000 (16:50 -0500)
models/pillars/mpillar.tga [new file with mode: 0644] patch | blob
models/pillars/mpillar_gloss.tga [new file with mode: 0644] patch | blob
models/pillars/mpillar_glow.tga [new file with mode: 0644] patch | blob
models/pillars/mpillar_shirt.tga [new file with mode: 0644] patch | blob
models/pillars/mpillar_use_colormap_inradiant.md3 [new file with mode: 0644] patch | blob

diff --git a/models/pillars/mpillar.tga b/models/pillars/mpillar.tga
new file mode 100644 (file)
index 0000000..297c915
Binary files /dev/null and b/models/pillars/mpillar.tga differ
diff --git a/models/pillars/mpillar_gloss.tga b/models/pillars/mpillar_gloss.tga
new file mode 100644 (file)
index 0000000..ae20021
Binary files /dev/null and b/models/pillars/mpillar_gloss.tga differ
diff --git a/models/pillars/mpillar_glow.tga b/models/pillars/mpillar_glow.tga
new file mode 100644 (file)
index 0000000..bda6f47
Binary files /dev/null and b/models/pillars/mpillar_glow.tga differ
diff --git a/models/pillars/mpillar_shirt.tga b/models/pillars/mpillar_shirt.tga
new file mode 100644 (file)
index 0000000..33f489a
Binary files /dev/null and b/models/pillars/mpillar_shirt.tga differ
diff --git a/models/pillars/mpillar_use_colormap_inradiant.md3 b/models/pillars/mpillar_use_colormap_inradiant.md3
new file mode 100644 (file)
index 0000000..fcd5794
Binary files /dev/null and b/models/pillars/mpillar_use_colormap_inradiant.md3 differ