Update Luma sourcefiles

diff --git a/gfx/luma/gfx/hud/luma/common.css b/gfx/luma/gfx/hud/luma/common.css
index ada24ec205d8fafd3687f5bd3c90098fab1f9609..292bcc85630003061586c7abebf414925bc24701 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/common.css
+++ b/gfx/luma/gfx/hud/luma/common.css
@@ -88,9 +88,9 @@
 .border_shadow_mask { fill:url(common.gradients#border_shadow_mask) }
 
 /* Selectors */
-.current_bg            { fill:url(common.gradients#current_bg) }
-.current_frame         { fill:url(common.gradients#current_frame) }
-.weapon_accuracy       { fill:url(common.gradients#weapon_accuracy) }
+.current_bg            { fill:url(common.gradients#weapon_current_bg) }
+.current_frame         { fill:#ffffff }
+.weapon_accuracy       { fill:#ffffff; opacity:0.3 }
 .weapon_ammo           { fill:url(common.gradients#weapon_ammo) }
 .weapon_complainbubble { fill:#ffffff; opacity:0.6 }
 

diff --git a/gfx/luma/gfx/hud/luma/common.gradients b/gfx/luma/gfx/hud/luma/common.gradients
index 597e180a297fff8edbaf5e434fa8180a21ea926d..0ef30371df5d324d64876c10dabf5d4e7ff3955c 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/common.gradients
+++ b/gfx/luma/gfx/hud/luma/common.gradients
@@ -24,21 +24,15 @@
                        <stop offset="0.625" stop-color="#ffffff"/>
                        <stop offset="0.75"  stop-color="#000000"/>
                </linearGradient>
-               <linearGradient id="current_bg" gradientUnits="userSpaceOnUse" x2="0%" y2="100%">
-                       <stop offset="0" stop-color="#e2f6fe" stop-opacity=".7"/>
-                       <stop offset="1" stop-color="#b7dcfc" stop-opacity="0"/>
-               </linearGradient>
-               <linearGradient id="current_frame" gradientUnits="userSpaceOnUse" y1="25%" x2="0%" y2="100%">
-                       <stop offset=".1" stop-color="#f9fdff"/>
-                       <stop offset="1"  stop-color="#f9fdff" stop-opacity="0"/>
-               </linearGradient>
-               <linearGradient id="weapon_accuracy" gradientUnits="userSpaceOnUse" x2="0%" y2="100%">
-                       <stop offset="0" stop-color="#ffffff" stop-opacity=".6"/>
-                       <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
-               </linearGradient>
                <linearGradient id="weapon_ammo">
                        <stop offset="0" stop-color="#ffffff" stop-opacity=".9"/>
                        <stop offset="1" stop-color="#cfcfcf" stop-opacity=".9"/>
                </linearGradient>
+               <linearGradient id="weapon_current_bg" x2="0" y2="1">
+                       <stop offset="0"   stop-color="#ffffff" stop-opacity=".4"/>
+                       <stop offset="0.3" stop-color="#ffffff" stop-opacity=".2"/>
+                       <stop offset="0.7" stop-color="#ffffff" stop-opacity=".2"/>
+                       <stop offset="1"   stop-color="#ffffff" stop-opacity=".4"/>
+               </linearGradient>
        </defs>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/weapon_accuracy.svg b/gfx/luma/gfx/hud/luma/weapon_accuracy.svg
index 65dc181b43438b79802f1cf3bf6210754d39b931..b125482abdcaadbddb4279b0d5371615bd7a5273 100644 (file)
--- a/gfx/luma/gfx/hud/luma/weapon_accuracy.svg
+++ b/gfx/luma/gfx/hud/luma/weapon_accuracy.svg
@@ -1,9 +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">
-       <g class="blurred">
-               <g transform="matrix(0,-1,1,0,0,128)">
-                       <path class="weapon_accuracy" d="m 4,128 8,-110 5,-4 94,0 5,4 8,110 z"/>
-               </g>
-       </g>
+       <path class="weapon_accuracy blurred" d="m 32,18 -28,3 0,86 28,3 64,0 28,-3 0,-86 -28,-3 z"/>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/weapon_accuracy_north.svg b/gfx/luma/gfx/hud/luma/weapon_accuracy_north.svg
deleted file mode 100644 (file)
index f70c4cb..0000000
--- a/gfx/luma/gfx/hud/luma/weapon_accuracy_north.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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">
-       <g class="blurred">
-               <g transform="matrix(1,0,0,-1,0,128)">
-                       <path class="weapon_accuracy" d="m 4,128 8,-110 5,-4 94,0 5,4 8,110 z"/>
-               </g>
-       </g>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/weapon_accuracy_south.svg b/gfx/luma/gfx/hud/luma/weapon_accuracy_south.svg
deleted file mode 100644 (file)
index 85d79bb..0000000
--- a/gfx/luma/gfx/hud/luma/weapon_accuracy_south.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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">
-       <g class="blurred">
-               <path class="weapon_accuracy" d="m 4,128 8,-110 5,-4 94,0 5,4 8,110 z"/>
-       </g>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/weapon_accuracy_west.svg b/gfx/luma/gfx/hud/luma/weapon_accuracy_west.svg
deleted file mode 100644 (file)
index 0e2b569..0000000
--- a/gfx/luma/gfx/hud/luma/weapon_accuracy_west.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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">
-       <g class="blurred">
-               <g transform="matrix(0,1,-1,0,128,0)">
-                       <path class="weapon_accuracy" d="m 4,128 8,-110 5,-4 94,0 5,4 8,110 z"/>
-               </g>
-       </g>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/weapon_ammo.svg b/gfx/luma/gfx/hud/luma/weapon_ammo.svg
index 71ef5e861d3d186b5cddc6a40fd2c622144d833c..13a78b05b1714dc5a66ac3b7a3baced115096708 100644 (file)
--- a/gfx/luma/gfx/hud/luma/weapon_ammo.svg
+++ b/gfx/luma/gfx/hud/luma/weapon_ammo.svg
@@ -1,5 +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="weapon_ammo blurred" d="m 14,116 108,7.5 0,-20.5 -108,3 z"/>
+       <path class="weapon_ammo blurred" d="M 4 96 L 4 107 L 32 110 L 96 110 L 124 107 L 124 96 L 4 96 z "/>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/weapon_current_bg.svg b/gfx/luma/gfx/hud/luma/weapon_current_bg.svg
index 0205612f0fa6272f0358fcc9dafd3b90a5ac2b12..cec7fa4d4e5493acf7e4b03008645755eba925f6 100644 (file)
--- a/gfx/luma/gfx/hud/luma/weapon_current_bg.svg
+++ b/gfx/luma/gfx/hud/luma/weapon_current_bg.svg
@@ -2,9 +2,8 @@
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
        <g class="glowing">
-               <g transform="matrix(0,-1,1,0,0,128)">
-                       <path class="current_bg" d="M 122,12 113,4 15,4 6,12 0,128 128,128 z"/>
-                       <path class="current_frame" d="m 122,12 -9,-8 -98,0 -9,8 -6,116 4,0 8,-110 5,-4 94,0 5,4 8,110 4,0 z"/>
-               </g>
+               <path class="current_bg" d="m 34,8 -32,8 0,96 32,8 60,0 32,-8 0,-96 -32,-8 z"/>
+               <path class="current_frame" d="m 33,124 -31,-9 0,-6 29,3 3,3 60,0 3,-3 29,-3 0,6 -31,9 z"/>
+               <path class="current_frame" d="m 33,4 -31,9 0,6 29,-3 3,-3 60,0 3,3 29,3 0,-6 -31,-9 z"/>
        </g>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/weapon_current_bg_north.svg b/gfx/luma/gfx/hud/luma/weapon_current_bg_north.svg
deleted file mode 100644 (file)
index 73facbb..0000000
--- a/gfx/luma/gfx/hud/luma/weapon_current_bg_north.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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">
-       <g class="glowing">
-               <g transform="matrix(1,0,0,-1,0,128)">
-                       <path class="current_bg" d="M 122,12 113,4 15,4 6,12 0,128 128,128 z"/>
-                       <path class="current_frame" d="m 122,12 -9,-8 -98,0 -9,8 -6,116 4,0 8,-110 5,-4 94,0 5,4 8,110 4,0 z"/>
-               </g>
-       </g>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/weapon_current_bg_south.svg b/gfx/luma/gfx/hud/luma/weapon_current_bg_south.svg
deleted file mode 100644 (file)
index faaf9eb..0000000
--- a/gfx/luma/gfx/hud/luma/weapon_current_bg_south.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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">
-       <g class="glowing">
-               <path class="current_bg" d="M 122,12 113,4 15,4 6,12 0,128 128,128 z"/>
-               <path class="current_frame" d="m 122,12 -9,-8 -98,0 -9,8 -6,116 4,0 8,-110 5,-4 94,0 5,4 8,110 4,0 z"/>
-       </g>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/weapon_current_bg_west.svg b/gfx/luma/gfx/hud/luma/weapon_current_bg_west.svg
deleted file mode 100644 (file)
index 6a320c0..0000000
--- a/gfx/luma/gfx/hud/luma/weapon_current_bg_west.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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">
-       <g class="glowing">
-               <g transform="matrix(0,1,-1,0,128,0)">
-                       <path class="current_bg" d="M 122,12 113,4 15,4 6,12 0,128 128,128 z"/>
-                       <path class="current_frame" d="m 122,12 -9,-8 -98,0 -9,8 -6,116 4,0 8,-110 5,-4 94,0 5,4 8,110 4,0 z"/>
-               </g>
-       </g>
-</svg>