]> de.git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 84dd794)
Merge remote branch 'refs/remotes/origin/mand1nga/logo-sources'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 18:17:48 +0000 (20:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 18:17:48 +0000 (20:17 +0200)
models/player/erebus.blend [new file with mode: 0644] patch | blob
models/player/gak.blend [new file with mode: 0644] patch | blob
models/player/gakarmored.blend [new file with mode: 0644] patch | blob
models/player/gakmasked.blend [new file with mode: 0644] patch | blob
models/player/ignis.blend patch | blob | history
models/player/ignishalfmasked.blend patch | blob | history
models/player/ignismasked.blend patch | blob | history
models/player/nyx.blend [new file with mode: 0644] patch | blob
models/player/seraphina.blend [new file with mode: 0644] patch | blob
models/player/seraphinamasked.blend [new file with mode: 0644] patch | blob

diff --git a/models/player/erebus.blend b/models/player/erebus.blend
new file mode 100644 (file)
index 0000000..2ef0148
Binary files /dev/null and b/models/player/erebus.blend differ
diff --git a/models/player/gak.blend b/models/player/gak.blend
new file mode 100644 (file)
index 0000000..dfc1aab
Binary files /dev/null and b/models/player/gak.blend differ
diff --git a/models/player/gakarmored.blend b/models/player/gakarmored.blend
new file mode 100644 (file)
index 0000000..884947f
Binary files /dev/null and b/models/player/gakarmored.blend differ
diff --git a/models/player/gakmasked.blend b/models/player/gakmasked.blend
new file mode 100644 (file)
index 0000000..0af8048
Binary files /dev/null and b/models/player/gakmasked.blend differ
diff --git a/models/player/ignis.blend b/models/player/ignis.blend
index 79fe9d403c7c9d988de20662adeae5e40b1dbcf8..59ed1e9e87ab76ab0e6c713038f563aaaa54ad6e 100644 (file)
Binary files a/models/player/ignis.blend and b/models/player/ignis.blend differ
diff --git a/models/player/ignishalfmasked.blend b/models/player/ignishalfmasked.blend
index 9d661ac7f9fa336863008f1a70f454d22ecf0fea..6312f856c3c20cc8d6ae652b2d75fb7692153f8f 100644 (file)
Binary files a/models/player/ignishalfmasked.blend and b/models/player/ignishalfmasked.blend differ
diff --git a/models/player/ignismasked.blend b/models/player/ignismasked.blend
index d58e23d5041ad65ae4adb0f163ee00967dd1fe36..e1a56c13dec2644a32a0bf2ab6c67c13e6dd47ca 100644 (file)
Binary files a/models/player/ignismasked.blend and b/models/player/ignismasked.blend differ
diff --git a/models/player/nyx.blend b/models/player/nyx.blend
new file mode 100644 (file)
index 0000000..ab70077
Binary files /dev/null and b/models/player/nyx.blend differ
diff --git a/models/player/seraphina.blend b/models/player/seraphina.blend
new file mode 100644 (file)
index 0000000..11a4c92
Binary files /dev/null and b/models/player/seraphina.blend differ
diff --git a/models/player/seraphinamasked.blend b/models/player/seraphinamasked.blend
new file mode 100644 (file)
index 0000000..cf94186
Binary files /dev/null and b/models/player/seraphinamasked.blend differ