From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 13 Jun 2010 19:27:27 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/merlijn/macosx-fixes'
X-Git-Tag: xonotic-v0.1.0preview~428
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f943e217277aeabf50653915f977ef168797021c;hp=c185cf2bd088b8435ef16ae1599b192a88d02bc8

Merge remote branch 'refs/remotes/origin/merlijn/macosx-fixes'
---

diff --git a/misc/artwork/strength.svg b/misc/artwork/strength.svg
deleted file mode 100644
index a937735d..00000000
--- a/misc/artwork/strength.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="800.00000px" height="800.00000px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" viewBox="0 0 8.5 11">
- <defs>
-  <style type="text/css">
-    #nex-logo {fill:#000000}
-  </style>
- </defs>
- <g>
-  <path id="nex-logo" d="M2.72788 0.447937c0.177299,0.0096811 0.337701,0.0561457 0.393295,0.073563 0.267083,0.0836811 0.529291,0.174772 0.787957,0.262272 0.28674,0.0969961 0.532291,0.269654 0.628858,0.585705 0.0901811,0.360004 -0.0558858,0.639098 -0.0893858,0.81022l1.40719 -0.310941c0.206606,-0.0438071 0.568185,-0.154606 0.688213,-0.102413 0.527224,0.117831 0.99852,0.265697 1.44468,0.415976 0.185236,0.0700984 0.378744,0.147657 0.407528,0.216315 -0.00700394,0.112807 -0.0482244,0.26952 -0.0883819,0.430417l-0.923394 3.61046c-0.0442008,0.172839 -0.0928583,0.327858 -0.136417,0.47176 -0.295283,0.93702 -0.730976,1.76804 -1.2257,2.51009 -0.252083,0.380154 -0.592469,0.846988 -0.879461,1.11901 -0.202118,-0.365457 -0.400028,-0.73722 -0.577681,-1.13935 -0.0493622,-0.11174 -0.103228,-0.238083 -0.091189,-0.302535 0.0034685,-0.0034685 0.00694882,-0.00694882 0.0104173,-0.0104173 0.212969,0.0112283 0.377327,0.115827 0.494343,0.160803 0.11898,-0.109024 0.221949,-0.269075 0.322638,-0.410528 0.365917,-0.630516 0.549024,-1.34399 0.708972,-2.12128 0.0228465,-0.111024 0.0818346,-0.529898 0.104209,-0.643488 0.049437,-0.476114 0.0798346,-0.631358 0.12776,-1.06247 0.0659567,-0.54848 0.138799,-1.09027 0.204756,-1.63875l-2.57946 0.58326 -0.701654 2.18198c-0.0248465,0.0772756 -0.185917,0.46878 -0.227079,0.527142 -0.216906,0.422516 -0.463854,0.748634 -0.739083,1.06182 -0.226319,0.279992 -0.743043,0.715732 -0.93124,0.853272 -0.113736,0.083122 -0.251909,0.184433 -0.453524,0.311969 -0.27637,0.174823 -0.590232,0.358268 -0.695327,0.342268 -0.00255906,-0.0339488 0.140854,-0.192201 0.249,-0.306717 0.28348,-0.328858 0.531213,-0.664701 0.786331,-1.02241 0.243043,-0.385508 0.485055,-0.810681 0.684315,-1.25345 0.0692087,-0.153783 0.141449,-0.311858 0.195185,-0.47111 0.2275,-0.674209 0.375531,-1.34188 0.527516,-2.02997 -0.535862,-0.0389646 -1.28177,-0.242335 -1.84279,-0.447075 -0.209449,-0.0764331 -0.551205,-0.21 -0.624961,-0.311626 -0.0129921,-0.0167008 -0.00465354,-0.0369488 0.052252,-0.0708425 0.107933,-0.0579724 0.230878,-0.111551 0.374252,-0.157409 0.775185,-0.262071 1.57707,-0.448976 2.38758,-0.637031l0.15872 -0.814969c0.0267283,-0.13724 0.0221142,-0.33735 -0.0758661,-0.555386 -0.0587323,-0.161921 -0.181697,-0.334992 -0.309917,-0.566024 -0.0489291,-0.0990315 -0.0258268,-0.140327 0.0465472,-0.142118z" />
- </g>
-</svg>
\ No newline at end of file
diff --git a/misc/logos/icons_icns/xonotic.icns b/misc/logos/icons_icns/xonotic.icns
new file mode 100644
index 00000000..95e02095
Binary files /dev/null and b/misc/logos/icons_icns/xonotic.icns differ
diff --git a/misc/logos/icons_ico/xonotic_128.ico b/misc/logos/icons_ico/xonotic_128.ico
new file mode 100644
index 00000000..7b64c4df
Binary files /dev/null and b/misc/logos/icons_ico/xonotic_128.ico differ
diff --git a/misc/logos/icons_ico/xonotic_16.ico b/misc/logos/icons_ico/xonotic_16.ico
new file mode 100644
index 00000000..77fd48fe
Binary files /dev/null and b/misc/logos/icons_ico/xonotic_16.ico differ
diff --git a/misc/logos/icons_ico/xonotic_24.ico b/misc/logos/icons_ico/xonotic_24.ico
new file mode 100644
index 00000000..2b3d8d5d
Binary files /dev/null and b/misc/logos/icons_ico/xonotic_24.ico differ
diff --git a/misc/logos/icons_ico/xonotic_256.ico b/misc/logos/icons_ico/xonotic_256.ico
new file mode 100644
index 00000000..632d5a9e
Binary files /dev/null and b/misc/logos/icons_ico/xonotic_256.ico differ
diff --git a/misc/logos/icons_ico/xonotic_32.ico b/misc/logos/icons_ico/xonotic_32.ico
new file mode 100644
index 00000000..bd5407e2
Binary files /dev/null and b/misc/logos/icons_ico/xonotic_32.ico differ
diff --git a/misc/logos/icons_ico/xonotic_48.ico b/misc/logos/icons_ico/xonotic_48.ico
new file mode 100644
index 00000000..9f82051d
Binary files /dev/null and b/misc/logos/icons_ico/xonotic_48.ico differ
diff --git a/misc/logos/icons_ico/xonotic_512.ico b/misc/logos/icons_ico/xonotic_512.ico
new file mode 100644
index 00000000..3e13491b
Binary files /dev/null and b/misc/logos/icons_ico/xonotic_512.ico differ
diff --git a/misc/logos/icons_ico/xonotic_64.ico b/misc/logos/icons_ico/xonotic_64.ico
new file mode 100644
index 00000000..f9113474
Binary files /dev/null and b/misc/logos/icons_ico/xonotic_64.ico differ
diff --git a/misc/logos/icons_png/xonotic_128.png b/misc/logos/icons_png/xonotic_128.png
new file mode 100644
index 00000000..0d3847cb
Binary files /dev/null and b/misc/logos/icons_png/xonotic_128.png differ
diff --git a/misc/logos/icons_png/xonotic_16.png b/misc/logos/icons_png/xonotic_16.png
new file mode 100644
index 00000000..6521710b
Binary files /dev/null and b/misc/logos/icons_png/xonotic_16.png differ
diff --git a/misc/logos/icons_png/xonotic_22.png b/misc/logos/icons_png/xonotic_22.png
new file mode 100644
index 00000000..3037e3cb
Binary files /dev/null and b/misc/logos/icons_png/xonotic_22.png differ
diff --git a/misc/logos/icons_png/xonotic_24.png b/misc/logos/icons_png/xonotic_24.png
new file mode 100644
index 00000000..1b07ffc9
Binary files /dev/null and b/misc/logos/icons_png/xonotic_24.png differ
diff --git a/misc/logos/icons_png/xonotic_256.png b/misc/logos/icons_png/xonotic_256.png
new file mode 100644
index 00000000..699cf502
Binary files /dev/null and b/misc/logos/icons_png/xonotic_256.png differ
diff --git a/misc/logos/icons_png/xonotic_32.png b/misc/logos/icons_png/xonotic_32.png
new file mode 100644
index 00000000..a5df3839
Binary files /dev/null and b/misc/logos/icons_png/xonotic_32.png differ
diff --git a/misc/logos/icons_png/xonotic_48.png b/misc/logos/icons_png/xonotic_48.png
new file mode 100644
index 00000000..70677c32
Binary files /dev/null and b/misc/logos/icons_png/xonotic_48.png differ
diff --git a/misc/logos/icons_png/xonotic_512.png b/misc/logos/icons_png/xonotic_512.png
new file mode 100644
index 00000000..7e3d6367
Binary files /dev/null and b/misc/logos/icons_png/xonotic_512.png differ
diff --git a/misc/logos/icons_png/xonotic_64.png b/misc/logos/icons_png/xonotic_64.png
new file mode 100644
index 00000000..48381cb9
Binary files /dev/null and b/misc/logos/icons_png/xonotic_64.png differ
diff --git a/misc/logos/strength.svg b/misc/logos/strength.svg
new file mode 100644
index 00000000..a937735d
--- /dev/null
+++ b/misc/logos/strength.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="800.00000px" height="800.00000px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" viewBox="0 0 8.5 11">
+ <defs>
+  <style type="text/css">
+    #nex-logo {fill:#000000}
+  </style>
+ </defs>
+ <g>
+  <path id="nex-logo" d="M2.72788 0.447937c0.177299,0.0096811 0.337701,0.0561457 0.393295,0.073563 0.267083,0.0836811 0.529291,0.174772 0.787957,0.262272 0.28674,0.0969961 0.532291,0.269654 0.628858,0.585705 0.0901811,0.360004 -0.0558858,0.639098 -0.0893858,0.81022l1.40719 -0.310941c0.206606,-0.0438071 0.568185,-0.154606 0.688213,-0.102413 0.527224,0.117831 0.99852,0.265697 1.44468,0.415976 0.185236,0.0700984 0.378744,0.147657 0.407528,0.216315 -0.00700394,0.112807 -0.0482244,0.26952 -0.0883819,0.430417l-0.923394 3.61046c-0.0442008,0.172839 -0.0928583,0.327858 -0.136417,0.47176 -0.295283,0.93702 -0.730976,1.76804 -1.2257,2.51009 -0.252083,0.380154 -0.592469,0.846988 -0.879461,1.11901 -0.202118,-0.365457 -0.400028,-0.73722 -0.577681,-1.13935 -0.0493622,-0.11174 -0.103228,-0.238083 -0.091189,-0.302535 0.0034685,-0.0034685 0.00694882,-0.00694882 0.0104173,-0.0104173 0.212969,0.0112283 0.377327,0.115827 0.494343,0.160803 0.11898,-0.109024 0.221949,-0.269075 0.322638,-0.410528 0.365917,-0.630516 0.549024,-1.34399 0.708972,-2.12128 0.0228465,-0.111024 0.0818346,-0.529898 0.104209,-0.643488 0.049437,-0.476114 0.0798346,-0.631358 0.12776,-1.06247 0.0659567,-0.54848 0.138799,-1.09027 0.204756,-1.63875l-2.57946 0.58326 -0.701654 2.18198c-0.0248465,0.0772756 -0.185917,0.46878 -0.227079,0.527142 -0.216906,0.422516 -0.463854,0.748634 -0.739083,1.06182 -0.226319,0.279992 -0.743043,0.715732 -0.93124,0.853272 -0.113736,0.083122 -0.251909,0.184433 -0.453524,0.311969 -0.27637,0.174823 -0.590232,0.358268 -0.695327,0.342268 -0.00255906,-0.0339488 0.140854,-0.192201 0.249,-0.306717 0.28348,-0.328858 0.531213,-0.664701 0.786331,-1.02241 0.243043,-0.385508 0.485055,-0.810681 0.684315,-1.25345 0.0692087,-0.153783 0.141449,-0.311858 0.195185,-0.47111 0.2275,-0.674209 0.375531,-1.34188 0.527516,-2.02997 -0.535862,-0.0389646 -1.28177,-0.242335 -1.84279,-0.447075 -0.209449,-0.0764331 -0.551205,-0.21 -0.624961,-0.311626 -0.0129921,-0.0167008 -0.00465354,-0.0369488 0.052252,-0.0708425 0.107933,-0.0579724 0.230878,-0.111551 0.374252,-0.157409 0.775185,-0.262071 1.57707,-0.448976 2.38758,-0.637031l0.15872 -0.814969c0.0267283,-0.13724 0.0221142,-0.33735 -0.0758661,-0.555386 -0.0587323,-0.161921 -0.181697,-0.334992 -0.309917,-0.566024 -0.0489291,-0.0990315 -0.0258268,-0.140327 0.0465472,-0.142118z" />
+ </g>
+</svg>
\ No newline at end of file
diff --git a/misc/logos/xonotic_icon.svg b/misc/logos/xonotic_icon.svg
new file mode 100644
index 00000000..7e9fe9b1
--- /dev/null
+++ b/misc/logos/xonotic_icon.svg
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   version="1.0"
+   sodipodi:docname="xonotic_icon.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-xdpi="120"
+   inkscape:export-ydpi="120">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3663">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3667" />
+      <stop
+         id="stop3629"
+         offset="0.25"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3659"
+         offset="0.94"
+         style="stop-color:#000f1f;stop-opacity:1;" />
+      <stop
+         id="stop3690"
+         offset="1"
+         style="stop-color:#000f1f;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3698">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3700" />
+      <stop
+         id="stop3706"
+         offset="0.5"
+         style="stop-color:#0f3f6f;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3702" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3674">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3676" />
+      <stop
+         style="stop-color:#4f0f00;stop-opacity:1;"
+         offset="1"
+         id="stop3678" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3666">
+      <stop
+         style="stop-color:#3f0f00;stop-opacity:1;"
+         offset="0"
+         id="stop3668" />
+      <stop
+         id="stop3671"
+         offset="0.75"
+         style="stop-color:#ff7f2f;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ff9f5f;stop-opacity:1;"
+         offset="1"
+         id="stop3670" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3606">
+      <stop
+         style="stop-color:#bfdfff;stop-opacity:1;"
+         offset="0"
+         id="stop3608" />
+      <stop
+         id="stop3616"
+         offset="0.2"
+         style="stop-color:#5fafff;stop-opacity:1;" />
+      <stop
+         id="stop3614"
+         offset="0.80000001"
+         style="stop-color:#5fafff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#bfdfff;stop-opacity:1;"
+         offset="1"
+         id="stop3610" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3674"
+       id="linearGradient4196"
+       x1="1024"
+       y1="640"
+       x2="1024"
+       y2="440"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17187492,0,0,0.17187492,-151.99994,-63.999955)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3666"
+       id="linearGradient4204"
+       x1="1024"
+       y1="640"
+       x2="1024"
+       y2="440"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17187492,0,0,0.17187492,-151.99994,-63.999955)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3698"
+       id="linearGradient3705"
+       gradientUnits="userSpaceOnUse"
+       x1="1024"
+       y1="640"
+       x2="1024"
+       y2="384"
+       gradientTransform="matrix(0.17187493,0,0,0.17187493,-151.99995,-63.999958)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3606"
+       id="linearGradient3708"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17187493,0,0,0.17187493,-151.99995,-239.99988)"
+       x1="1024"
+       y1="1664"
+       x2="1024"
+       y2="1480" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3663"
+       id="radialGradient3688"
+       cx="24"
+       cy="24"
+       fx="24"
+       fy="24"
+       r="24"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3606"
+       id="linearGradient3659"
+       x1="23.999979"
+       y1="46.000004"
+       x2="23.999979"
+       y2="14.375016"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter3625"
+       inkscape:label="BlurGlow"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.2883372"
+         id="feGaussianBlur3627" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="77.720373"
+     inkscape:cy="24.156634"
+     inkscape:document-units="px"
+     inkscape:current-layer="XonoticIcon"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     gridtolerance="10"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-global="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       visible="true"
+       enabled="true"
+       empspacing="4"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Xonotic Icon</dc:title>
+        <dc:date>2010</dc:date>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Xonotic Community</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Xonotic Community</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="Dual-licensed under the &quot;GNU LGPL v2.1, or any later version&quot; (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) and &quot;CC-BY v3.0&quot; (http://creativecommons.org/licenses/by/3.0/)" />
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Xonotic</rdf:li>
+            <rdf:li>Phoenix</rdf:li>
+            <rdf:li>Icon</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:description>The icon of the Xonotic project.</dc:description>
+        <dc:relation>Xonotic Logo</dc:relation>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="XonoticIcon">
+    <path
+       style="fill:url(#radialGradient3688);fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="M 24,0 C 10.745169,0 0,10.745167 0,24.000001 0,37.254834 10.745169,48 24,48 37.254832,48 48,37.254834 48,24.000001 48,10.745167 37.254832,0 24,0 z"
+       id="BackgroundCircle" />
+    <path
+       id="RingGlow"
+       d="M 14.59521,4.1108501 C 7.1529823,7.6393737 2,15.221066 2,24.000008 2,36.144003 11.855996,46 24.00001,46 36.144004,46 46,36.144003 46,24.000008 46,15.221066 40.847035,7.6393737 33.404798,4.1108501 39.278676,7.4083408 43.250001,13.695036 43.250001,20.90626 43.250001,30.281336 36.536033,38.096723 27.657713,39.807112 26.473118,40.035362 25.031258,45.3125 24.00001,45.3125 22.96876,45.3125 21.526865,40.035362 20.34227,39.807112 11.463975,38.096723 4.7499989,30.281336 4.7499989,20.90626 4.7499989,13.695036 8.7213239,7.4083408 14.59521,4.1108501 z"
+       style="fill:#1f7fff;fill-opacity:1;stroke:#1f7fff;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3625)" />
+    <path
+       sodipodi:nodetypes="cccccccsccccccccccc"
+       id="PhoenixHeadGlow"
+       d="M 29.687991,11.576669 C 23.844,12.519302 16.365576,19.817205 9.0791026,25.681248 L 18.038082,21.545414 12.860351,27.050857 17.334467,24.956018 C 15.865814,27.850997 16.023069,32.858195 11.189936,33.845114 13.706493,36.335733 16.940546,38.104313 20.557136,38.797312 22.281242,39.125003 23.484367,43.9375 23.999992,43.9375 24.515616,43.9375 25.718741,39.125003 27.442847,38.797312 31.198015,38.077803 34.539671,36.198563 37.094717,33.555155 24.308519,33.714985 25.116458,20.742195 36.412596,17.903821 35.541363,17.092044 32.641742,17.244152 30.268064,17.619153 30.681719,14.852918 34.604229,13.528101 37.502915,13.886238 35.846316,12.205626 33.829346,10.991435 30.482905,12.387709 L 29.687991,11.576669 z M 28.082024,13.907732 28.952134,14.767107 C 27.816077,15.729188 26.806674,15.793142 25.847649,14.933602 L 28.082024,13.907732 z"
+       style="fill:none;stroke:#ff7f2f;stroke-width:2.20000004999999987;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.37254903;stroke-dasharray:none;filter:url(#filter3625)" />
+    <path
+       style="fill:url(#linearGradient4196);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4204);stroke-width:0.54999977;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 29.687991,11.576669 C 23.844,12.519302 16.365576,19.817205 9.0791026,25.681248 L 18.038082,21.545414 12.860351,27.050857 17.334467,24.956018 C 15.865814,27.850997 16.023069,32.858195 11.189936,33.845114 13.706493,36.335733 16.940546,38.104313 20.557136,38.797312 22.281242,39.125003 23.484367,43.9375 23.999992,43.9375 24.515616,43.9375 25.718741,39.125003 27.442847,38.797312 31.198015,38.077803 34.539671,36.198563 37.094717,33.555155 24.308519,33.714985 25.116458,20.742195 36.412596,17.903821 35.541363,17.092044 32.641742,17.244152 30.268064,17.619153 30.681719,14.852918 34.604229,13.528101 37.502915,13.886238 35.846316,12.205626 33.829346,10.991435 30.482905,12.387709 L 29.687991,11.576669 z M 28.082024,13.907732 28.952134,14.767107 C 27.816077,15.729188 26.806674,15.793142 25.847649,14.933602 L 28.082024,13.907732 z"
+       id="PhoenixHead"
+       sodipodi:nodetypes="cccccccsccccccccccc" />
+    <path
+       style="fill:url(#linearGradient3708);fill-opacity:1;stroke:url(#linearGradient3659);stroke-width:0.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 14.59521,4.1108501 C 7.1529823,7.6393737 2,15.221066 2,24.000008 2,36.144003 11.855996,46 24.00001,46 36.144004,46 46,36.144003 46,24.000008 46,15.221066 40.847035,7.6393737 33.404798,4.1108501 39.278676,7.4083408 43.250001,13.695036 43.250001,20.90626 43.250001,30.281336 36.536033,38.096723 27.657713,39.807112 26.473118,40.035362 25.031258,45.3125 24.00001,45.3125 22.96876,45.3125 21.526865,40.035362 20.34227,39.807112 11.463975,38.096723 4.7499989,30.281336 4.7499989,20.90626 4.7499989,13.695036 8.7213239,7.4083408 14.59521,4.1108501 z"
+       id="RingBorder" />
+    <path
+       style="fill:url(#linearGradient3705);fill-opacity:1;stroke:none"
+       d="M 6.8876934,11.007341 C 4.1441982,14.615296 2.5156248,19.117726 2.5156248,24.000008 2.5156248,35.635144 11.765684,45.12077 23.312492,45.48432 21.937493,44.28125 20.906243,40.500002 20.218743,40.328072 11.103551,38.569833 4.2343741,30.534776 4.2343741,20.90626 4.2343741,17.300186 5.2008217,13.91782 6.8876934,11.007341 z M 41.11229,11.007341 C 42.799156,13.91782 43.765609,17.300186 43.765609,20.90626 43.765609,30.534776 36.896438,38.569833 27.78124,40.328072 27.09374,40.500002 26.06249,44.28125 24.687491,45.48432 36.234306,45.12077 45.484358,35.635144 45.484358,24.000008 45.484358,19.117726 43.855792,14.615296 41.11229,11.007341 z"
+       id="RingBody"
+       sodipodi:nodetypes="csccsccsccsc" />
+  </g>
+</svg>
diff --git a/misc/logos/xonotic_logo.png b/misc/logos/xonotic_logo.png
new file mode 100644
index 00000000..ce19f799
Binary files /dev/null and b/misc/logos/xonotic_logo.png differ