From: Sahil Singhal Date: Tue, 15 Jun 2010 19:09:19 +0000 (-0400) Subject: Merge commit 'origin/master' into diabolik/nexmodel X-Git-Tag: xonotic-v0.1.0preview~31^2~1 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=7d9981072ff2f6aa4d639503844c94a4c39d7458;hp=f6c3d2aa493ffaf3775a7addf660ef90eb21be12 Merge commit 'origin/master' into diabolik/nexmodel --- diff --git a/gfx/logo/xonotic_icon.svg b/gfx/logo/xonotic_icon.svg new file mode 100644 index 0000000..7e9fe9b --- /dev/null +++ b/gfx/logo/xonotic_icon.svg @@ -0,0 +1,272 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Xonotic Icon + 2010 + + + Xonotic Community + + + + + + + + + + Xonotic Community + + + + + + Xonotic + Phoenix + Icon + + + The icon of the Xonotic project. + Xonotic Logo + + + + + + + + + + + + diff --git a/gfx/logo/xonotic_logo.svg b/gfx/logo/xonotic_logo.svg new file mode 100644 index 0000000..6969832 --- /dev/null +++ b/gfx/logo/xonotic_logo.svg @@ -0,0 +1,567 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Xonotic Logo + 2010 + + + Xonotic Community + + + + + + + + + + Xonotic Community + + + + + + + + + + + Xonotic + Phoenix + Logo + + + + The logo of the Xonotic project. + + + + + diff --git a/gfx/logo/xonotic_logo_print_black-all.svg b/gfx/logo/xonotic_logo_print_black-all.svg new file mode 100644 index 0000000..beb1bed --- /dev/null +++ b/gfx/logo/xonotic_logo_print_black-all.svg @@ -0,0 +1,138 @@ + + + + + + + + + + + + image/svg+xml + + Xonotic Logo Print Version + 2010 + + + Xonotic Community + + + + + + + + + + Xonotic Community + + + + + + Xonotic + Phoenix + Logo + + + A print version of the Xonotic logo. Completely black. + Xonotic Logo + + + + + diff --git a/gfx/logo/xonotic_logo_print_black-borders.svg b/gfx/logo/xonotic_logo_print_black-borders.svg new file mode 100644 index 0000000..8fbe187 --- /dev/null +++ b/gfx/logo/xonotic_logo_print_black-borders.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + image/svg+xml + + Xonotic Logo Print Version + 2010 + + + Xonotic Community + + + + + + + + + + Xonotic Community + + + + + + Xonotic + Phoenix + Logo + + + A print version of the Xonotic logo. Black borders, white fillings. + Xonotic Logo + + + + + diff --git a/gfx/logo/xonotic_logo_print_black-text-withborder.svg b/gfx/logo/xonotic_logo_print_black-text-withborder.svg new file mode 100644 index 0000000..be838e2 --- /dev/null +++ b/gfx/logo/xonotic_logo_print_black-text-withborder.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + image/svg+xml + + Xonotic Logo Print Version + 2010 + + + Xonotic Community + + + + + + + + + + Xonotic Community + + + + + + Xonotic + Phoenix + Logo + + + A print version of the Xonotic logo. Black text with white border, white phoenix with black border. + Xonotic Logo + + + + + diff --git a/gfx/logo/xonotic_logo_print_black-text.svg b/gfx/logo/xonotic_logo_print_black-text.svg new file mode 100644 index 0000000..45577c8 --- /dev/null +++ b/gfx/logo/xonotic_logo_print_black-text.svg @@ -0,0 +1,139 @@ + + + + + + + + + + + + image/svg+xml + + Xonotic Logo Print Version + 2010 + + + Xonotic Community + + + + + + + + + + Xonotic Community + + + + + + Xonotic + Phoenix + Logo + + + A print version of the Xonotic logo. Black text with no border, white phoenix with black border. + Xonotic Logo + + + + + diff --git a/gfx/logo/xonotic_logo_print_white-all.svg b/gfx/logo/xonotic_logo_print_white-all.svg new file mode 100644 index 0000000..3848e91 --- /dev/null +++ b/gfx/logo/xonotic_logo_print_white-all.svg @@ -0,0 +1,138 @@ + + + + + + + + + + + + image/svg+xml + + Xonotic Logo Print Version + 2010 + + + Xonotic Community + + + + + + + + + + Xonotic Community + + + + + + Xonotic + Phoenix + Logo + + + A print version of the Xonotic logo. Completely white. + Xonotic Logo + + + + + diff --git a/gfx/logo/xonotic_logo_print_white-borders.svg b/gfx/logo/xonotic_logo_print_white-borders.svg new file mode 100644 index 0000000..d1245f2 --- /dev/null +++ b/gfx/logo/xonotic_logo_print_white-borders.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + image/svg+xml + + Xonotic Logo Print Version + 2010 + + + Xonotic Community + + + + + + + + + + Xonotic Community + + + + + + Xonotic + Phoenix + Logo + + + A print version of the Xonotic logo. White borders, black fillings. + Xonotic Logo + + + + + diff --git a/gfx/logo/xonotic_logo_print_white-text-withborder.svg b/gfx/logo/xonotic_logo_print_white-text-withborder.svg new file mode 100644 index 0000000..59078e9 --- /dev/null +++ b/gfx/logo/xonotic_logo_print_white-text-withborder.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + image/svg+xml + + Xonotic Logo Print Version + 2010 + + + Xonotic Community + + + + + + + + + + Xonotic Community + + + + + + Xonotic + Phoenix + Logo + + + A print version of the Xonotic logo. White text with black border, black phoenix with white border. + Xonotic Logo + + + + + diff --git a/gfx/logo/xonotic_logo_print_white-text.svg b/gfx/logo/xonotic_logo_print_white-text.svg new file mode 100644 index 0000000..65b141c --- /dev/null +++ b/gfx/logo/xonotic_logo_print_white-text.svg @@ -0,0 +1,139 @@ + + + + + + + + + + + + image/svg+xml + + Xonotic Logo Print Version + 2010 + + + Xonotic Community + + + + + + + + + + Xonotic Community + + + + + + Xonotic + Phoenix + Logo + + + A print version of the Xonotic logo. White text with no border, black phoenix with white border. + Xonotic Logo + + + + + diff --git a/models/player/ignis.blend b/models/player/ignis.blend index 79fe9d4..59ed1e9 100644 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 9d661ac..6312f85 100644 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 d58e23d..e1a56c1 100644 Binary files a/models/player/ignismasked.blend and b/models/player/ignismasked.blend differ diff --git a/models/player/seraphina.blend b/models/player/seraphina.blend index 4dfe53c..11a4c92 100644 Binary files a/models/player/seraphina.blend and b/models/player/seraphina.blend differ diff --git a/models/player/seraphinamasked.blend b/models/player/seraphinamasked.blend index 38f3649..cf94186 100644 Binary files a/models/player/seraphinamasked.blend and b/models/player/seraphinamasked.blend differ