Update Luma sourcefiles

diff --git a/gfx/luma/gfx/hud/luma/common.css b/gfx/luma/gfx/hud/luma/common.css
index 8f738a6d7c52572f663bfb523850181ed5d4cac4..5e64f3082075a234b5accd61967c782f788e3e27 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/common.css
+++ b/gfx/luma/gfx/hud/luma/common.css
@@ -9,32 +9,31 @@
 .nades      { fill:#96bea3 }
 .plasma     { fill:#eda3f1 }
 .rockets    { fill:#eaaf86 }
-.shells     { fill:#9aa3ab }
+.shells     { fill:#9aa5ab }
 .supercells { fill:#d0f08a }
 
 /* Weapons */
 .arc             { fill:#81f13d }
 .crylink         { fill:#ea6ff9 }
 .electro         { fill:#679ff3 }
-.fireball        { fill:#e39160 }
+.fireball        { fill:#f0855f }
 .grenadelauncher { fill:#fd725d }
 .hagar           { fill:#e39160 }
-.hlac            { fill:#e39160 }
+.hlac            { fill:#e5965b }
 .hmg             { fill:#fd725d }
 .hook            { fill:#81f13d }
 .laser           { fill:#f7717b }
 .minelayer       { fill:#fd725d }
+.minstanex       { fill:#978ed2 }
 .nex             { fill:#75c3d5 }
 .porto           { fill:#679ff3 }
 .rifle           { fill:#e39160 }
 .rocketlauncher  { fill:#e9be57 }
 .rpc             { fill:#e9be57 }
 .seeker          { fill:#f7717b }
-.shotgun         { fill:#8897a4 }
+.shotgun         { fill:#849ba8 }
 .shockwave       { fill:#77b38a }
 .tuba            { fill:#e9be57 }
-.vaporizer       { fill:#978ed2 }
-.vortex          { fill:#75c3d5 }
 
 /* Powerups */
 .detonator    { fill:#e39160 }

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

diff --git a/gfx/luma/gfx/hud/luma/weaponminstanex.svg b/gfx/luma/gfx/hud/luma/weaponminstanex.svg
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..f69f0f9c1bf95f0dc38b1eaded6eec10fd999f32
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/weaponminstanex.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="minstanex shining" d="M 46.5,58 C 36.2,55.6 36.3,63.9 42.2,72.9 L 60,49 45,53 71,34 47,36 c 24,-13 51,-18 57,-12 6,6 1,33 -12,57 L 94,57 75,83 79,68 55.1,85.8 c 9,5.9 17.3,6 14.9,-4.3 C 78.5,98.5 63,103 44,84 25,65 29.5,49.5 46.5,58 z M 49.6,81.5 99,40 c 3,-2.5 3,-12 2,-13 -1,-1 -10.5,-1 -13,2 L 46.5,78.4 z M 31,77 c -8.9,-2.1 -8.4,5.8 -2.3,14 L 36.8,80.2 41,85 32.5,95.5 43,87.1 47.8,91.3 37,99.4 c 8.2,6 16.1,6.5 14,-2.4 7.5,16.5 -8,16 -22,2 C 15,85 14.5,69.5 31,77 z m -15,31 7.8,-10.4 3.1,3.5 3.5,3.1 L 20,112 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/weaponvaporizer.svg b/gfx/luma/gfx/hud/luma/weaponvaporizer.svg
deleted file mode 100644 (file)
index 1b3e565..0000000
--- a/gfx/luma/gfx/hud/luma/weaponvaporizer.svg
+++ /dev/null
@@ -1,5 +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">
-       <path class="vaporizer shining" d="M 46.5,58 C 36.2,55.6 36.3,63.9 42.2,72.9 L 60,49 45,53 71,34 47,36 c 24,-13 51,-18 57,-12 6,6 1,33 -12,57 L 94,57 75,83 79,68 55.1,85.8 c 9,5.9 17.3,6 14.9,-4.3 C 78.5,98.5 63,103 44,84 25,65 29.5,49.5 46.5,58 z M 49.6,81.5 99,40 c 3,-2.5 3,-12 2,-13 -1,-1 -10.5,-1 -13,2 L 46.5,78.4 z M 31,77 c -8.9,-2.1 -8.4,5.8 -2.3,14 L 36.8,80.2 41,85 32.5,95.5 43,87.1 47.8,91.3 37,99.4 c 8.2,6 16.1,6.5 14,-2.4 7.5,16.5 -8,16 -22,2 C 15,85 14.5,69.5 31,77 z m -15,31 7.8,-10.4 3.1,3.5 3.5,3.1 L 20,112 z"/>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/weaponvortex.svg b/gfx/luma/gfx/hud/luma/weaponvortex.svg
deleted file mode 100644 (file)
index 03e75c0..0000000
--- a/gfx/luma/gfx/hud/luma/weaponvortex.svg
+++ /dev/null
@@ -1,5 +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">
-       <path class="vortex shining" d="M 20,112 79,68 75,83 94,57 92,81 C 105,57 110,30 104,24 98,18 71,23 47,36 L 71,34 45,53 60,49 16,108 z M 88,29 c 2.5,-3 12,-3 13,-2 1,1 1,10.5 -2,13 L 30,98 z"/>
-</svg>

diff --git a/gfx/luma/gfx/menu/luma/checkbox_c0.svg b/gfx/luma/gfx/menu/luma/checkbox_c0.svg
index 1d2dad1a2b6b82aac499c9a53c40586d7a35166b..70387bb8492bdc67059bae5cef5dca4fa7896509 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/checkbox_c0.svg
+++ b/gfx/luma/gfx/menu/luma/checkbox_c0.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_c.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="checkbox" d="m 42.5,7 0,34.5 L 12,41.5 7,35 7,13 12,7 z"/>
-       <path class="frame glowing" d="m 11,5 -7,7 0,24 7,7 33,0 L 43.5,16 42,18 41.5,40.5 13,40 9,34.5 9,13.5 13,8 34.5,7.5 36,6 z"/>
+       <path class="checkbox" d="M 42,6 42,40 7,40 7,6 z"/>
+       <path class="frame glowing" d="m 7,5 -3,3 0,32 3,3 33,0 3,-3 -0.5,-25 -2,2 L 40,38 39,39 9,39 8,38 8,9 9,8 33,7.5 l 2,-2 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/checkbox_c1.svg b/gfx/luma/gfx/menu/luma/checkbox_c1.svg
index e6a481714fe63d391054e57dfe2ad2561ec1b2db..b64759e49873e855d75922ab16f8c20da3bd3325 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/checkbox_c1.svg
+++ b/gfx/luma/gfx/menu/luma/checkbox_c1.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_c.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="checkbox" d="m 42.5,7 0,34.5 L 12,41.5 7,35 7,13 12,7 z"/>
-       <path class="frame glowing" d="m 11,5 -7,7 0,24 7,7 33,0 L 43.5,16 42,18 41.5,40.5 13,40 9,34.5 9,13.5 13,8 34.5,7.5 36,6 z"/>
-       <path class="mark blurred" d="m 10,24 3,-3 9,9 L 41.5,6 44,8 22.5,40 z"/>
+       <path class="checkbox" d="M 42,6 42,40 7,40 7,6 z"/>
+       <path class="frame glowing" d="m 7,5 -3,3 0,32 3,3 33,0 3,-3 -0.5,-25 -2,2 L 40,38 39,39 9,39 8,38 8,9 9,8 33,7.5 l 2,-2 z"/>
+       <path class="mark blurred" d="m 9,23 3,-3 9,9 L 40.5,5 43,7 21.5,39 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/checkbox_d0.svg b/gfx/luma/gfx/menu/luma/checkbox_d0.svg
index d183ef9fe11907d9a77ccdcc4d2c526b33284c03..4e841c3218015d57173e65966e5e94d876bb6505 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/checkbox_d0.svg
+++ b/gfx/luma/gfx/menu/luma/checkbox_d0.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_d.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="checkbox" d="m 42.5,7 0,34.5 L 12,41.5 7,35 7,13 12,7 z"/>
-       <path class="frame glowing" d="m 11,5 -7,7 0,24 7,7 33,0 L 43.5,16 42,18 41.5,40.5 13,40 9,34.5 9,13.5 13,8 34.5,7.5 36,6 z"/>
+       <path class="checkbox" d="M 42,6 42,40 7,40 7,6 z"/>
+       <path class="frame glowing" d="m 7,5 -3,3 0,32 3,3 33,0 3,-3 -0.5,-25 -2,2 L 40,38 39,39 9,39 8,38 8,9 9,8 33,7.5 l 2,-2 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/checkbox_d1.svg b/gfx/luma/gfx/menu/luma/checkbox_d1.svg
index 5c6b668b7d126adb6fdc67ebd22b239ef45f9f3a..9a5fd3e7148fa0429bead908328048fa9680c686 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/checkbox_d1.svg
+++ b/gfx/luma/gfx/menu/luma/checkbox_d1.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_d.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="checkbox" d="m 42.5,7 0,34.5 L 12,41.5 7,35 7,13 12,7 z"/>
-       <path class="frame glowing" d="m 11,5 -7,7 0,24 7,7 33,0 L 43.5,16 42,18 41.5,40.5 13,40 9,34.5 9,13.5 13,8 34.5,7.5 36,6 z"/>
-       <path class="mark blurred" d="m 10,24 3,-3 9,9 L 41.5,6 44,8 22.5,40 z"/>
+       <path class="checkbox" d="M 42,6 42,40 7,40 7,6 z"/>
+       <path class="frame glowing" d="m 7,5 -3,3 0,32 3,3 33,0 3,-3 -0.5,-25 -2,2 L 40,38 39,39 9,39 8,38 8,9 9,8 33,7.5 l 2,-2 z"/>
+       <path class="mark blurred" d="m 9,23 3,-3 9,9 L 40.5,5 43,7 21.5,39 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/checkbox_f0.svg b/gfx/luma/gfx/menu/luma/checkbox_f0.svg
index 3c7e8d4e71c560815c67c4f241a6c481e8ded869..c860187cabc1c5440995271ea9f771cee3d9cf22 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/checkbox_f0.svg
+++ b/gfx/luma/gfx/menu/luma/checkbox_f0.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="checkbox" d="m 42.5,7 0,34.5 L 12,41.5 7,35 7,13 12,7 z"/>
-       <path class="frame glowing" d="m 11,5 -7,7 0,24 7,7 33,0 L 43.5,16 42,18 41.5,40.5 13,40 9,34.5 9,13.5 13,8 34.5,7.5 36,6 z"/>
+       <path class="checkbox" d="M 42,6 42,40 7,40 7,6 z"/>
+       <path class="frame glowing" d="m 7,5 -3,3 0,32 3,3 33,0 3,-3 -0.5,-25 -2,2 L 40,38 39,39 9,39 8,38 8,9 9,8 33,7.5 l 2,-2 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/checkbox_f1.svg b/gfx/luma/gfx/menu/luma/checkbox_f1.svg
index 5e940a0e65508138250b567ce6c595380bc41081..6c1a1ca047cf820939a17bb03ec112e37318b039 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/checkbox_f1.svg
+++ b/gfx/luma/gfx/menu/luma/checkbox_f1.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="checkbox" d="m 42.5,7 0,34.5 L 12,41.5 7,35 7,13 12,7 z"/>
-       <path class="frame glowing" d="m 11,5 -7,7 0,24 7,7 33,0 L 43.5,16 42,18 41.5,40.5 13,40 9,34.5 9,13.5 13,8 34.5,7.5 36,6 z"/>
-       <path class="mark blurred" d="m 10,24 3,-3 9,9 L 41.5,6 44,8 22.5,40 z"/>
+       <path class="checkbox" d="M 42,6 42,40 7,40 7,6 z"/>
+       <path class="frame glowing" d="m 7,5 -3,3 0,32 3,3 33,0 3,-3 -0.5,-25 -2,2 L 40,38 39,39 9,39 8,38 8,9 9,8 33,7.5 l 2,-2 z"/>
+       <path class="mark blurred" d="m 9,23 3,-3 9,9 L 40.5,5 43,7 21.5,39 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/checkbox_n0.svg b/gfx/luma/gfx/menu/luma/checkbox_n0.svg
index 9e7d4743f5ab6fb25646fd7e4c834c579831c192..e8e97adfe6eabfcadd3a14d803c8bc0491495765 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/checkbox_n0.svg
+++ b/gfx/luma/gfx/menu/luma/checkbox_n0.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="checkbox" d="m 42.5,7 0,34.5 L 12,41.5 7,35 7,13 12,7 z"/>
-       <path class="frame glowing" d="m 11,5 -7,7 0,24 7,7 33,0 L 43.5,16 42,18 41.5,40.5 13,40 9,34.5 9,13.5 13,8 34.5,7.5 36,6 z"/>
+       <path class="checkbox" d="M 42,6 42,40 7,40 7,6 z"/>
+       <path class="frame glowing" d="m 7,5 -3,3 0,32 3,3 33,0 3,-3 -0.5,-25 -2,2 L 40,38 39,39 9,39 8,38 8,9 9,8 33,7.5 l 2,-2 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/checkbox_n1.svg b/gfx/luma/gfx/menu/luma/checkbox_n1.svg
old mode 100755 (executable)
new mode 100644 (file)
index 3af0645..7622125
--- a/gfx/luma/gfx/menu/luma/checkbox_n1.svg
+++ b/gfx/luma/gfx/menu/luma/checkbox_n1.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="checkbox" d="m 42.5,7 0,34.5 L 12,41.5 7,35 7,13 12,7 z"/>
-       <path class="frame glowing" d="m 11,5 -7,7 0,24 7,7 33,0 L 43.5,16 42,18 41.5,40.5 13,40 9,34.5 9,13.5 13,8 34.5,7.5 36,6 z"/>
-       <path class="mark blurred" d="m 10,24 3,-3 9,9 L 41.5,6 44,8 22.5,40 z"/>
+       <path class="checkbox" d="M 42,6 42,40 7,40 7,6 z"/>
+       <path class="frame glowing" d="m 7,5 -3,3 0,32 3,3 33,0 3,-3 -0.5,-25 -2,2 L 40,38 39,39 9,39 8,38 8,9 9,8 33,7.5 l 2,-2 z"/>
+       <path class="mark blurred" d="m 9,23 3,-3 9,9 L 40.5,5 43,7 21.5,39 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/colorbutton_c.svg b/gfx/luma/gfx/menu/luma/colorbutton_c.svg
old mode 100755 (executable)
new mode 100644 (file)
index 24cbe42..cbf1f8d
--- a/gfx/luma/gfx/menu/luma/colorbutton_c.svg
+++ b/gfx/luma/gfx/menu/luma/colorbutton_c.svg
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_c.css" type="text/css"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
-       <path class="frame blurred" d="M 20.5,4 C 18,4 17,5 16,7 L 1.5,33 C 0,35.7 0,39 1.5,42 L 8,55 c 1,2 2,3 4.5,3 l 231,0 c 2.5,0 3.5,-1 4.5,-3 l 6.5,-13 c 1.5,-3 1.5,-6.3 0,-9 L 240,7 c -1,-2 -2,-3 -4.5,-3 z"/>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
+       <g transform="matrix(1,0,0,0.8846,0,3.6923)">
+               <g class="blurred">
+                       <path class="colorbutton" d="M 49.7,54 57.4,40.1 39.7,10 24.3,10 6.6,40.1 14.3,54 z M 12,58 2,40 22,6 42,6 62,40 52,58 z"/>
+                       <path class="colormark" d="M 47.3,50 52.8,40.1 37.4,14 26.6,14 11.2,40.1 16.7,50 z"/>
+               </g>
+       </g>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/colorbutton_f.svg b/gfx/luma/gfx/menu/luma/colorbutton_f.svg
index 342bcb37e6dc18c4a12165aa9476460c1a198e1d..8bde6f5cfd6639cead7b82207a4269e5d35146f0 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/colorbutton_f.svg
+++ b/gfx/luma/gfx/menu/luma/colorbutton_f.svg
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
-       <path class="button blurred" d="M 20.5,4 C 18,4 17,5 16,7 L 1.5,33 C 0,35.7 0,39 1.5,42 L 8,55 c 1,2 2,3 4.5,3 l 231,0 c 2.5,0 3.5,-1 4.5,-3 l 6.5,-13 c 1.5,-3 1.5,-6.3 0,-9 L 240,7 c -1,-2 -2,-3 -4.5,-3 z"/>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
+       <g transform="matrix(1,0,0,0.8846,0,3.6923)">
+               <g class="blurred">
+                       <path class="colorbutton" d="M 49.7,54 57.4,40.1 39.7,10 24.3,10 6.6,40.1 14.3,54 z M 12,58 2,40 22,6 42,6 62,40 52,58 z"/>
+                       <path class="colormark" d="M 47.3,50 52.8,40.1 37.4,14 26.6,14 11.2,40.1 16.7,50 z"/>
+               </g>
+       </g>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/colorbutton_n.svg b/gfx/luma/gfx/menu/luma/colorbutton_n.svg
old mode 100755 (executable)
new mode 100644 (file)
index 7b66d8d..551c1e9
--- a/gfx/luma/gfx/menu/luma/colorbutton_n.svg
+++ b/gfx/luma/gfx/menu/luma/colorbutton_n.svg
@@ -1,3 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
+<?xml-stylesheet href="common_n.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
+       <g transform="matrix(1,0,0,0.8846,0,3.6923)">
+               <g class="blurred">
+                       <path class="colorbutton" d="M 49.7,54 57.4,40.1 39.7,10 24.3,10 6.6,40.1 14.3,54 z M 12,58 2,40 22,6 42,6 62,40 52,58 z"/>
+                       <path class="colormark" d="M 47.3,50 52.8,40.1 37.4,14 26.6,14 11.2,40.1 16.7,50 z"/>
+               </g>
+       </g>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/common.css b/gfx/luma/gfx/menu/luma/common.css
index 17e1a8d71a5c554a05d5f1f2911c60ee707588c8..2dcd72a96d58d8f330bfee71e085c30c1bdadeef 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/common.css
+++ b/gfx/luma/gfx/menu/luma/common.css
@@ -1,14 +1,13 @@
 /* Backgrounds */
 .background  { fill:#000000; opacity:0.85 }
 .clearbutton { fill:#000000; opacity:0.3 }
-.gametypebg  { fill:#100000; opacity:0.5 }
+.gametypebg  { fill:#000000; opacity:0.5 }
 
 /* Components */
 .checkmark   { fill:#90abc4 }
-.color       { fill:#f7f7f7 }
 .colorpicker { fill:#ffffff }
 .gametype    { fill:#90abc4 }
-.mark        { fill:#ffffff; opacity:0.9 }
+.mark        { fill:#f2fcff; opacity:0.9 }
 .nopreview   { fill:#37628a; opacity:0.75 }
 
 /* Icons */

diff --git a/gfx/luma/gfx/menu/luma/common.filters b/gfx/luma/gfx/menu/luma/common.filters
index fe396332af0818656a9dfcdcfc8054588fe0f45d..c2665818e77bcd79222499d9db10f0d638e1f6ec 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/common.filters
+++ b/gfx/luma/gfx/menu/luma/common.filters
@@ -44,7 +44,7 @@
                                <feMergeNode in="shadow"/>
                                <feMergeNode in="SourceGraphic"/>
                        </feMerge>
-                       <feGaussianBlur stdDeviation="0.2"/>
+                       <feGaussianBlur stdDeviation="0.3"/>
                </filter>
                <filter id="shining" x="-0.5" y="-0.5" width="2" height="2">
                        <feGaussianBlur stdDeviation="8"/>

diff --git a/gfx/luma/gfx/menu/luma/common_c.css b/gfx/luma/gfx/menu/luma/common_c.css
index 0d3d40b3e699af5cd69fb82eb1ab13e531c16241..77b05d6aaedbc233946ad332df61e37354d68af7 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/common_c.css
+++ b/gfx/luma/gfx/menu/luma/common_c.css
@@ -6,7 +6,10 @@
 .dialog      { opacity:0.90; fill:#361a04 }
 .inputbox    { opacity:0.85; fill:url(common_c.gradients#inputbox) }
 .radiobutton { opacity:0.85; fill:url(common_c.gradients#radiobutton) }
+.selection   { fill:#f78f45 }
 
 /* Components */
-.detail  { fill:#f4cda2 }
-.frame   { fill:#eca169 }
+.colorbutton { fill:#ffffff; opacity:0.85 }
+.colormark   { fill:#ffffff }
+.detail      { fill:#f4cda2 }
+.frame       { fill:#eca169 }

diff --git a/gfx/luma/gfx/menu/luma/common_f.css b/gfx/luma/gfx/menu/luma/common_f.css
index 8a8ab578d81d0d4201f32223bdf545fe29da12b9..623020c8ea9c5bcc035c414232260ff0a3fc009f 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/common_f.css
+++ b/gfx/luma/gfx/menu/luma/common_f.css
@@ -7,5 +7,7 @@
 .radiobutton { opacity:0.85; fill:url(common_f.gradients#radiobutton) }
 
 /* Components */
-.detail  { fill:#eaf6fc }
-.frame   { fill:#c0d6e8 }
+.colorbutton { fill:#ffffff; opacity:0.85 }
+.colormark   { fill:#ffffff; opacity:0.4 }
+.detail      { fill:#eaf6fc }
+.frame       { fill:#c0d6e8 }

diff --git a/gfx/luma/gfx/menu/luma/common_n.css b/gfx/luma/gfx/menu/luma/common_n.css
index 5c073beb8f4e7d38ec786c55b418eef331b853d5..68782a068845da5d9275c5087e354722c34963cc 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/common_n.css
+++ b/gfx/luma/gfx/menu/luma/common_n.css
@@ -9,5 +9,7 @@
 .radiobutton { opacity:0.85; fill:url(common_n.gradients#radiobutton) }
 
 /* Components */
-.detail  { fill:#c6e8f8 }
-.frame   { fill:#99c4e5 }
+.colorbutton { fill:#ffffff; opacity:0.75 }
+.colormark   { fill:#ffffff; opacity:0.2 }
+.detail      { fill:#c6e8f8 }
+.frame       { fill:#99c4e5 }

diff --git a/gfx/luma/gfx/menu/luma/crosshairbutton_c.svg b/gfx/luma/gfx/menu/luma/crosshairbutton_c.svg
index d08885ce0669f2130501f72656da5a8a32b6cbd0..436c279fdde064c716bd2281196e0cfe49ad4ee8 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/crosshairbutton_c.svg
+++ b/gfx/luma/gfx/menu/luma/crosshairbutton_c.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_c.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512" height="128">
-       <path class="frame" d="M 24,128 0,104 0,0 l 488,0 24,24 0,104 z"/>
+       <rect class="selection" width="100%" height="100%"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/crosshairbutton_f.svg b/gfx/luma/gfx/menu/luma/crosshairbutton_f.svg
old mode 100755 (executable)
new mode 100644 (file)
index 7cd8e9b..d965903
--- a/gfx/luma/gfx/menu/luma/crosshairbutton_f.svg
+++ b/gfx/luma/gfx/menu/luma/crosshairbutton_f.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512" height="128">
-       <path class="button" d="M 24,128 0,104 0,0 l 488,0 24,24 0,104 z"/>
+       <rect class="button" width="100%" height="100%"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/radiobutton_c0.svg b/gfx/luma/gfx/menu/luma/radiobutton_c0.svg
index e1a5f822295d3a6219f8885e342a38e8aa4ace83..1d72ae313ab708908f9b021836b3270ddfe85eae 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/radiobutton_c0.svg
+++ b/gfx/luma/gfx/menu/luma/radiobutton_c0.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_c.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="radiobutton" d="M 24,5.5 C 13.8,5.5 5.5,13.8 5.5,24 5.5,34.2 13.8,42.5 24,42.5 34.2,42.5 42.5,34.2 42.5,24 42.5,13.8 34.2,5.5 24,5.5 z"/>
-       <path class="frame glowing" d="M 24,4 12,4 4,12 4,24 c 0,11 9,20 20,20 l 12,0 8,-8 0,-12 C 44,13 35,4 24,4 z m 0,3 c 9.4,0 17,7.6 17,17 0,9.4 -7.6,17 -17,17 C 14.6,41 7,33.4 7,24 7,14.6 14.6,7 24,7 z"/>
+       <path class="radiobutton" d="m 18,7 -13.5,23.5 6,10.5 27,0 6,-10.5 L 30,7 z"/>
+       <path class="frame glowing" d="M 16.5,5 2,30.5 9,43 39,43 46,30.5 31.5,5 z m 2,3 11,0 L 42.4,30.5 37,40 11,40 5.6,30.5 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/radiobutton_c1.svg b/gfx/luma/gfx/menu/luma/radiobutton_c1.svg
old mode 100755 (executable)
new mode 100644 (file)
index 40252f5..95c03fd
--- a/gfx/luma/gfx/menu/luma/radiobutton_c1.svg
+++ b/gfx/luma/gfx/menu/luma/radiobutton_c1.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_c.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="radiobutton" d="M 24,5.5 C 13.8,5.5 5.5,13.8 5.5,24 5.5,34.2 13.8,42.5 24,42.5 34.2,42.5 42.5,34.2 42.5,24 42.5,13.8 34.2,5.5 24,5.5 z"/>
-       <path class="frame glowing" d="M 24,4 12,4 4,12 4,24 c 0,11 9,20 20,20 l 12,0 8,-8 0,-12 C 44,13 35,4 24,4 z m 0,3 c 9.4,0 17,7.6 17,17 0,9.4 -7.6,17 -17,17 C 14.6,41 7,33.4 7,24 7,14.6 14.6,7 24,7 z"/>
-       <path class="mark blurred" d="m 24,12 c -6.6,0 -12,5.4 -12,12 0,6.6 5.4,12 12,12 6.6,0 12,-5.4 12,-12 0,-6.6 -5.4,-12 -12,-12 z"/>
+       <path class="radiobutton" d="m 18,7 -13.5,23.5 6,10.5 27,0 6,-10.5 L 30,7 z"/>
+       <path class="frame glowing" d="M 16.5,5 2,30.5 9,43 39,43 46,30.5 31.5,5 z m 2,3 11,0 L 42.4,30.5 37,40 11,40 5.6,30.5 z"/>
+       <path class="mark blurred" d="M 21,13 11,30.5 13.5,35 34.5,35 37,30.5 27,13 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/radiobutton_d0.svg b/gfx/luma/gfx/menu/luma/radiobutton_d0.svg
index 6803b7327e188f6188bbdb30f084e8fe997f9d69..eba25d22e3325b48c3c6e6271174bc0fba836764 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/radiobutton_d0.svg
+++ b/gfx/luma/gfx/menu/luma/radiobutton_d0.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_d.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="radiobutton" d="M 24,5.5 C 13.8,5.5 5.5,13.8 5.5,24 5.5,34.2 13.8,42.5 24,42.5 34.2,42.5 42.5,34.2 42.5,24 42.5,13.8 34.2,5.5 24,5.5 z"/>
-       <path class="frame glowing" d="M 24,4 12,4 4,12 4,24 c 0,11 9,20 20,20 l 12,0 8,-8 0,-12 C 44,13 35,4 24,4 z m 0,3 c 9.4,0 17,7.6 17,17 0,9.4 -7.6,17 -17,17 C 14.6,41 7,33.4 7,24 7,14.6 14.6,7 24,7 z"/>
+       <path class="radiobutton" d="m 18,7 -13.5,23.5 6,10.5 27,0 6,-10.5 L 30,7 z"/>
+       <path class="frame glowing" d="M 16.5,5 2,30.5 9,43 39,43 46,30.5 31.5,5 z m 2,3 11,0 L 42.4,30.5 37,40 11,40 5.6,30.5 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/radiobutton_d1.svg b/gfx/luma/gfx/menu/luma/radiobutton_d1.svg
index 7d3b5199c25f1a382c52206451ecb837ecfcbcb5..c1f4af15b72dd107c218cda44c226c973ab99584 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/radiobutton_d1.svg
+++ b/gfx/luma/gfx/menu/luma/radiobutton_d1.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_d.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="radiobutton" d="M 24,5.5 C 13.8,5.5 5.5,13.8 5.5,24 5.5,34.2 13.8,42.5 24,42.5 34.2,42.5 42.5,34.2 42.5,24 42.5,13.8 34.2,5.5 24,5.5 z"/>
-       <path class="frame glowing" d="M 24,4 12,4 4,12 4,24 c 0,11 9,20 20,20 l 12,0 8,-8 0,-12 C 44,13 35,4 24,4 z m 0,3 c 9.4,0 17,7.6 17,17 0,9.4 -7.6,17 -17,17 C 14.6,41 7,33.4 7,24 7,14.6 14.6,7 24,7 z"/>
-       <path class="mark blurred" d="m 24,12 c -6.6,0 -12,5.4 -12,12 0,6.6 5.4,12 12,12 6.6,0 12,-5.4 12,-12 0,-6.6 -5.4,-12 -12,-12 z"/>
+       <path class="radiobutton" d="m 18,7 -13.5,23.5 6,10.5 27,0 6,-10.5 L 30,7 z"/>
+       <path class="frame glowing" d="M 16.5,5 2,30.5 9,43 39,43 46,30.5 31.5,5 z m 2,3 11,0 L 42.4,30.5 37,40 11,40 5.6,30.5 z"/>
+       <path class="mark blurred" d="M 21,13 11,30.5 13.5,35 34.5,35 37,30.5 27,13 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/radiobutton_f0.svg b/gfx/luma/gfx/menu/luma/radiobutton_f0.svg
index 13d7cc5e8c2b1a42b7b8b0fa876cfd09b3159032..543731e49ac2d5af3aa600bbbe022a4f47280f49 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/radiobutton_f0.svg
+++ b/gfx/luma/gfx/menu/luma/radiobutton_f0.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="radiobutton" d="M 24,5.5 C 13.8,5.5 5.5,13.8 5.5,24 5.5,34.2 13.8,42.5 24,42.5 34.2,42.5 42.5,34.2 42.5,24 42.5,13.8 34.2,5.5 24,5.5 z"/>
-       <path class="frame glowing" d="M 24,4 12,4 4,12 4,24 c 0,11 9,20 20,20 l 12,0 8,-8 0,-12 C 44,13 35,4 24,4 z m 0,3 c 9.4,0 17,7.6 17,17 0,9.4 -7.6,17 -17,17 C 14.6,41 7,33.4 7,24 7,14.6 14.6,7 24,7 z"/>
+       <path class="radiobutton" d="m 18,7 -13.5,23.5 6,10.5 27,0 6,-10.5 L 30,7 z"/>
+       <path class="frame glowing" d="M 16.5,5 2,30.5 9,43 39,43 46,30.5 31.5,5 z m 2,3 11,0 L 42.4,30.5 37,40 11,40 5.6,30.5 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/radiobutton_f1.svg b/gfx/luma/gfx/menu/luma/radiobutton_f1.svg
index cc56a7a976796060fba72fb1d8e01ec8e41c6f6d..13aa5a910b5e898b16241d15a6f011cf1c5de212 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/radiobutton_f1.svg
+++ b/gfx/luma/gfx/menu/luma/radiobutton_f1.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="radiobutton" d="M 24,5.5 C 13.8,5.5 5.5,13.8 5.5,24 5.5,34.2 13.8,42.5 24,42.5 34.2,42.5 42.5,34.2 42.5,24 42.5,13.8 34.2,5.5 24,5.5 z"/>
-       <path class="frame glowing" d="M 24,4 12,4 4,12 4,24 c 0,11 9,20 20,20 l 12,0 8,-8 0,-12 C 44,13 35,4 24,4 z m 0,3 c 9.4,0 17,7.6 17,17 0,9.4 -7.6,17 -17,17 C 14.6,41 7,33.4 7,24 7,14.6 14.6,7 24,7 z"/>
-       <path class="mark blurred" d="m 24,12 c -6.6,0 -12,5.4 -12,12 0,6.6 5.4,12 12,12 6.6,0 12,-5.4 12,-12 0,-6.6 -5.4,-12 -12,-12 z"/>
+       <path class="radiobutton" d="m 18,7 -13.5,23.5 6,10.5 27,0 6,-10.5 L 30,7 z"/>
+       <path class="frame glowing" d="M 16.5,5 2,30.5 9,43 39,43 46,30.5 31.5,5 z m 2,3 11,0 L 42.4,30.5 37,40 11,40 5.6,30.5 z"/>
+       <path class="mark blurred" d="M 21,13 11,30.5 13.5,35 34.5,35 37,30.5 27,13 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/radiobutton_n0.svg b/gfx/luma/gfx/menu/luma/radiobutton_n0.svg
index ff12aa9018d8aa95f8d3c18dc845a424523437d0..d5a191557e5040181b2887ac23694dd27edf9b64 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/radiobutton_n0.svg
+++ b/gfx/luma/gfx/menu/luma/radiobutton_n0.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="radiobutton" d="M 24,5.5 C 13.8,5.5 5.5,13.8 5.5,24 5.5,34.2 13.8,42.5 24,42.5 34.2,42.5 42.5,34.2 42.5,24 42.5,13.8 34.2,5.5 24,5.5 z"/>
-       <path class="frame glowing" d="M 24,4 12,4 4,12 4,24 c 0,11 9,20 20,20 l 12,0 8,-8 0,-12 C 44,13 35,4 24,4 z m 0,3 c 9.4,0 17,7.6 17,17 0,9.4 -7.6,17 -17,17 C 14.6,41 7,33.4 7,24 7,14.6 14.6,7 24,7 z"/>
+       <path class="radiobutton" d="m 18,7 -13.5,23.5 6,10.5 27,0 6,-10.5 L 30,7 z"/>
+       <path class="frame glowing" d="M 16.5,5 2,30.5 9,43 39,43 46,30.5 31.5,5 z m 2,3 11,0 L 42.4,30.5 37,40 11,40 5.6,30.5 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/radiobutton_n1.svg b/gfx/luma/gfx/menu/luma/radiobutton_n1.svg
index 37c40d630d89dc8006130a8accc1eeb7e54e8b70..c061eda485c60bc85403bba5ce8fd0c5a55b8c77 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/radiobutton_n1.svg
+++ b/gfx/luma/gfx/menu/luma/radiobutton_n1.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="48" height="48">
-       <path class="radiobutton" d="M 24,5.5 C 13.8,5.5 5.5,13.8 5.5,24 5.5,34.2 13.8,42.5 24,42.5 34.2,42.5 42.5,34.2 42.5,24 42.5,13.8 34.2,5.5 24,5.5 z"/>
-       <path class="frame glowing" d="M 24,4 12,4 4,12 4,24 c 0,11 9,20 20,20 l 12,0 8,-8 0,-12 C 44,13 35,4 24,4 z m 0,3 c 9.4,0 17,7.6 17,17 0,9.4 -7.6,17 -17,17 C 14.6,41 7,33.4 7,24 7,14.6 14.6,7 24,7 z"/>
-       <path class="mark blurred" d="m 24,12 c -6.6,0 -12,5.4 -12,12 0,6.6 5.4,12 12,12 6.6,0 12,-5.4 12,-12 0,-6.6 -5.4,-12 -12,-12 z"/>
+       <path class="radiobutton" d="m 18,7 -13.5,23.5 6,10.5 27,0 6,-10.5 L 30,7 z"/>
+       <path class="frame glowing" d="M 16.5,5 2,30.5 9,43 39,43 46,30.5 31.5,5 z m 2,3 11,0 L 42.4,30.5 37,40 11,40 5.6,30.5 z"/>
+       <path class="mark blurred" d="M 21,13 11,30.5 13.5,35 34.5,35 37,30.5 27,13 z"/>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/tab_c b/gfx/luma/gfx/menu/luma/tab_c
new file mode 100755 (executable)
index 0000000..ce35832
--- /dev/null
+++ b/gfx/luma/gfx/menu/luma/tab_c
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common_c.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
+       <path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
+       <g class="glowing">
+               <path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
+               <path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
+       </g>
+</svg>

diff --git a/gfx/luma/gfx/menu/luma/tab_c.svg b/gfx/luma/gfx/menu/luma/tab_c.svg
deleted file mode 100755 (executable)
index ce35832..0000000
--- a/gfx/luma/gfx/menu/luma/tab_c.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="common_c.css" type="text/css"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
-       <path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
-       <g class="glowing">
-               <path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
-               <path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
-       </g>
-</svg>

diff --git a/gfx/luma/gfx/menu/luma/tab_d b/gfx/luma/gfx/menu/luma/tab_d
new file mode 100755 (executable)
index 0000000..6f22a76
--- /dev/null
+++ b/gfx/luma/gfx/menu/luma/tab_d
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common_d.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
+       <path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
+       <g class="glowing">
+               <path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
+               <path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
+       </g>
+</svg>

diff --git a/gfx/luma/gfx/menu/luma/tab_d.svg b/gfx/luma/gfx/menu/luma/tab_d.svg
deleted file mode 100755 (executable)
index 6f22a76..0000000
--- a/gfx/luma/gfx/menu/luma/tab_d.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="common_d.css" type="text/css"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
-       <path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
-       <g class="glowing">
-               <path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
-               <path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
-       </g>
-</svg>

diff --git a/gfx/luma/gfx/menu/luma/tab_f b/gfx/luma/gfx/menu/luma/tab_f
new file mode 100755 (executable)
index 0000000..9d9fadf
--- /dev/null
+++ b/gfx/luma/gfx/menu/luma/tab_f
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common_f.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
+       <path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
+       <g class="glowing">
+               <path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
+               <path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
+       </g>
+</svg>

diff --git a/gfx/luma/gfx/menu/luma/tab_f.svg b/gfx/luma/gfx/menu/luma/tab_f.svg
deleted file mode 100755 (executable)
index 9d9fadf..0000000
--- a/gfx/luma/gfx/menu/luma/tab_f.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="common_f.css" type="text/css"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
-       <path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
-       <g class="glowing">
-               <path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
-               <path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
-       </g>
-</svg>

diff --git a/gfx/luma/gfx/menu/luma/tab_n b/gfx/luma/gfx/menu/luma/tab_n
new file mode 100755 (executable)
index 0000000..30a0f0b
--- /dev/null
+++ b/gfx/luma/gfx/menu/luma/tab_n
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common_n.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
+       <path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
+       <g class="glowing">
+               <path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
+               <path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
+       </g>
+</svg>

diff --git a/gfx/luma/gfx/menu/luma/tab_n.svg b/gfx/luma/gfx/menu/luma/tab_n.svg
deleted file mode 100755 (executable)
index 30a0f0b..0000000
--- a/gfx/luma/gfx/menu/luma/tab_n.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="common_n.css" type="text/css"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
-       <path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
-       <g class="glowing">
-               <path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
-               <path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
-       </g>
-</svg>

diff --git a/gfx/luma/gfx/scoreboard/common.filters b/gfx/luma/gfx/scoreboard/common.filters
index 9a29e9e780a8909b04e623f7dff9870c75fc8cca..bcb9c276337a3b86c0e0c32b7d487dfcd1060445 100755 (executable)
--- a/gfx/luma/gfx/scoreboard/common.filters
+++ b/gfx/luma/gfx/scoreboard/common.filters
@@ -2,9 +2,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1">
        <defs>
                <filter id="strongblurred" x="-0.5" y="-0.5" width="2" height="2">
-                       <feGaussianBlur stdDeviation="2.5"/>
+                       <feGaussianBlur stdDeviation="2"/>
                        <feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 2 0"/>
-                       <feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.6 0"/>
+                       <feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.8 0"/>
                </filter>
                <filter id="weakblurred" x="-0.5" y="-0.5" width="2" height="2">
                        <feGaussianBlur stdDeviation="0.2"/>

diff --git a/gfx/luma/models/items/common.css b/gfx/luma/models/items/common.css
index 7d24de9a6ae5718df4d90c40022cd5af3fd12ed3..7eaade3ac35cad9f7a9a1b9a5fcf6531a7453729 100755 (executable)
--- a/gfx/luma/models/items/common.css
+++ b/gfx/luma/models/items/common.css
@@ -9,7 +9,7 @@
 .fuel    { fill:#f8d760 }
 .plasma  { fill:#e38ded }
 .rockets { fill:#d79064 }
-.shells  { fill:#919da9 }
+.shells  { fill:#929fa8 }
 
 /* Powerups */
 .detonator    { fill:#db8247 }

diff --git a/gfx/luma/models/weapons/common.css b/gfx/luma/models/weapons/common.css
index 53a8e2a506ff6b58dff29f7dd146f2328fd9943b..ded1ea1f0ca1a8dae1250169e97cd62fc5ab45c6 100755 (executable)
--- a/gfx/luma/models/weapons/common.css
+++ b/gfx/luma/models/weapons/common.css
@@ -2,23 +2,22 @@
 .arc             { fill:#6ce820 }
 .crylink         { fill:#d261e0 }
 .electro         { fill:#5598e9 }
-.fireball        { fill:#db8247 }
+.fireball        { fill:#db7147 }
 .grenadelauncher { fill:#f85e46 }
 .hagar           { fill:#db8247 }
-.hlac            { fill:#db8247 }
+.hlac            { fill:#dc8742 }
 .hook            { fill:#6ce820 }
 .laser           { fill:#f35d68 }
 .minelayer       { fill:#f85e46 }
+.minstanex       { fill:#857bca }
 .nex             { fill:#50b1c5 }
 .porto           { fill:#5598e9 }
 .rifle           { fill:#db8247 }
 .rocketlauncher  { fill:#c49f3c }
 .seeker          { fill:#f35d68 }
 .shockwave       { fill:#53b871 }
-.shotgun         { fill:#80909e }
+.shotgun         { fill:#8397a3 }
 .tuba            { fill:#c49f3c }
-.vaporizer       { fill:#857bca }
-.vortex          { fill:#50b1c5 }
 
 /* Filters */
 .shining { filter:url(common.filters#shining) }

diff --git a/gfx/luma/models/weapons/g_campingrifle_luma.svg b/gfx/luma/models/weapons/g_campingrifle_luma.svg
index aa5cf25b3e5e6a4a9fe4266941733ee760a42eb8..9c3c6502d83fe062549d64bac084126f914f226a 100644 (file)
--- a/gfx/luma/models/weapons/g_campingrifle_luma.svg
+++ b/gfx/luma/models/weapons/g_campingrifle_luma.svg
@@ -3,6 +3,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
        <g class="rifle shining">
                <path d="M 37.6,187.1 27.2,193.1 C 48.6,226.2 85.7,248 128,248 c 42.3,0 79.4,-21.8 100.8,-54.9 l -10.4,-6 c -5,7.7 -11,14.7 -17.8,20.9 l -15.4,-2.8 C 169.2,217 149.4,224 128,224 106.6,224 86.8,217 70.9,205.2 l -15.4,2.8 C 48.7,201.8 42.7,194.8 37.6,187.1 z M 122,8.1 C 34.7,13 -18.3,104.7 21.2,182.7 l 10.4,-6 c -4.1,-8.2 -7.2,-16.9 -9.2,-25.9 l 10.2,-12 C 27.8,96.8 51,56.7 89.7,39.9 L 95,25.1 c 8.7,-2.8 17.8,-4.5 27,-5 z M 234.8,182.7 C 274.3,104.7 221.3,13 134,8.1 l 0,12.1 c 9.2,0.5 18.3,2.2 27,5 l 5.3,14.8 c 38.7,16.8 61.9,57 57.1,98.9 l 10.2,12 c -1.9,9 -5,17.7 -9.2,25.9 z"/>
-               <path transform="matrix(1.45,0,0,1.45,32,39)" 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"/>
+               <path transform="matrix(1.4,0,0,1.4,33,41)" 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"/>
        </g>
 </svg>

diff --git a/gfx/luma/models/weapons/g_minstanex_luma.svg b/gfx/luma/models/weapons/g_minstanex_luma.svg
index 5c844ffb993361ca9bd3b7877386546d4e51589b..e478d5da5c111cf9fac220e79f0921a1a4808b05 100644 (file)
--- a/gfx/luma/models/weapons/g_minstanex_luma.svg
+++ b/gfx/luma/models/weapons/g_minstanex_luma.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
-       <g class="vaporizer shining">
+       <g class="minstanex shining">
                <path d="M 37.6,187.1 27.2,193.1 C 48.6,226.2 85.7,248 128,248 c 42.3,0 79.4,-21.8 100.8,-54.9 l -10.4,-6 c -5,7.7 -11,14.7 -17.8,20.9 l -15.4,-2.8 C 169.2,217 149.4,224 128,224 106.6,224 86.8,217 70.9,205.2 l -15.4,2.8 C 48.7,201.8 42.7,194.8 37.6,187.1 z M 122,8.1 C 34.7,13 -18.3,104.7 21.2,182.7 l 10.4,-6 c -4.1,-8.2 -7.2,-16.9 -9.2,-25.9 l 10.2,-12 C 27.8,96.8 51,56.7 89.7,39.9 L 95,25.1 c 8.7,-2.8 17.8,-4.5 27,-5 z M 234.8,182.7 C 274.3,104.7 221.3,13 134,8.1 l 0,12.1 c 9.2,0.5 18.3,2.2 27,5 l 5.3,14.8 c 38.7,16.8 61.9,57 57.1,98.9 l 10.2,12 c -1.9,9 -5,17.7 -9.2,25.9 z"/>
                <path transform="matrix(1.45,0,0,1.45,36,32)" d="M 46.5,58 C 36.2,55.6 36.3,63.9 42.2,72.9 L 60,49 45,53 71,34 47,36 c 24,-13 51,-18 57,-12 6,6 1,33 -12,57 L 94,57 75,83 79,68 55.1,85.8 c 9,5.9 17.3,6 14.9,-4.3 C 78.5,98.5 63,103 44,84 25,65 29.5,49.5 46.5,58 z M 49.6,81.5 99,40 c 3,-2.5 3,-12 2,-13 -1,-1 -10.5,-1 -13,2 L 46.5,78.4 z M 31,77 c -8.9,-2.1 -8.4,5.8 -2.3,14 L 36.8,80.2 41,85 32.5,95.5 43,87.1 47.8,91.3 37,99.4 c 8.2,6 16.1,6.5 14,-2.4 7.5,16.5 -8,16 -22,2 C 15,85 14.5,69.5 31,77 z m -15,31 7.8,-10.4 3.1,3.5 3.5,3.1 L 20,112 z"/>
        </g>

diff --git a/gfx/luma/models/weapons/g_vaporizer_luma.svg b/gfx/luma/models/weapons/g_vaporizer_luma.svg
deleted file mode 100644 (file)
index 5c844ff..0000000
--- a/gfx/luma/models/weapons/g_vaporizer_luma.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="256" height="256" version="1.1">
-       <g class="vaporizer shining">
-               <path d="M 37.6,187.1 27.2,193.1 C 48.6,226.2 85.7,248 128,248 c 42.3,0 79.4,-21.8 100.8,-54.9 l -10.4,-6 c -5,7.7 -11,14.7 -17.8,20.9 l -15.4,-2.8 C 169.2,217 149.4,224 128,224 106.6,224 86.8,217 70.9,205.2 l -15.4,2.8 C 48.7,201.8 42.7,194.8 37.6,187.1 z M 122,8.1 C 34.7,13 -18.3,104.7 21.2,182.7 l 10.4,-6 c -4.1,-8.2 -7.2,-16.9 -9.2,-25.9 l 10.2,-12 C 27.8,96.8 51,56.7 89.7,39.9 L 95,25.1 c 8.7,-2.8 17.8,-4.5 27,-5 z M 234.8,182.7 C 274.3,104.7 221.3,13 134,8.1 l 0,12.1 c 9.2,0.5 18.3,2.2 27,5 l 5.3,14.8 c 38.7,16.8 61.9,57 57.1,98.9 l 10.2,12 c -1.9,9 -5,17.7 -9.2,25.9 z"/>
-               <path transform="matrix(1.45,0,0,1.45,36,32)" d="M 46.5,58 C 36.2,55.6 36.3,63.9 42.2,72.9 L 60,49 45,53 71,34 47,36 c 24,-13 51,-18 57,-12 6,6 1,33 -12,57 L 94,57 75,83 79,68 55.1,85.8 c 9,5.9 17.3,6 14.9,-4.3 C 78.5,98.5 63,103 44,84 25,65 29.5,49.5 46.5,58 z M 49.6,81.5 99,40 c 3,-2.5 3,-12 2,-13 -1,-1 -10.5,-1 -13,2 L 46.5,78.4 z M 31,77 c -8.9,-2.1 -8.4,5.8 -2.3,14 L 36.8,80.2 41,85 32.5,95.5 43,87.1 47.8,91.3 37,99.4 c 8.2,6 16.1,6.5 14,-2.4 7.5,16.5 -8,16 -22,2 C 15,85 14.5,69.5 31,77 z m -15,31 7.8,-10.4 3.1,3.5 3.5,3.1 L 20,112 z"/>
-       </g>
-</svg>

diff --git a/gfx/luma/models/weapons/g_vortex_luma.svg b/gfx/luma/models/weapons/g_vortex_luma.svg
deleted file mode 100644 (file)
index f106dd7..0000000
--- a/gfx/luma/models/weapons/g_vortex_luma.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="256" height="256" version="1.1">
-       <g class="vortex shining">
-               <path d="M 37.6,187.1 27.2,193.1 C 48.6,226.2 85.7,248 128,248 c 42.3,0 79.4,-21.8 100.8,-54.9 l -10.4,-6 c -5,7.7 -11,14.7 -17.8,20.9 l -15.4,-2.8 C 169.2,217 149.4,224 128,224 106.6,224 86.8,217 70.9,205.2 l -15.4,2.8 C 48.7,201.8 42.7,194.8 37.6,187.1 z M 122,8.1 C 34.7,13 -18.3,104.7 21.2,182.7 l 10.4,-6 c -4.1,-8.2 -7.2,-16.9 -9.2,-25.9 l 10.2,-12 C 27.8,96.8 51,56.7 89.7,39.9 L 95,25.1 c 8.7,-2.8 17.8,-4.5 27,-5 z M 234.8,182.7 C 274.3,104.7 221.3,13 134,8.1 l 0,12.1 c 9.2,0.5 18.3,2.2 27,5 l 5.3,14.8 c 38.7,16.8 61.9,57 57.1,98.9 l 10.2,12 c -1.9,9 -5,17.7 -9.2,25.9 z"/>
-               <path transform="matrix(1.45,0,0,1.45,36,32)" d="M 20,112 79,68 75,83 94,57 92,81 C 105,57 110,30 104,24 98,18 71,23 47,36 L 71,34 45,53 60,49 16,108 z M 88,29 c 2.5,-3 12,-3 13,-2 1,1 1,10.5 -2,13 L 30,98 z"/>
-       </g>
-</svg>