Merge branch 'morphed/overkill'

diff --git a/README.txt b/README.txt
index 0fb67e5dc3bcd68b2eabb67bf1ab0edb43d3b979..4294c643af9bb9be5057a5d93b57b32e8ce208f4 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -39,7 +39,7 @@ Photographed skyboxes need no extra source. Generated skyboxes using 3D
 software (or Terragen) need the project file.
 
 gfx/, textures/
-2D art generally need no extra source as it is perfectly editable on is own,
+2D art generally needs no extra source as it is perfectly editable on its own,
 and typically not generated. In case a layered source file (XCF, PSD) exists,
 providing that would be very nice, though.
 

diff --git a/gfx/luma/gfx/hud/default/flag_stalemate.svg b/gfx/luma/gfx/hud/default/flag_stalemate.svg
index f9dbbb4c10b78e4e0ee60ae3ceb82ead0f56a7a4..b591ee891bb6352283b1343537a8852fc749e2dc 100644 (file)
--- a/gfx/luma/gfx/hud/default/flag_stalemate.svg
+++ b/gfx/luma/gfx/hud/default/flag_stalemate.svg
@@ -1,4 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-       <path filter="url(common.filters#blur)" fill="#fff" d="m64 49c-12 0-20 8-24 15 4 7 12 15 24 15s20-8 24-15c-4-7-12-15-24-15zm0 3a12 12 0 0 1 12 12 12 12 0 0 1 -12 12 12 12 0 0 1 -12 -12 12 12 0 0 1 12 -12zm0 4a8 8 0 0 0 -8 8 8 8 0 0 0 8 8 8 8 0 0 0 8 -8 8 8 0 0 0 -8 -8z"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" version="1.1">
+       <defs>
+               <linearGradient id="g">
+                       <stop stop-color="#ffffff" offset="0"/>
+                       <stop stop-color="#ffffff" stop-opacity="0" offset="1"/>
+               </linearGradient>
+               <linearGradient xlink:href="#g" id="gback" x1="0" x2="34" y1="128" y2="58" gradientUnits="userSpaceOnUse"/>
+               <linearGradient xlink:href="#g" id="gfore" x1="30" x2="50" y1="114" y2="66" gradientUnits="userSpaceOnUse"/>
+       </defs>
+       <path fill="url(#gback)" opacity="0.40" d="M 8 0 L 0 8 L 0 107 L 14 107 C 22 107 28 112 31.5 119 L 36 128 L 120 128 L 128 120 L 128 8 L 120 0 L 8 0 z "/>
+       <path fill="url(#gfore)" opacity="0.55" d="M 26,34 0,64.171875 0,82.74023438 42,34 Z M 58,34 0,101.3085938 0,107 11.09570312,107 74,34 Z m 32,0 -65.72070312,76.2695312 C 27.28827649,112.4004454 29.71934904,115.4386981 31.5,119 l 0.4609375,0.921875 L 106,34 Z m 32,0 -81,94 16,0 L 128,45.60546875 128,34 Z M 128,64.171875 73,128 l 16,0 39,-45.25976562 z m 0,37.1367188 L 105,128 l 16,0 7,-8 z"/>
+       <g transform="matrix(0.5416666667,0,0,0.5416666667,-20.66666667,84.33333333)">
+               <path fill="#ffffff" opacity="0.85" d="M 64,49 C 52,49 44,57 40,64 44,71 52,79 64,79 76,79 84,71 88,64 84,57 76,49 64,49 Z m 0,3 A 12,12 0 0 1 76,64 12,12 0 0 1 64,76 12,12 0 0 1 52,64 12,12 0 0 1 64,52 Z m 0,4 a 8,8 0 0 0 -8,8 8,8 0 0 0 8,8 8,8 0 0 0 8,-8 8,8 0 0 0 -8,-8 z"/>
+       </g>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/flag_blue_lost.svg b/gfx/luma/gfx/hud/luma/flag_blue_lost.svg
index 2a73d4fb6c2578dce6dec27229451a64eaaac280..3d95c006ad34856e8a16bcbd1c2daf63f333fd14 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/flag_blue_lost.svg
+++ b/gfx/luma/gfx/hud/luma/flag_blue_lost.svg
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="common_blue.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
        <g class="teamcolor shining">
