Update Luma sourcefiles and two new Luminos files

diff --git a/gfx/luma/gfx/hud/luma/common.css b/gfx/luma/gfx/hud/luma/common.css
index 5b11795294680fa63fb22731316dd198323b3f0b..ada24ec205d8fafd3687f5bd3c90098fab1f9609 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/common.css
+++ b/gfx/luma/gfx/hud/luma/common.css
@@ -49,12 +49,6 @@
 .keepaway { fill:#89aac3 }
 .ball     { fill:#89aac3 }
 
-/* Nades */
-.nade_default { fill:#77b38a }
-.nade_heal    { fill:#fd7865 }
-.nade_ice     { fill:#75c3d5 }
-.nade_napalm  { fill:#e39160 }
-
 /* Notifications */
 .camping      { fill:#81f13d }
 .death        { fill:#89aac3 }

diff --git a/gfx/luma/gfx/hud/luma/nade_bg.svg b/gfx/luma/gfx/hud/luma/nade_bg.svg
deleted file mode 100644 (file)
index be0ffbb..0000000
--- a/gfx/luma/gfx/hud/luma/nade_bg.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="1" height="1" version="1.1">
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/nade_heal.svg b/gfx/luma/gfx/hud/luma/nade_heal.svg
new file mode 100644 (file)
index 0000000..9eb328a
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/nade_heal.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 fill="#fd7865" class="shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/nade_ice.svg b/gfx/luma/gfx/hud/luma/nade_ice.svg
new file mode 100644 (file)
index 0000000..a9e3f0f
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/nade_ice.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 fill="#75c3d5" class="shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/nade_monster.svg b/gfx/luma/gfx/hud/luma/nade_monster.svg
new file mode 100644 (file)
index 0000000..b25c454
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/nade_monster.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 fill="#83e349" class="shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/nade_napalm.svg b/gfx/luma/gfx/hud/luma/nade_napalm.svg
new file mode 100644 (file)
index 0000000..5acf8b3
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/nade_napalm.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 fill="#e39160" class="shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/nade_nbg.svg b/gfx/luma/gfx/hud/luma/nade_nbg.svg
deleted file mode 100644 (file)
index 6a591d4..0000000
--- a/gfx/luma/gfx/hud/luma/nade_nbg.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="nades shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/nade_normal.svg b/gfx/luma/gfx/hud/luma/nade_normal.svg
new file mode 100644 (file)
index 0000000..d2186dc
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/nade_normal.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 fill="#8fb09a" class="shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/nade_spawn.svg b/gfx/luma/gfx/hud/luma/nade_spawn.svg
new file mode 100644 (file)
index 0000000..507baf4
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/nade_spawn.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 fill="#e3c360" class="shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/nade_translocate.svg b/gfx/luma/gfx/hud/luma/nade_translocate.svg
new file mode 100644 (file)
index 0000000..c1c16d7
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/nade_translocate.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 fill="#e478ea" class="shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
+</svg>

diff --git a/gfx/luma/gfx/hud/luma/notify_nade.svg b/gfx/luma/gfx/hud/luma/notify_nade.svg
deleted file mode 100644 (file)
index 38ae28a..0000000
--- a/gfx/luma/gfx/hud/luma/notify_nade.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="nade_default shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/notify_nade_heal.svg b/gfx/luma/gfx/hud/luma/notify_nade_heal.svg
deleted file mode 100755 (executable)
index 200348f..0000000
--- a/gfx/luma/gfx/hud/luma/notify_nade_heal.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="nade_heal shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/notify_nade_ice.svg b/gfx/luma/gfx/hud/luma/notify_nade_ice.svg
deleted file mode 100644 (file)
index 4e7245c..0000000
--- a/gfx/luma/gfx/hud/luma/notify_nade_ice.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="nade_ice shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
-</svg>

diff --git a/gfx/luma/gfx/hud/luma/notify_nade_napalm.svg b/gfx/luma/gfx/hud/luma/notify_nade_napalm.svg
deleted file mode 100644 (file)
index 8afe3a6..0000000
--- a/gfx/luma/gfx/hud/luma/notify_nade_napalm.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="nade_napalm shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
-</svg>

diff --git a/gfx/luma/gfx/menu/luminos/icon_mod_instagib b/gfx/luma/gfx/menu/luminos/icon_mod_instagib
deleted file mode 100644 (file)
index 14b935e..0000000
--- a/gfx/luma/gfx/menu/luminos/icon_mod_instagib
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32">
-       <defs>
-               <filter id="shadowed" x="-0.5" y="-0.5" width="2" height="2">
-                       <feGaussianBlur stdDeviation="1.5" in="SourceAlpha"/>
-                       <feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0" result="shadow"/>
-                       <feMerge>
-                               <feMergeNode in="shadow"/>
-                               <feMergeNode in="SourceGraphic"/>
-                       </feMerge>
-                       <feGaussianBlur stdDeviation="0.3"/>
-               </filter>
-       </defs>
-       <g opacity="0.6667">
-               <path fill="#eee" filter="url(#shadowed)" d="M 16,3 A 13,13 0 0 0 3,16 13,13 0 0 0 16,29 13,13 0 0 0 29,16 13,13 0 0 0 16,3 Z m 0,2.5 A 10.5,10.5 0 0 1 26.5,16 10.5,10.5 0 0 1 16,26.5 10.5,10.5 0 0 1 5.5,16 10.5,10.5 0 0 1 16,5.5 Z m 0,8.5 a 2,2 0 0 0 -2,2 2,2 0 0 0 2,2 2,2 0 0 0 2,-2 2,2 0 0 0 -2,-2 z"/>
-       </g>
-</svg>

diff --git a/gfx/luminos/hud/nade_normal.xcf b/gfx/luminos/hud/nade_normal.xcf
new file mode 100644 (file)
index 0000000..915efdd
Binary files /dev/null and b/gfx/luminos/hud/nade_normal.xcf differ

diff --git a/gfx/luminos/menu/icon_mod_instagib.svg b/gfx/luminos/menu/icon_mod_instagib.svg
new file mode 100644 (file)
index 0000000..14b935e
--- /dev/null
+++ b/gfx/luminos/menu/icon_mod_instagib.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32">
+       <defs>
+               <filter id="shadowed" x="-0.5" y="-0.5" width="2" height="2">
+                       <feGaussianBlur stdDeviation="1.5" in="SourceAlpha"/>
+                       <feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0" result="shadow"/>
+                       <feMerge>
+                               <feMergeNode in="shadow"/>
+                               <feMergeNode in="SourceGraphic"/>
+                       </feMerge>
+                       <feGaussianBlur stdDeviation="0.3"/>
+               </filter>
+       </defs>
+       <g opacity="0.6667">
+               <path fill="#eee" filter="url(#shadowed)" d="M 16,3 A 13,13 0 0 0 3,16 13,13 0 0 0 16,29 13,13 0 0 0 29,16 13,13 0 0 0 16,3 Z m 0,2.5 A 10.5,10.5 0 0 1 26.5,16 10.5,10.5 0 0 1 16,26.5 10.5,10.5 0 0 1 5.5,16 10.5,10.5 0 0 1 16,5.5 Z m 0,8.5 a 2,2 0 0 0 -2,2 2,2 0 0 0 2,2 2,2 0 0 0 2,-2 2,2 0 0 0 -2,-2 z"/>
+       </g>
+</svg>