Merge branch 'master' into 'master'
Darth Predator [11-17-16 - 15:01]
Merge branch 'master' into 'master'
New RoleIcons (Lyn)
I bet, this time you can merge this shit :dromedary_camel:
See merge request !12
diff --git a/ElvUI_SLE/core/globals.lua b/ElvUI_SLE/core/globals.lua
index 21ec976..776165d 100755
--- a/ElvUI_SLE/core/globals.lua
+++ b/ElvUI_SLE/core/globals.lua
@@ -49,6 +49,11 @@ SLE.rolePaths = {
HEALER = [[Interface\AddOns\ElvUI_SLE\media\textures\role\mg-healer]],
DAMAGER = [[Interface\AddOns\ElvUI_SLE\media\textures\role\mg-dps]]
},
+ ["Lyn"] = {
+ TANK = [[Interface\AddOns\ElvUI_SLE\media\textures\role\lyn-tank]],
+ HEALER = [[Interface\AddOns\ElvUI_SLE\media\textures\role\lyn-healer]],
+ DAMAGER = [[Interface\AddOns\ElvUI_SLE\media\textures\role\lyn-dps]]
+ },
}
--Epty Tables
diff --git a/ElvUI_SLE/media/textures/role/lyn-dps.tga b/ElvUI_SLE/media/textures/role/lyn-dps.tga
new file mode 100644
index 0000000..196359c
Binary files /dev/null and b/ElvUI_SLE/media/textures/role/lyn-dps.tga differ
diff --git a/ElvUI_SLE/media/textures/role/lyn-healer.tga b/ElvUI_SLE/media/textures/role/lyn-healer.tga
new file mode 100644
index 0000000..5b67732
Binary files /dev/null and b/ElvUI_SLE/media/textures/role/lyn-healer.tga differ
diff --git a/ElvUI_SLE/media/textures/role/lyn-tank.tga b/ElvUI_SLE/media/textures/role/lyn-tank.tga
new file mode 100644
index 0000000..55752d1
Binary files /dev/null and b/ElvUI_SLE/media/textures/role/lyn-tank.tga differ
diff --git a/ElvUI_SLE/options/unitframes_c.lua b/ElvUI_SLE/options/unitframes_c.lua
index 0987d3a..a90824e 100644
--- a/ElvUI_SLE/options/unitframes_c.lua
+++ b/ElvUI_SLE/options/unitframes_c.lua
@@ -88,6 +88,7 @@ local function configTable()
["SupervillainUI"] = "Supervillain UI ".."|T"..texPath.."svui-tank:15:15:0:0:64:64:2:56:2:56|t ".."|T"..texPath.."svui-healer:15:15:0:0:64:64:2:56:2:56|t ".."|T"..texPath.."svui-dps:15:15:0:0:64:64:2:56:2:56|t ",
["Blizzard"] = "Blizzard ".."|T"..texPath.."blizz-tank:15:15:0:0:64:64:2:56:2:56|t ".."|T"..texPath.."blizz-healer:15:15:0:0:64:64:2:56:2:56|t ".."|T"..texPath.."blizz-dps:15:15:0:0:64:64:2:56:2:56|t ",
["MiirGui"] = "MiirGui ".."|T"..texPath.."mg-tank:15:15:0:0:64:64:2:56:2:56|t ".."|T"..texPath.."mg-healer:15:15:0:0:64:64:2:56:2:56|t ".."|T"..texPath.."mg-dps:15:15:0:0:64:64:2:56:2:56|t ",
+ ["Lyn"] = "Lyn ".."|T"..texPath.."lyn-tank:15:15:0:0:64:64:2:56:2:56|t ".."|T"..texPath.."lyn-healer:15:15:0:0:64:64:2:56:2:56|t ".."|T"..texPath.."lyn-dps:15:15:0:0:64:64:2:56:2:56|t ",
},
},
player = {