-               <path d="m 49.6,43.5 c 1.3,5.6 5.5,10 10.5,14.3 L 32.6,73 71.8,57.8 c 12.9,6.5 20.4,15 22.7,23.8 L 43.6,103.4 c 0,-10 -8.1,-25.5 -13.2,-28.4 -3.6,-2.1 -4.7,2.3 -3.7,8 0.9,-10.8 7.5,-1.6 8.2,3.3 C 23.1,90.9 7.8,68.8 9.5,60.6 z m 48.5,39.6 2.2,2.9 L 36.1,116 32.3,111.3 z"/>
-               <path d="M 64,44 40,20 88,20 z"/>
+               <path d="m 59.6,43.5 c 1.3,5.6 5.5,10 10.5,14.3 L 42.6,73 81.8,57.8 c 12.9,6.5 20.4,15 22.7,23.8 l -50.9,21.8 c 0,-10 -8.1,-25.5 -13.2,-28.4 -3.6,-2.1 -4.7,2.3 -3.7,8 0.9,-10.8 7.5,-1.6 8.2,3.3 C 33.1,90.9 17.8,68.8 19.5,60.6 Z m 48.5,39.6 2.2,2.9 -64.2,30 -3.8,-4.7 z"/>
+               <path d="M 74,42 50,18 98,18 Z"/>
        </g>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/flag_neutral_lost.svg b/gfx/luma/gfx/hud/luma/flag_neutral_lost.svg
index 32222937fdbf2847819748d40f1c61a5b274bd98..1cce4d6660d52598d1ef55c50ba162681716f7c9 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/flag_neutral_lost.svg
+++ b/gfx/luma/gfx/hud/luma/flag_neutral_lost.svg
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="common_neutral.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
        <g class="teamcolor shining">
-               <path d="m 49.6,43.5 c 1.3,5.6 5.5,10 10.5,14.3 L 32.6,73 71.8,57.8 c 12.9,6.5 20.4,15 22.7,23.8 L 43.6,103.4 c 0,-10 -8.1,-25.5 -13.2,-28.4 -3.6,-2.1 -4.7,2.3 -3.7,8 0.9,-10.8 7.5,-1.6 8.2,3.3 C 23.1,90.9 7.8,68.8 9.5,60.6 z m 48.5,39.6 2.2,2.9 L 36.1,116 32.3,111.3 z"/>
-               <path d="M 64,44 40,20 88,20 z"/>
+               <path d="m 59.6,43.5 c 1.3,5.6 5.5,10 10.5,14.3 L 42.6,73 81.8,57.8 c 12.9,6.5 20.4,15 22.7,23.8 l -50.9,21.8 c 0,-10 -8.1,-25.5 -13.2,-28.4 -3.6,-2.1 -4.7,2.3 -3.7,8 0.9,-10.8 7.5,-1.6 8.2,3.3 C 33.1,90.9 17.8,68.8 19.5,60.6 Z m 48.5,39.6 2.2,2.9 -64.2,30 -3.8,-4.7 z"/>
+               <path d="M 74,42 50,18 98,18 Z"/>
        </g>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/flag_pink_lost.svg b/gfx/luma/gfx/hud/luma/flag_pink_lost.svg
index 2fdf9a13f4f95a1f77637f1360ef3ab8a5832d7f..eb588660eea8550de4db40cf42800f2db2a7d4fb 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/flag_pink_lost.svg
+++ b/gfx/luma/gfx/hud/luma/flag_pink_lost.svg
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="common_pink.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
        <g class="teamcolor shining">
