wickedhud beta 3 source

diff --git a/gfx/hud/wickedhud/flagsource.blend b/gfx/hud/wickedhud/flagsource.blend
new file mode 100644 (file)
index 0000000..c0825dd
Binary files /dev/null and b/gfx/hud/wickedhud/flagsource.blend differ

diff --git a/gfx/hud/wickedhud/flagsource_content.png b/gfx/hud/wickedhud/flagsource_content.png
new file mode 100644 (file)
index 0000000..d69dee7
Binary files /dev/null and b/gfx/hud/wickedhud/flagsource_content.png differ

diff --git a/gfx/hud/wickedhud/flagsource_content.svg b/gfx/hud/wickedhud/flagsource_content.svg
new file mode 100755 (executable)
index 0000000..95275af
--- /dev/null
+++ b/gfx/hud/wickedhud/flagsource_content.svg
@@ -0,0 +1,187 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="384"
+   height="256"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   version="1.0"
+   sodipodi:docname="flagsource_content.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/sev/.xonotic/data/sourcefiles/flagsource_content.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <filter
+       inkscape:collect="always"
+       id="filter3601">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="7.04"
+         id="feGaussianBlur3603" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3721">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.1230468"
+         id="feGaussianBlur3723" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3635"
+       x="-0.28032"
+       width="1.56064"
+       y="-0.057917355"
+       height="1.1158347">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.36384"
+         id="feGaussianBlur3637" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3643">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="8.4708441"
+         id="feGaussianBlur3645" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.50000001"
+     inkscape:cx="658.69108"
+     inkscape:cy="88.708732"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     inkscape:snap-bbox="true"
+     gridtolerance="8"
+     inkscape:window-width="1280"
+     inkscape:window-height="963"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     guidecolor="#00007f"
+     guideopacity="0.49803922"
+     guidehicolor="#ff0000"
+     guidehiopacity="0.49803922">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2389"
+       visible="true"
+       enabled="true"
+       empspacing="4"
+       color="#003fff"
+       opacity="0.1254902"
+       empcolor="#007eff"
+       empopacity="0.25098039"
+       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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       id="path3717"
+       d="M 157.80078,51.847656 C 130.73812,64.678594 112,92.228904 112,124.15234 112,168.31234 147.84,204.15234 192,204.15234 236.16,204.15234 272,168.31234 272,124.15234 272,92.228904 253.26191,64.678594 226.19922,51.847656 247.55878,63.838469 262,86.679719 262,112.90234 262,146.99371 237.58566,175.43265 205.30078,181.65234 200.99322,182.48215 195.75,201.65234 192,201.65234 188.25,201.65234 183.00678,182.48221 178.69922,181.65234 146.41444,175.43259 122,146.99371 122,112.90234 122,86.679719 136.44119,63.838469 157.80078,51.847656 z M 211.375,69.699219 C 189.35775,73.250594 161.17067,100.73184 133.71875,122.82421 L 167.46875,107.25781 147.97657,128 164.83203,120.10937 C 158.89212,131.8175 162.29869,152.06215 139.63672,153.52734 149.32144,165.97141 163.33759,174.8984 179.42187,177.98046 185.75,179.17184 190.12503,196.65234 191.94141,196.65234 193.87503,196.65234 198.25,179.17184 204.46093,177.98046 221.18375,174.77609 235.67184,165.26965 245.37891,152.04296 189.25197,158.20284 191.98478,104.76478 236.70703,93.527344 233.42453,90.468964 222.50532,91.040314 213.5625,92.453124 215.12093,82.031312 229.88772,77.041313 240.80859,78.390625 234.56734,72.058875 226.97103,67.485594 214.36328,72.746094 L 211.375,69.699219 z M 205.32031,78.46875 208.60156,81.710937 C 204.3215,85.335626 200.51553,85.574251 196.90234,82.335937 L 205.32031,78.46875 z"
+       style="fill:#00007f;fill-opacity:1;stroke:#2f5fff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       style="fill:#001f9f;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -16,-16 -16,272 400,272 400,-16 -16,-16 z"
+       id="path3600"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccc"
+       id="path3599"
+       d="M -16,-16 -16,272 112,272 136,248 248,248 272,272 400,272 400,-16 272,-16 248,8 136,8 112,-16 -16,-16 z M 32,24 96,24 104,32 280,32 288,24 352,24 360,32 360,80 352,88 352,168 360,176 360,224 352,232 288,232 280,224 104,224 96,232 32,232 24,224 24,176 32,168 32,88 24,80 24,32 32,24 z"
+       style="fill:none;stroke:#2f5fff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter3601)" />
+    <path
+       style="fill:#00007f;stroke:#2f5fff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M -16,-16 -16,272 112,272 136,248 248,248 272,272 400,272 400,-16 272,-16 248,8 136,8 112,-16 -16,-16 z M 32,32 96,32 104,40 280,40 288,32 352,32 360,40 360,88 352,96 352,160 360,168 360,216 352,224 288,224 280,216 104,216 96,224 32,224 24,216 24,168 32,160 32,96 24,88 24,40 32,32 z"
+       id="path2819"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#2f5fff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3721)"
+       d="M 157.80078,51.847656 C 130.73812,64.678594 112,92.228904 112,124.15234 112,168.31234 147.84,204.15234 192,204.15234 236.16,204.15234 272,168.31234 272,124.15234 272,92.228904 253.26191,64.678594 226.19922,51.847656 247.55878,63.838469 262,86.679719 262,112.90234 262,146.99371 237.58566,175.43265 205.30078,181.65234 200.99322,182.48215 195.75,201.65234 192,201.65234 188.25,201.65234 183.00678,182.48221 178.69922,181.65234 146.41444,175.43259 122,146.99371 122,112.90234 122,86.679719 136.44119,63.838469 157.80078,51.847656 z M 211.375,69.699219 C 189.35775,73.250594 161.17067,100.73184 133.71875,122.82421 L 167.46875,107.25781 147.97657,128 164.83203,120.10937 C 158.89212,131.8175 162.29869,152.06215 139.63672,153.52734 149.32144,165.97141 163.33759,174.8984 179.42187,177.98046 185.75,179.17184 190.12503,196.65234 191.94141,196.65234 193.87503,196.65234 198.25,179.17184 204.46093,177.98046 221.18375,174.77609 235.67184,165.26965 245.37891,152.04296 189.25197,158.20284 191.98478,104.76478 236.70703,93.527344 233.42453,90.468964 222.50532,91.040314 213.5625,92.453124 215.12093,82.031312 229.88772,77.041313 240.80859,78.390625 234.56734,72.058875 226.97103,67.485594 214.36328,72.746094 L 211.375,69.699219 z M 205.32031,78.46875 208.60156,81.710937 C 204.3215,85.335626 200.51553,85.574251 196.90234,82.335937 L 205.32031,78.46875 z"
+       id="Ring" />
+    <path
+       id="path3719"
+       d="M 157.80078,51.847656 C 130.73812,64.678594 112,92.228904 112,124.15234 112,168.31234 147.84,204.15234 192,204.15234 236.16,204.15234 272,168.31234 272,124.15234 272,92.228904 253.26191,64.678594 226.19922,51.847656 247.55878,63.838469 262,86.679719 262,112.90234 262,146.99371 237.58566,175.43265 205.30078,181.65234 200.99322,182.48215 195.75,201.65234 192,201.65234 188.25,201.65234 183.00678,182.48221 178.69922,181.65234 146.41444,175.43259 122,146.99371 122,112.90234 122,86.679719 136.44119,63.838469 157.80078,51.847656 z M 211.375,69.699219 C 189.35775,73.250594 161.17067,100.73184 133.71875,122.82421 L 167.46875,107.25781 147.97657,128 164.83203,120.10937 C 158.89212,131.8175 162.29869,152.06215 139.63672,153.52734 149.32144,165.97141 163.33759,174.8984 179.42187,177.98046 185.75,179.17184 190.12503,196.65234 191.94141,196.65234 193.87503,196.65234 198.25,179.17184 204.46093,177.98046 221.18375,174.77609 235.67184,165.26965 245.37891,152.04296 189.25197,158.20284 191.98478,104.76478 236.70703,93.527344 233.42453,90.468964 222.50532,91.040314 213.5625,92.453124 215.12093,82.031312 229.88772,77.041313 240.80859,78.390625 234.56734,72.058875 226.97103,67.485594 214.36328,72.746094 L 211.375,69.699219 z M 205.32031,78.46875 208.60156,81.710937 C 204.3215,85.335626 200.51553,85.574251 196.90234,82.335937 L 205.32031,78.46875 z"
+       style="fill:#00007f;fill-opacity:1;stroke:#2f5fff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:0.74901962;stroke:none;font-family:Bitstream Vera Sans"
+       x="156.09599"
+       y="197.696"
+       id="text2824"><tspan
+         sodipodi:role="line"
+         id="tspan2826"
+         x="156.09599"
+         y="197.696"
+         style="font-size:192px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:0.74901962;font-family:Nimbus Sans L;-inkscape-font-specification:Nimbus Sans L Bold">!</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:0.74901962;stroke-width:22.17498464000000169;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path3601"
+       sodipodi:cx="195.51501"
+       sodipodi:cy="120.2355"
+       sodipodi:rx="105.00536"
+       sodipodi:ry="106.77312"
+       d="M 300.52038,120.2355 A 105.00536,106.77312 0 1 1 90.509651,120.2355 105.00536,106.77312 0 1 1 300.52038,120.2355 z"
+       transform="matrix(0.90947735,0,0,0.89441989,14.183523,20.45898)" />
+    <path
+       transform="matrix(0.90947735,0,0,0.89441989,14.183523,20.45898)"
+       d="M 300.52038,120.2355 A 105.00536,106.77312 0 1 1 90.509651,120.2355 105.00536,106.77312 0 1 1 300.52038,120.2355 z"
+       sodipodi:ry="106.77312"
+       sodipodi:rx="105.00536"
+       sodipodi:cy="120.2355"
+       sodipodi:cx="195.51501"
+       id="path3613"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:0.49803922000000000;stroke-width:22.17498464000000169;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter3643)"
+       sodipodi:type="arc" />
+    <text
+       id="text3627"
+       y="197.696"
+       x="156.09599"
+       style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:0.49803922000000000;stroke:none;font-family:Bitstream Vera Sans;filter:url(#filter3635)"
+       xml:space="preserve"><tspan
+         style="font-size:192px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:0.49803922;font-family:Nimbus Sans L;-inkscape-font-specification:Nimbus Sans L Bold"
+         y="197.696"
+         x="156.09599"
+         id="tspan3629"
+         sodipodi:role="line">!</tspan></text>
+  </g>
+</svg>

diff --git a/gfx/hud/wickedhud/flagsource_shield.svg b/gfx/hud/wickedhud/flagsource_shield.svg
new file mode 100755 (executable)
index 0000000..10f4cba
--- /dev/null
+++ b/gfx/hud/wickedhud/flagsource_shield.svg
@@ -0,0 +1,132 @@
+<?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="256"
+   height="256"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   version="1.0"
+   sodipodi:docname="flagsource_shield.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/sev/.xonotic/data/sourcefiles/flagsource_shield.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 128 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="256 : 128 : 1"
+       inkscape:persp3d-origin="128 : 85.333333 : 1"
+       id="perspective18" />
+    <linearGradient
+       id="linearGradient3610">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0"
+         id="stop3612" />
+      <stop
+         id="stop3624"
+         offset="0.60000002"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         id="stop3620"
+         offset="0.85000002"
+         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.89999998"
+         id="stop3622" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3614" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3610"
+       id="radialGradient3616"
+       cx="128"
+       cy="128"
+       fx="128"
+       fy="128"
+       r="120"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="232.55461"
+     inkscape:cy="63.73817"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-bbox="true"
+     gridtolerance="8"
+     inkscape:window-width="1280"
+     inkscape:window-height="963"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     guidecolor="#00007f"
+     guideopacity="0.49803922"
+     guidehicolor="#ff0000"
+     guidehiopacity="0.49803922">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2389"
+       visible="true"
+       enabled="true"
+       empspacing="4"
+       color="#003fff"
+       opacity="0.1254902"
+       empcolor="#007eff"
+       empopacity="0.25098039"
+       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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       d="M 248,128 A 120,120 0 1 1 8,128 120,120 0 1 1 248,128 z"
+       sodipodi:ry="120"
+       sodipodi:rx="120"
+       sodipodi:cy="128"
+       sodipodi:cx="128"
+       id="path3608"
+       style="fill:url(#radialGradient3616);fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+  </g>
+</svg>

diff --git a/gfx/hud/wickedhud/flagsource_shielded.xcf b/gfx/hud/wickedhud/flagsource_shielded.xcf
new file mode 100644 (file)
index 0000000..7606479
Binary files /dev/null and b/gfx/hud/wickedhud/flagsource_shielded.xcf differ

diff --git a/gfx/hud/wickedhud/whiteborder.sh b/gfx/hud/wickedhud/whiteborder.sh
index 515b6dfe19b4b14bf679a007e079abc5cf884a9a..5c1e08c8934accf2050ecc6d85e821f23a4f831e 100644 (file)
--- a/gfx/hud/wickedhud/whiteborder.sh
+++ b/gfx/hud/wickedhud/whiteborder.sh
@@ -11,6 +11,12 @@ gimp -d -f -i \
 -b '(whiteborder "ammo_shells.png" 16 2 4 1 3)' \
 -b '(whiteborder "armor.png" 16 3 4 1 3)' \
 -b '(whiteborder "health.png" 16 3 4 1 3)' \
+-b '(whiteborder "flag_blue_carrying.tga" 16 2 4 1 3)' \
+-b '(whiteborder "flag_blue_lost.tga" 16 2 4 1 3)' \
+-b '(whiteborder "flag_blue_taken.tga" 16 2 4 1 3)' \
+-b '(whiteborder "flag_red_carrying.tga" 16 2 4 1 3)' \
+-b '(whiteborder "flag_red_lost.tga" 16 2 4 1 3)' \
+-b '(whiteborder "flag_red_taken.tga" 16 2 4 1 3)' \
 -b '(whiteborder "weaponcampingrifle.tga" 16 2 4 1 3)' \
 -b '(whiteborder "weaponcrylink.tga" 16 2 4 1 3)' \
 -b '(whiteborder "weaponelectro.tga" 16 2 4 1 3)' \