Merge some older luma sourcefiles

diff --git a/gfx/luma/gfx/hud/luma/as_defend.svg b/gfx/luma/gfx/hud/luma/as_defend.svg
new file mode 100644 (file)
index 0000000..1288aff
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/as_defend.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?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="waypoint outlined" d="m 44,16 -8,8 H 20 c 0,52 12,76 44,88 32,-12 44,-36 44,-88 H 92 L 84,16 Z M 55,32 H 73 V 68 H 55 Z m 0,44 H 73 V 88 H 55 Z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/as_destroy.svg b/gfx/luma/gfx/hud/luma/as_destroy.svg
new file mode 100644 (file)
index 0000000..c0add11
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/as_destroy.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?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="waypoint outlined" d="M 72,10 57,42 28,20 40,58 67,54 74,61 69,94 97,117 85,82 116,78 89,62 112,34 77,46 Z m -6,52 -45,7 12,12 -19,19 14,14 19,-19 12,12 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/common.css b/gfx/luma/gfx/hud/luma/common.css
index 58dfac161e731861c14f8f74cbdbbe2b1e0c1970..c63347dd2cefd284613d3d22a8495b9b21886e70 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/common.css
+++ b/gfx/luma/gfx/hud/luma/common.css
@@ -55,7 +55,8 @@
 
 /* Misc */
 .progressbar { fill:#ffffff }
-.vehicle { fill:#efefef; opacity:0.75 }
+.vehicle     { fill:#efefef; opacity:0.75 }
+.waypoint    { fill:#ffffff }
 
 /* Backgrounds */
 .shadow             { fill:#000000; opacity:0.6 }
@@ -77,4 +78,5 @@
 .blurred  { filter:url(common.filters#blurred) }
 .darkened { filter:url(common.filters#darkened) }
 .glowing  { filter:url(common.filters#glowing) }
+.outlined { filter:url(common.filters#outlined) }
 .shining  { filter:url(common.filters#shining) }

diff --git a/gfx/luma/gfx/hud/luma/common.filters b/gfx/luma/gfx/hud/luma/common.filters
index d57c284f174c5976640669081bc4bb72a6a3e9e7..5771817785960cca758c960c648194e064d9bc60 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/common.filters
+++ b/gfx/luma/gfx/hud/luma/common.filters
@@ -23,6 +23,17 @@
                        </feMerge>
                        <feGaussianBlur stdDeviation="0.4"/>
                </filter>
+               <filter id="outlined">
+                       <feMorphology in="SourceAlpha" operator="dilate" radius="1"/>
+                       <feGaussianBlur stdDeviation="3"/>
+                       <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0"/>
+                       <feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.6 0" result="outline"/>
+                       <feMerge>
+                               <feMergeNode in="outline"/>
+                               <feMergeNode in="SourceGraphic"/>
+                       </feMerge>
+                       <feGaussianBlur stdDeviation="0.4"/>
+               </filter>
                <filter id="shining" x="-0.5" y="-0.5" width="2" height="2">
                        <feGaussianBlur stdDeviation="8"/>
                        <feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0" result="glow"/>

diff --git a/gfx/luma/gfx/hud/luma/ok_weapon_rail.svg b/gfx/luma/gfx/hud/luma/ok_weapon_rail.svg
deleted file mode 120000 (symlink)
index a0c22b7ab567d4553abae6b19642f23c310c96ac..0000000000000000000000000000000000000000
--- a/gfx/luma/gfx/hud/luma/ok_weapon_rail.svg
+++ /dev/null
@@ -1 +0,0 @@
-weaponnex.svg
\ No newline at end of file

diff --git a/gfx/luma/gfx/hud/luma/ok_weapon_rail.svg b/gfx/luma/gfx/hud/luma/ok_weapon_rail.svg
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..3afb48617d6af1d2e0a70b1c6eb3ee324822409e
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/ok_weapon_rail.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?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="nex shining" opacity="0.75" d="M 67.65429688,16.38085938 C 65.77824733,16.14711072 63.89045027,16.01995341 62,16 34.38576252,16 12,38.38576252 12,66 c 0.0216298,9.06267734 2.50601233,17.94907062 7.1875,25.70898438 l 7.03515625,-9.43164063 C 23.45514637,76.58116366 22.01159257,70.33288593 22,64 22.02046555,47.22295988 32.02325143,32.06750295 47.44140625,25.453125 54.14051982,21.82443848 60.98927222,18.76855834 67.65429688,16.38085938 Z M 64,106 c -6.32719563,-0.018187 -12.56851758,-1.4656824 -18.2578125,-4.234375 l -9.45898438,7.0527344 C 44.04598022,113.4991564 52.93522042,115.9815545 62,116 c 27.61423748,0 50,-22.38576252 50,-50 -0.010375,-1.91155246 -0.1303633,-3.82093703 -0.359375,-5.71875 -2.3912577,6.68518263 -5.420164,13.56640277 -9.0605469,20.28710962 C 95.95795458,95.99376389 80.78676842,105.9944734 64,106 Z"/>
+       <path class="nex shining" d="M 24,108 83,64 79,79 98,53 96,77 C 109,53 114,26 108,20 102,14 75,19 51,32 L 75,30 49,49 64,45 20,104 Z M 92,25 c 2.5,-3 12,-3 13,-2 1,1 1,10.5 -2,13 L 34,94 Z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/ok_weapon_shotgun.svg b/gfx/luma/gfx/hud/luma/ok_weapon_shotgun.svg
deleted file mode 120000 (symlink)
index 8a2b600fceab1a808b7c37e57d239890d1d8a5b3..0000000000000000000000000000000000000000
--- a/gfx/luma/gfx/hud/luma/ok_weapon_shotgun.svg
+++ /dev/null
@@ -1 +0,0 @@
-weaponshotgun.svg
\ No newline at end of file

diff --git a/gfx/luma/gfx/hud/luma/ok_weapon_shotgun.svg b/gfx/luma/gfx/hud/luma/ok_weapon_shotgun.svg
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..c4c97644208faa80508e4e7ecb011b63b5213a64
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/ok_weapon_shotgun.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?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="shotgun shining" opacity="0.75" d="m 62,16 c -27.61423748,0 -50,22.38576252 -50,50 0.009027,3.54320913 0.39465723,7.07542201 1.15039062,10.53710938 L 22.171875,67.515625 C 22.06548224,66.34666658 22.00814024,65.17376187 22,64 22,40.80404052 40.80404052,22 64,22 c 3.21430597,0.0150825 6.41625598,0.39910683 9.54296875,1.14453125 l 4.45117187,-4.45117187 C 72.84487748,16.9310791 67.442434,16.02132582 62,16 Z m 47.3183594,33.99609375 -4.46875,4.46875 C 105.5964138,57.58878473 105.9824003,60.78808247 106,64 c 0,23.19595948 -18.80404052,42 -42,42 -1.17251344,-0.00955 -2.34411276,-0.068193 -3.51171875,-0.1757812 l -8.99609375,8.9980468 C 54.94332033,115.5851329 58.46561448,115.9799179 62,116 c 27.61423748,0 50,-22.38576252 50,-50 -0.01649,-5.44506568 -0.9222963,-10.8508761 -2.6816406,-16.00390625 z"/>
+       <path class="shotgun shining" d="M 90,18 49,59 69,79 110,38 z m -45,45 -16,16 -4,-3 -6,6 27,27 6,-6 -3,-4 16,-16 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/ok_weapon_smg.svg b/gfx/luma/gfx/hud/luma/ok_weapon_smg.svg
deleted file mode 120000 (symlink)
index c39db950a8a4d8ddae335ab8b4c3a6fb91c90e51..0000000000000000000000000000000000000000
--- a/gfx/luma/gfx/hud/luma/ok_weapon_smg.svg
+++ /dev/null
@@ -1 +0,0 @@
-weaponuzi.svg
\ No newline at end of file

diff --git a/gfx/luma/gfx/hud/luma/ok_weapon_smg.svg b/gfx/luma/gfx/hud/luma/ok_weapon_smg.svg
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..2de3c314db65755dc10f440999b9740b6a7dcae8
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/ok_weapon_smg.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?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="uzi shining" opacity="0.75" d="M 62,16 A 50,50 0 0 0 12.546875,58.984375 L 26.58398438,45.015625 A 42,42 0 0 1 64,22 42,42 0 0 1 86.31835938,28.47851562 c 1.72129974,-1.0802611 3.45860409,-2.11012106 4.98046874,-2.91992187 A 50,50 0 0 0 62,16 Z m 42.9550781,24.51953125 c -0.9298894,1.74264604 -1.996646,3.51514265 -3.140625,5.28710937 A 42,42 0 0 1 106,64 42,42 0 0 1 89.68554688,97.20117188 L 73.82226562,114.5214844 A 50,50 0 0 0 112,66 50,50 0 0 0 104.9550781,40.51953125 Z M 12.5546875,73.00976562 a 50,50 0 0 0 36.33984375,41.22851558 l -5.00976563,-5.765625 2.84765626,-6.2285156 A 42,42 0 0 1 26.45703125,82.80273438 l -3.05273437,0.6875 z"/>
+       <path class="uzi shining" d="M 62,30 C 57.8,30 44.5,40 41.2,43.3 l 7.5,7.5 C 52,47.5 62,34.2 62,30 Z m 38,1 C 95,31 79,43 75,47 l 9,9 c 4,-4 16,-20 16,-25 z M 38.7,44.2 20.3,62.5 29.5,71.7 47.8,53.3 Z M 72,48 50,70 61,81 83,59 Z M 18.7,64.2 17,66.7 25.3,75 27.8,73.3 Z M 48,72 l -2,3 10,10 3,-2 z m 46,2 C 90.2,74 78.1,83.1 75,86.2 L 81.8,93 C 84.9,89.9 94,77.8 94,74 Z M 72.8,86.9 56,103.6 64.4,112 81.1,95.3 Z m -18.3,18.2 -1.5,2.3 7.6,7.6 2.3,-1.5 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/weaponhmg.svg b/gfx/luma/gfx/hud/luma/weaponhmg.svg
index 04944c26c7bd2c1b0c56c8029752775be6ad52ad..dc7667669435afb0022d6c393cfac6b6ee568f1e 100644 (file)
--- a/gfx/luma/gfx/hud/luma/weaponhmg.svg
+++ b/gfx/luma/gfx/hud/luma/weaponhmg.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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="hmg shining" opacity="0.75" d="m 62,16 a 50,50 0 0 0 -50,50 50,50 0 0 0 2.98632812,16.84179688 l 8.34570313,-8.49609376 A 42,42 0 0 1 22,64 42,42 0 0 1 64,22 42,42 0 0 1 80.33203125,25.30859375 L 84.921875,21.578125 A 50,50 0 0 0 62,16 Z m 44.4160156,27.14257812 -3.7636718,4.53515626 A 42,42 0 0 1 106,64 42,42 0 0 1 64,106 42,42 0 0 1 53.65234375,104.6523438 l -8.51367187,8.3671874 A 50,50 0 0 0 62,116 50,50 0 0 0 112,66 50,50 0 0 0 106.4160156,43.14257812 Z"/>
        <path class="hmg shining" d="M 108,18 C 97,22 94,24 79,37 L 91,49 C 104,34 106,31 110,20 z M 75,39 62,52 55,54 25,84 44,103 74,73 76,66 89,53 z m -53,48 -3,5 17,17 5,-3 z"/>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/weaponrpc.svg b/gfx/luma/gfx/hud/luma/weaponrpc.svg
index d5780f0ffb0fd98b9b607b6e355428384ff5f446..d24922855b2beb2e17a9c8055679b843383bb903 100644 (file)
--- a/gfx/luma/gfx/hud/luma/weaponrpc.svg
+++ b/gfx/luma/gfx/hud/luma/weaponrpc.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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="rpc shining" d="m 64,12 0,16 38,0 -11,11 25,25 -16,0 0,38 L 89,91 64,116 64,100 26,100 37,89 12,64 28,64 28,26 39,37 64,12 z m 0,28 C 50.7,40 40,50.7 40,64 40,77.3 50.7,88 64,88 77.3,88 88,77.3 88,64 88,50.7 77.3,40 64,40 z"/>
+       <path class="rpc shining" opacity="0.75" d="M 59.53320312 16.12304688 A 50 50 0 0 0 12 66 A 50 50 0 0 0 14.015625 79.92578125 L 18.98828125 57.94335938 L 22.65429688 56.87109375 A 42 42 0 0 1 58.17578125 22.45117188 L 59.53320312 16.12304688 z M 111.703125 60.70117188 L 105.8554688 60.71289062 A 42 42 0 0 1 106 64 A 42 42 0 0 1 65.13085938 105.9589844 L 62.85546875 115.9570312 A 50 50 0 0 0 112 66 A 50 50 0 0 0 111.703125 60.70117188 z"/>
+       <path class="rpc shining" d="m 26.2928932,59.59440842 -4.9497474,21.92031018 2.8284271,2.8284271 48.08326107,-48.08326106 a 14,14 0 0 1 19.7989899,0 14,14 0 0 1 0,19.79898987 l -48.08326107,48.08326109 11.31370847,11.3137085 4.9497474,-21.9203102 8.4852814,8.4852814 4.9497475,-21.9203102 8.4852813,8.4852813 4.9497475,-21.9203102 8.4852814,8.4852814 4.94974753,-21.92031021 h 12.727922 l -12.0208153,-14.84924241 9.1923882,-9.19238815 -19.79898983,-3.37533006 -10e-8,-10.76680556 -15.5563492,12.72792206 -8.4852813,-8.48528138 -4.9497475,21.92031022 -8.4852814,-8.48528138 -4.9497475,21.92031022 L 39.7279221,46.15937958 34.7781746,68.0796898 Z M 27,90 38.3137085,101.3137085 87.81118317,51.81623383 a 8,8 0 0 0 0,-11.3137085 8,8 0 0 0 -11.3137085,0 z"/>
 </svg>