-               <path d="m 49.6,43.5 c 1.3,5.6 5.5,10 10.5,14.3 L 32.6,73 71.8,57.8 c 12.9,6.5 20.4,15 22.7,23.8 L 43.6,103.4 c 0,-10 -8.1,-25.5 -13.2,-28.4 -3.6,-2.1 -4.7,2.3 -3.7,8 0.9,-10.8 7.5,-1.6 8.2,3.3 C 23.1,90.9 7.8,68.8 9.5,60.6 z m 48.5,39.6 2.2,2.9 L 36.1,116 32.3,111.3 z"/>
-               <path d="M 64,44 40,20 88,20 z"/>
+               <path d="m 59.6,43.5 c 1.3,5.6 5.5,10 10.5,14.3 L 42.6,73 81.8,57.8 c 12.9,6.5 20.4,15 22.7,23.8 l -50.9,21.8 c 0,-10 -8.1,-25.5 -13.2,-28.4 -3.6,-2.1 -4.7,2.3 -3.7,8 0.9,-10.8 7.5,-1.6 8.2,3.3 C 33.1,90.9 17.8,68.8 19.5,60.6 Z m 48.5,39.6 2.2,2.9 -64.2,30 -3.8,-4.7 z"/>
+               <path d="M 74,42 50,18 98,18 Z"/>
        </g>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/flag_red_lost.svg b/gfx/luma/gfx/hud/luma/flag_red_lost.svg
index 2b89ac5ff7c7c37efb03d547314c8ef1b34b55f1..3552db9c9f3cefc5d09e5eebdd158a4bd63f04b3 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/flag_red_lost.svg
+++ b/gfx/luma/gfx/hud/luma/flag_red_lost.svg
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="common_red.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
        <g class="teamcolor shining">
-               <path d="m 49.6,43.5 c 1.3,5.6 5.5,10 10.5,14.3 L 32.6,73 71.8,57.8 c 12.9,6.5 20.4,15 22.7,23.8 L 43.6,103.4 c 0,-10 -8.1,-25.5 -13.2,-28.4 -3.6,-2.1 -4.7,2.3 -3.7,8 0.9,-10.8 7.5,-1.6 8.2,3.3 C 23.1,90.9 7.8,68.8 9.5,60.6 z m 48.5,39.6 2.2,2.9 L 36.1,116 32.3,111.3 z"/>
-               <path d="M 64,44 40,20 88,20 z"/>
+               <path d="m 59.6,43.5 c 1.3,5.6 5.5,10 10.5,14.3 L 42.6,73 81.8,57.8 c 12.9,6.5 20.4,15 22.7,23.8 l -50.9,21.8 c 0,-10 -8.1,-25.5 -13.2,-28.4 -3.6,-2.1 -4.7,2.3 -3.7,8 0.9,-10.8 7.5,-1.6 8.2,3.3 C 33.1,90.9 17.8,68.8 19.5,60.6 Z m 48.5,39.6 2.2,2.9 -64.2,30 -3.8,-4.7 z"/>
+               <path d="M 74,42 50,18 98,18 Z"/>
        </g>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/flag_stalemate.svg b/gfx/luma/gfx/hud/luma/flag_stalemate.svg
