From: Severin Meyer Date: Thu, 25 Sep 2014 21:12:12 +0000 (+0200) Subject: Update Luma sourcefiles X-Git-Tag: xonotic-v0.8.1~6^2~11 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64702d8419875f16aa42f71680f0e07a057b9a6f;p=xonotic%2Fmediasource.git Update Luma sourcefiles --- diff --git a/gfx/luma/gfx/hud/luma/common.css b/gfx/luma/gfx/hud/luma/common.css index 8f738a6..5e64f30 100755 --- 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 index f930de8..0000000 --- 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 index 0000000..f69f0f9 --- /dev/null +++ b/gfx/luma/gfx/hud/luma/weaponminstanex.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gfx/luma/gfx/hud/luma/weaponvaporizer.svg b/gfx/luma/gfx/hud/luma/weaponvaporizer.svg deleted file mode 100644 index 1b3e565..0000000 --- a/gfx/luma/gfx/hud/luma/weaponvaporizer.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/gfx/luma/gfx/hud/luma/weaponvortex.svg b/gfx/luma/gfx/hud/luma/weaponvortex.svg deleted file mode 100644 index 03e75c0..0000000 --- a/gfx/luma/gfx/hud/luma/weaponvortex.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/gfx/luma/gfx/menu/luma/checkbox_c0.svg b/gfx/luma/gfx/menu/luma/checkbox_c0.svg index 1d2dad1..70387bb 100755 --- a/gfx/luma/gfx/menu/luma/checkbox_c0.svg +++ b/gfx/luma/gfx/menu/luma/checkbox_c0.svg @@ -1,6 +1,6 @@ - - + + diff --git a/gfx/luma/gfx/menu/luma/checkbox_c1.svg b/gfx/luma/gfx/menu/luma/checkbox_c1.svg index e6a4817..b64759e 100755 --- a/gfx/luma/gfx/menu/luma/checkbox_c1.svg +++ b/gfx/luma/gfx/menu/luma/checkbox_c1.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/gfx/luma/gfx/menu/luma/checkbox_d0.svg b/gfx/luma/gfx/menu/luma/checkbox_d0.svg index d183ef9..4e841c3 100755 --- a/gfx/luma/gfx/menu/luma/checkbox_d0.svg +++ b/gfx/luma/gfx/menu/luma/checkbox_d0.svg @@ -1,6 +1,6 @@ - - + + diff --git a/gfx/luma/gfx/menu/luma/checkbox_d1.svg b/gfx/luma/gfx/menu/luma/checkbox_d1.svg index 5c6b668..9a5fd3e 100755 --- a/gfx/luma/gfx/menu/luma/checkbox_d1.svg +++ b/gfx/luma/gfx/menu/luma/checkbox_d1.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/gfx/luma/gfx/menu/luma/checkbox_f0.svg b/gfx/luma/gfx/menu/luma/checkbox_f0.svg index 3c7e8d4..c860187 100755 --- a/gfx/luma/gfx/menu/luma/checkbox_f0.svg +++ b/gfx/luma/gfx/menu/luma/checkbox_f0.svg @@ -1,6 +1,6 @@ - - + + diff --git a/gfx/luma/gfx/menu/luma/checkbox_f1.svg b/gfx/luma/gfx/menu/luma/checkbox_f1.svg index 5e940a0..6c1a1ca 100755 --- a/gfx/luma/gfx/menu/luma/checkbox_f1.svg +++ b/gfx/luma/gfx/menu/luma/checkbox_f1.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/gfx/luma/gfx/menu/luma/checkbox_n0.svg b/gfx/luma/gfx/menu/luma/checkbox_n0.svg index 9e7d474..e8e97ad 100755 --- a/gfx/luma/gfx/menu/luma/checkbox_n0.svg +++ b/gfx/luma/gfx/menu/luma/checkbox_n0.svg @@ -1,6 +1,6 @@ - - + + diff --git a/gfx/luma/gfx/menu/luma/checkbox_n1.svg b/gfx/luma/gfx/menu/luma/checkbox_n1.svg old mode 100755 new mode 100644 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 @@ - - - + + + diff --git a/gfx/luma/gfx/menu/luma/colorbutton_c.svg b/gfx/luma/gfx/menu/luma/colorbutton_c.svg old mode 100755 new mode 100644 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 @@ - - + + + + + + + diff --git a/gfx/luma/gfx/menu/luma/colorbutton_f.svg b/gfx/luma/gfx/menu/luma/colorbutton_f.svg index 342bcb3..8bde6f5 100755 --- a/gfx/luma/gfx/menu/luma/colorbutton_f.svg +++ b/gfx/luma/gfx/menu/luma/colorbutton_f.svg @@ -1,5 +1,10 @@ - - + + + + + + + diff --git a/gfx/luma/gfx/menu/luma/colorbutton_n.svg b/gfx/luma/gfx/menu/luma/colorbutton_n.svg old mode 100755 new mode 100644 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 @@ - + + + + + + + + diff --git a/gfx/luma/gfx/menu/luma/common.css b/gfx/luma/gfx/menu/luma/common.css index 17e1a8d..2dcd72a 100755 --- 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 fe39633..c266581 100755 --- a/gfx/luma/gfx/menu/luma/common.filters +++ b/gfx/luma/gfx/menu/luma/common.filters @@ -44,7 +44,7 @@ - + diff --git a/gfx/luma/gfx/menu/luma/common_c.css b/gfx/luma/gfx/menu/luma/common_c.css index 0d3d40b..77b05d6 100755 --- 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 8a8ab57..623020c 100755 --- 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 5c073be..68782a0 100755 --- 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 d08885c..436c279 100755 --- a/gfx/luma/gfx/menu/luma/crosshairbutton_c.svg +++ b/gfx/luma/gfx/menu/luma/crosshairbutton_c.svg @@ -1,5 +1,5 @@ - + diff --git a/gfx/luma/gfx/menu/luma/crosshairbutton_f.svg b/gfx/luma/gfx/menu/luma/crosshairbutton_f.svg old mode 100755 new mode 100644 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 @@ - + diff --git a/gfx/luma/gfx/menu/luma/radiobutton_c0.svg b/gfx/luma/gfx/menu/luma/radiobutton_c0.svg index e1a5f82..1d72ae3 100755 --- a/gfx/luma/gfx/menu/luma/radiobutton_c0.svg +++ b/gfx/luma/gfx/menu/luma/radiobutton_c0.svg @@ -1,6 +1,6 @@ - - + + diff --git a/gfx/luma/gfx/menu/luma/radiobutton_c1.svg b/gfx/luma/gfx/menu/luma/radiobutton_c1.svg old mode 100755 new mode 100644 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 @@ - - - + + + diff --git a/gfx/luma/gfx/menu/luma/radiobutton_d0.svg b/gfx/luma/gfx/menu/luma/radiobutton_d0.svg index 6803b73..eba25d2 100755 --- a/gfx/luma/gfx/menu/luma/radiobutton_d0.svg +++ b/gfx/luma/gfx/menu/luma/radiobutton_d0.svg @@ -1,6 +1,6 @@ - - + + diff --git a/gfx/luma/gfx/menu/luma/radiobutton_d1.svg b/gfx/luma/gfx/menu/luma/radiobutton_d1.svg index 7d3b519..c1f4af1 100755 --- a/gfx/luma/gfx/menu/luma/radiobutton_d1.svg +++ b/gfx/luma/gfx/menu/luma/radiobutton_d1.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/gfx/luma/gfx/menu/luma/radiobutton_f0.svg b/gfx/luma/gfx/menu/luma/radiobutton_f0.svg index 13d7cc5..543731e 100755 --- a/gfx/luma/gfx/menu/luma/radiobutton_f0.svg +++ b/gfx/luma/gfx/menu/luma/radiobutton_f0.svg @@ -1,6 +1,6 @@ - - + + diff --git a/gfx/luma/gfx/menu/luma/radiobutton_f1.svg b/gfx/luma/gfx/menu/luma/radiobutton_f1.svg index cc56a7a..13aa5a9 100755 --- a/gfx/luma/gfx/menu/luma/radiobutton_f1.svg +++ b/gfx/luma/gfx/menu/luma/radiobutton_f1.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/gfx/luma/gfx/menu/luma/radiobutton_n0.svg b/gfx/luma/gfx/menu/luma/radiobutton_n0.svg index ff12aa9..d5a1915 100755 --- a/gfx/luma/gfx/menu/luma/radiobutton_n0.svg +++ b/gfx/luma/gfx/menu/luma/radiobutton_n0.svg @@ -1,6 +1,6 @@ - - + + diff --git a/gfx/luma/gfx/menu/luma/radiobutton_n1.svg b/gfx/luma/gfx/menu/luma/radiobutton_n1.svg index 37c40d6..c061eda 100755 --- a/gfx/luma/gfx/menu/luma/radiobutton_n1.svg +++ b/gfx/luma/gfx/menu/luma/radiobutton_n1.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/gfx/luma/gfx/menu/luma/tab_c b/gfx/luma/gfx/menu/luma/tab_c new file mode 100755 index 0000000..ce35832 --- /dev/null +++ b/gfx/luma/gfx/menu/luma/tab_c @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gfx/luma/gfx/menu/luma/tab_c.svg b/gfx/luma/gfx/menu/luma/tab_c.svg deleted file mode 100755 index ce35832..0000000 --- a/gfx/luma/gfx/menu/luma/tab_c.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/gfx/luma/gfx/menu/luma/tab_d b/gfx/luma/gfx/menu/luma/tab_d new file mode 100755 index 0000000..6f22a76 --- /dev/null +++ b/gfx/luma/gfx/menu/luma/tab_d @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gfx/luma/gfx/menu/luma/tab_d.svg b/gfx/luma/gfx/menu/luma/tab_d.svg deleted file mode 100755 index 6f22a76..0000000 --- a/gfx/luma/gfx/menu/luma/tab_d.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/gfx/luma/gfx/menu/luma/tab_f b/gfx/luma/gfx/menu/luma/tab_f new file mode 100755 index 0000000..9d9fadf --- /dev/null +++ b/gfx/luma/gfx/menu/luma/tab_f @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gfx/luma/gfx/menu/luma/tab_f.svg b/gfx/luma/gfx/menu/luma/tab_f.svg deleted file mode 100755 index 9d9fadf..0000000 --- a/gfx/luma/gfx/menu/luma/tab_f.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/gfx/luma/gfx/menu/luma/tab_n b/gfx/luma/gfx/menu/luma/tab_n new file mode 100755 index 0000000..30a0f0b --- /dev/null +++ b/gfx/luma/gfx/menu/luma/tab_n @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gfx/luma/gfx/menu/luma/tab_n.svg b/gfx/luma/gfx/menu/luma/tab_n.svg deleted file mode 100755 index 30a0f0b..0000000 --- a/gfx/luma/gfx/menu/luma/tab_n.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/gfx/luma/gfx/scoreboard/common.filters b/gfx/luma/gfx/scoreboard/common.filters index 9a29e9e..bcb9c27 100755 --- a/gfx/luma/gfx/scoreboard/common.filters +++ b/gfx/luma/gfx/scoreboard/common.filters @@ -2,9 +2,9 @@ - + - + diff --git a/gfx/luma/models/items/common.css b/gfx/luma/models/items/common.css index 7d24de9..7eaade3 100755 --- 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 53a8e2a..ded1ea1 100755 --- 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 aa5cf25..9c3c650 100644 --- a/gfx/luma/models/weapons/g_campingrifle_luma.svg +++ b/gfx/luma/models/weapons/g_campingrifle_luma.svg @@ -3,6 +3,6 @@ - + diff --git a/gfx/luma/models/weapons/g_minstanex_luma.svg b/gfx/luma/models/weapons/g_minstanex_luma.svg index 5c844ff..e478d5d 100644 --- a/gfx/luma/models/weapons/g_minstanex_luma.svg +++ b/gfx/luma/models/weapons/g_minstanex_luma.svg @@ -1,7 +1,7 @@ - + diff --git a/gfx/luma/models/weapons/g_vaporizer_luma.svg b/gfx/luma/models/weapons/g_vaporizer_luma.svg deleted file mode 100644 index 5c844ff..0000000 --- a/gfx/luma/models/weapons/g_vaporizer_luma.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/gfx/luma/models/weapons/g_vortex_luma.svg b/gfx/luma/models/weapons/g_vortex_luma.svg deleted file mode 100644 index f106dd7..0000000 --- a/gfx/luma/models/weapons/g_vortex_luma.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - -