Merge remote branch 'refs/remotes/origin/fruitiex/domfix'

diff --git a/models/domination/dom_axe.tga b/models/domination/dom_axe.tga
deleted file mode 100644 (file)
index d6e94cf..0000000
Binary files a/models/domination/dom_axe.tga and /dev/null differ

diff --git a/models/domination/dom_axe_glow.tga b/models/domination/dom_axe_glow.tga
deleted file mode 100644 (file)
index d6e94cf..0000000
Binary files a/models/domination/dom_axe_glow.tga and /dev/null differ

diff --git a/models/domination/dom_bolt.tga b/models/domination/dom_bolt.tga
deleted file mode 100644 (file)
index d5d36ee..0000000
Binary files a/models/domination/dom_bolt.tga and /dev/null differ

diff --git a/models/domination/dom_bolt_glow.tga b/models/domination/dom_bolt_glow.tga
deleted file mode 100644 (file)
index d5d36ee..0000000
Binary files a/models/domination/dom_bolt_glow.tga and /dev/null differ

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 8a7b04ab19fc71637af1abac4c9459fd7b019d23..a73e7e2064a38d6966bb223a7b425037d24b8901 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,3 +1,4 @@
+domination
 electro
 fireball
 flags

diff --git a/textures/domination/dom_base.jpg b/textures/domination/dom_base.jpg
deleted file mode 100644 (file)
index c105426..0000000
Binary files a/textures/domination/dom_base.jpg and /dev/null differ

diff --git a/textures/domination/dom_base.tga b/textures/domination/dom_base.tga
new file mode 100644 (file)
index 0000000..d2d1c79
Binary files /dev/null and b/textures/domination/dom_base.tga differ

diff --git a/textures/domination/dom_base_gloss.jpg b/textures/domination/dom_base_gloss.jpg
deleted file mode 100644 (file)
index 5d4a031..0000000
Binary files a/textures/domination/dom_base_gloss.jpg and /dev/null differ

diff --git a/textures/domination/dom_base_gloss.tga b/textures/domination/dom_base_gloss.tga
new file mode 100644 (file)
index 0000000..944313b
Binary files /dev/null and b/textures/domination/dom_base_gloss.tga differ

diff --git a/textures/domination/dom_base_norm.jpg b/textures/domination/dom_base_norm.jpg
deleted file mode 100644 (file)
index 1c7b05d..0000000
Binary files a/textures/domination/dom_base_norm.jpg and /dev/null differ

diff --git a/textures/domination/dom_base_norm.tga b/textures/domination/dom_base_norm.tga
new file mode 100644 (file)
index 0000000..57bd703
Binary files /dev/null and b/textures/domination/dom_base_norm.tga differ

diff --git a/textures/domination/dom_base_reflect.tga b/textures/domination/dom_base_reflect.tga
new file mode 100644 (file)
index 0000000..944313b
Binary files /dev/null and b/textures/domination/dom_base_reflect.tga differ

diff --git a/textures/domination/dom_blue_reflect.tga b/textures/domination/dom_blue_reflect.tga
new file mode 100644 (file)
index 0000000..d477855
Binary files /dev/null and b/textures/domination/dom_blue_reflect.tga differ

diff --git a/textures/domination/dom_pink_reflect.tga b/textures/domination/dom_pink_reflect.tga
new file mode 100644 (file)
index 0000000..d477855
Binary files /dev/null and b/textures/domination/dom_pink_reflect.tga differ

diff --git a/textures/domination/dom_red_reflect.tga b/textures/domination/dom_red_reflect.tga
new file mode 100644 (file)
index 0000000..d477855
Binary files /dev/null and b/textures/domination/dom_red_reflect.tga differ

diff --git a/textures/domination/dom_unclaimed_reflect.tga b/textures/domination/dom_unclaimed_reflect.tga
new file mode 100644 (file)
index 0000000..d477855
Binary files /dev/null and b/textures/domination/dom_unclaimed_reflect.tga differ

diff --git a/textures/domination/dom_yellow_reflect.tga b/textures/domination/dom_yellow_reflect.tga
new file mode 100644 (file)
index 0000000..d477855
Binary files /dev/null and b/textures/domination/dom_yellow_reflect.tga differ