index a0f28e1da85a5c256f2c0ef76c9087a8251fedbb..b591ee891bb6352283b1343537a8852fc749e2dc 100644 (file)
--- a/gfx/luma/gfx/hud/luma/flag_stalemate.svg
+++ b/gfx/luma/gfx/hud/luma/flag_stalemate.svg
@@ -1,5 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?xml-stylesheet href="common.css" type="text/css"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-       <path class="neutral shining" d="m64 49c-12 0-20 8-24 15 4 7 12 15 24 15s20-8 24-15c-4-7-12-15-24-15zm0 3a12 12 0 0 1 12 12 12 12 0 0 1 -12 12 12 12 0 0 1 -12 -12 12 12 0 0 1 12 -12zm0 4a8 8 0 0 0 -8 8 8 8 0 0 0 8 8 8 8 0 0 0 8 -8 8 8 0 0 0 -8 -8z"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" version="1.1">
+       <defs>
+               <linearGradient id="g">
+                       <stop stop-color="#ffffff" offset="0"/>
+                       <stop stop-color="#ffffff" stop-opacity="0" offset="1"/>
+               </linearGradient>
+               <linearGradient xlink:href="#g" id="gback" x1="0" x2="34" y1="128" y2="58" gradientUnits="userSpaceOnUse"/>
+               <linearGradient xlink:href="#g" id="gfore" x1="30" x2="50" y1="114" y2="66" gradientUnits="userSpaceOnUse"/>
+       </defs>
+       <path fill="url(#gback)" opacity="0.40" d="M 8 0 L 0 8 L 0 107 L 14 107 C 22 107 28 112 31.5 119 L 36 128 L 120 128 L 128 120 L 128 8 L 120 0 L 8 0 z "/>
+       <path fill="url(#gfore)" opacity="0.55" d="M 26,34 0,64.171875 0,82.74023438 42,34 Z M 58,34 0,101.3085938 0,107 11.09570312,107 74,34 Z m 32,0 -65.72070312,76.2695312 C 27.28827649,112.4004454 29.71934904,115.4386981 31.5,119 l 0.4609375,0.921875 L 106,34 Z m 32,0 -81,94 16,0 L 128,45.60546875 128,34 Z M 128,64.171875 73,128 l 16,0 39,-45.25976562 z m 0,37.1367188 L 105,128 l 16,0 7,-8 z"/>
+       <g transform="matrix(0.5416666667,0,0,0.5416666667,-20.66666667,84.33333333)">
+               <path fill="#ffffff" opacity="0.85" d="M 64,49 C 52,49 44,57 40,64 44,71 52,79 64,79 76,79 84,71 88,64 84,57 76,49 64,49 Z m 0,3 A 12,12 0 0 1 76,64 12,12 0 0 1 64,76 12,12 0 0 1 52,64 12,12 0 0 1 64,52 Z m 0,4 a 8,8 0 0 0 -8,8 8,8 0 0 0 8,8 8,8 0 0 0 8,-8 8,8 0 0 0 -8,-8 z"/>
+       </g>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/flag_yellow_lost.svg b/gfx/luma/gfx/hud/luma/flag_yellow_lost.svg
index ed45a45333ffde0eaca744d2dd83d8fcbb1c8d42..dff05cd032143a72ae1aac1f5cf671bae93c6530 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/flag_yellow_lost.svg
+++ b/gfx/luma/gfx/hud/luma/flag_yellow_lost.svg
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="common_yellow.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
        <g class="teamcolor shining">
-               <path d="m 49.6,43.5 c 1.3,5.6 5.5,10 10.5,14.3 L 32.6,73 71.8,57.8 c 12.9,6.5 20.4,15 22.7,23.8 L 43.6,103.4 c 0,-10 -8.1,-25.5 -13.2,-28.4 -3.6,-2.1 -4.7,2.3 -3.7,8 0.9,-10.8 7.5,-1.6 8.2,3.3 C 23.1,90.9 7.8,68.8 9.5,60.6 z m 48.5,39.6 2.2,2.9 L 36.1,116 32.3,111.3 z"/>
-               <path d="M 64,44 40,20 88,20 z"/>
+               <path d="m 59.6,43.5 c 1.3,5.6 5.5,10 10.5,14.3 L 42.6,73 81.8,57.8 c 12.9,6.5 20.4,15 22.7,23.8 l -50.9,21.8 c 0,-10 -8.1,-25.5 -13.2,-28.4 -3.6,-2.1 -4.7,2.3 -3.7,8 0.9,-10.8 7.5,-1.6 8.2,3.3 C 33.1,90.9 17.8,68.8 19.5,60.6 Z m 48.5,39.6 2.2,2.9 -64.2,30 -3.8,-4.7 z"/>
+               <path d="M 74,42 50,18 98,18 Z"/>
        </g>
 </svg>

diff --git a/models/weapons/NewRocketSource.zip b/models/weapons/NewRocketSource.zip
new file mode 100644 (file)
index 0000000..85bcab0
Binary files /dev/null and b/models/weapons/NewRocketSource.zip differ

diff --git a/sound/cdtracks/Nanite.zip b/sound/cdtracks/Nanite.zip
new file mode 100644 (file)
index 0000000..d8f4207
Binary files /dev/null and b/sound/cdtracks/Nanite.zip differ