Commit d4479467 authored by Merathilis's avatar Merathilis

Merge branch 'development'

parents 9f5fb81a 06be7efd
[b][color=orange]v3.13[/color], 03.12.2017[/b][list]
[*]Add a "EasyChat" function, which allows you to press tab and select a channel.
[*]Account for changes with ElvUI (settings for combat indicator)
[*]IMPORTANT: Remove v1 of my Layout.
[*]Update the GameMenu. ;)
[*]Remove EncounterJournalInfo. Causes too much errors.
[*]Added more frames to be movable.
[*]Small code adjustments.[/list]
[b][color=orange]v3.12[/color], 12.11.2017[/b][list]
[*]Update/Added a lot of skins.
[*]Updated the EFL icons.
......
** v3.13, 03.12.2017**
* Add a "EasyChat" function, which allows you to press tab and select a channel.
* Account for changes with ElvUI (settings for combat indicator)
* IMPORTANT: Remove v1 of my Layout.
* Update the GameMenu. ;)
* Remove EncounterJournalInfo. Causes too much errors.
* Added more frames to be movable.
* Small code adjustments.
** v3.12, 12.11.2017**
* Update/Added a lot of skins.
* Updated the EFL icons.
......
## Interface: 70300
## Author: Merathilis
## Credits: Benik, Darth Predator, Blazeflack, Azilroka, Simpy, Infinitron, fgprodigal, Elv & all AddOn Authors who inspired me.
## Version: 3.12
## Credits: Benik, Darth Predator, Blazeflack, Azilroka, Simpy, ChaosVoid, fgprodigal, Elv & all AddOn Authors who inspired me.
## Version: 3.13
## Title: |cff1784d1ElvUI|r |cffff7d0aMerathilisUI|r
## Notes: A decorative edit for ElvUI + additional features.
## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.
......@@ -12,8 +12,8 @@
## SavedVariables: MERData
## SavedVariablesPerCharacter: MERDataPerChar
## OptionalDeps: SharedMedia, AddOnSkins, XIV_Databar, BigWigs
## X-ElvVersion: 10.68
## X-Curse-Packaged-Version: 3.12
## X-ElvVersion: 10.69
## X-Curse-Packaged-Version: 3.13
## X-Curse-Project-Name: MerathilisUI
## X-Curse-Project-ID: merathilis-ui
## X-Tukui-ProjectID: 1
......
......@@ -17,102 +17,100 @@ function MER:LoadAddOnSkinsProfile()
--]]----------------------------------
-- defaults
if(not AddOnSkinsDB.profiles[profileName]) then
AddOnSkinsDB.profiles[profileName] = {
["EmbedSystem"] = false,
["EmbedSystemDual"] = false,
["RecountBackdrop"] = false,
["Blizzard_WorldStateCaptureBar"] = false,
["Blizzard_AbilityButton"] = false,
["Blizzard_Transmogrify"] = false,
["ParchmentRemover"] = true,
["Blizzard_TradeSkill"] = false,
["Blizzard_Options"] = false,
["MiscellaneousFixes"] = true,
["Blizzard_MacroUI"] = false,
["PremadeGroupsFilter"] = true,
["Blizzard_AddonManager"] = false,
["Blizzard_BarberShop"] = false,
["Blizzard_Inspect"] = false,
["Blizzard_ExtraActionButton"] = false,
["Blizzard_WorldMap"] = false,
["Blizzard_Mail"] = false,
["Blizzard_Spellbook"] = false,
["Blizzard_Garrison"] = false,
["Blizzard_Gossip"] = false,
["Blizzard_VoidStorage"] = false,
["Blizzard_DebugTools"] = false,
["Blizzard_TimeManager"] = false,
["Blizzard_TradeWindow"] = false,
["Blizzard_Taxi"] = false,
["Blizzard_Bags"] = false,
["Blizzard_LootFrames"] = false,
["Blizzard_BlackMarket"] = false,
["Blizzard_PvE"] = false,
["Blizzard_PVPUI"] = false,
["Blizzard_Calendar"] = false,
["Blizzard_ArchaeologyUI"] = false,
["Blizzard_Friends"] = false,
["Blizzard_DressUpFrame"] = false,
["Blizzard_CharacterFrame"] = false,
["Blizzard_Collections"] = false,
["Blizzard_RaidUI"] = false,
["Blizzard_ChallengesUI"] = false,
["Blizzard_Quest"] = false,
["Blizzard_ItemSocketing"] = false,
["Blizzard_Trainer"] = false,
["Blizzard_Merchant"] = false,
["Blizzard_Others"] = false,
["Blizzard_EncounterJournal"] = false,
["Blizzard_Talent"] = false,
["Blizzard_Guild"] = false,
["Blizzard_DeathRecap"] = false,
["Blizzard_AchievementUI"] = false,
["Blizzard_StackSplit"] = false,
["Blizzard_AuctionHouse"] = false,
["Blizzard_ChatBubbles"] = false,
["WeakAuras"] = false, -- seems to be ignored >.>
["WeakAuraAuraBar"] = false,
}
-- embeded settings
if IsAddOnLoaded("Details") then
AddOnSkinsDB.profiles[profileName] = {
["EmbedSystem"] = false,
["LoginMsg"] = false,
["EmbedSystemMessage"] = false,
["ElvUISkinModule"] = true,
["EmbedSystem"] = true,
["EmbedSystemDual"] = false,
["RecountBackdrop"] = false,
["Blizzard_WorldStateCaptureBar"] = false,
["Blizzard_AbilityButton"] = false,
["Blizzard_Transmogrify"] = false,
["ParchmentRemover"] = true,
["Blizzard_TradeSkill"] = false,
["Blizzard_Options"] = false,
["MiscellaneousFixes"] = true,
["Blizzard_MacroUI"] = false,
["PremadeGroupsFilter"] = true,
["Blizzard_AddonManager"] = false,
["Blizzard_BarberShop"] = false,
["Blizzard_Inspect"] = false,
["Blizzard_ExtraActionButton"] = false,
["Blizzard_WorldMap"] = false,
["Blizzard_Mail"] = false,
["Blizzard_Spellbook"] = false,
["Blizzard_Garrison"] = false,
["Blizzard_Gossip"] = false,
["Blizzard_VoidStorage"] = false,
["Blizzard_DebugTools"] = false,
["Blizzard_TimeManager"] = false,
["Blizzard_TradeWindow"] = false,
["Blizzard_Taxi"] = false,
["Blizzard_Bags"] = false,
["Blizzard_LootFrames"] = false,
["Blizzard_BlackMarket"] = false,
["Blizzard_PvE"] = false,
["Blizzard_PVPUI"] = false,
["Blizzard_Calendar"] = false,
["Blizzard_ArchaeologyUI"] = false,
["Blizzard_Friends"] = false,
["Blizzard_DressUpFrame"] = false,
["Blizzard_CharacterFrame"] = false,
["Blizzard_Collections"] = false,
["Blizzard_RaidUI"] = false,
["Blizzard_ChallengesUI"] = false,
["Blizzard_Quest"] = false,
["Blizzard_ItemSocketing"] = false,
["Blizzard_Trainer"] = false,
["Blizzard_Merchant"] = false,
["Blizzard_Others"] = false,
["Blizzard_EncounterJournal"] = false,
["Blizzard_Talent"] = false,
["Blizzard_Guild"] = false,
["Blizzard_DeathRecap"] = false,
["Blizzard_AchievementUI"] = false,
["Blizzard_StackSplit"] = false,
["Blizzard_AuctionHouse"] = false,
["Blizzard_ChatBubbles"] = false,
["WeakAuras"] = false, -- seems to be ignored >.>
["WeakAuraAuraBar"] = false,
["EmbedBelowTop"] = true,
["EmbedMain"] = "Details",
["EmbedLeft"] = "",
["EmbedRight"] = "",
["EmbedFrameStrata"] = "2-LOW",
["EmbedFrameLevel"] = 2,
["TransparentEmbed"] = true,
["DetailsBackdrop"] = false,
}
end
-- embeded settings
if IsAddOnLoaded("Details") then
AddOnSkinsDB.profiles[profileName] = {
["LoginMsg"] = false,
["EmbedSystemMessage"] = false,
["ElvUISkinModule"] = true,
["EmbedSystem"] = true,
["EmbedSystemDual"] = false,
["EmbedBelowTop"] = true,
["EmbedMain"] = "Details",
["EmbedLeft"] = "",
["EmbedRight"] = "",
["EmbedFrameStrata"] = "2-LOW",
["EmbedFrameLevel"] = 2,
["TransparentEmbed"] = true,
["DetailsBackdrop"] = false,
}
end
if IsAddOnLoaded("Skada") then
AddOnSkinsDB.profiles[profileName] = {
["LoginMsg"] = false,
["EmbedSystemMessage"] = false,
["ElvUISkinModule"] = true,
["EmbedSystem"] = true,
["EmbedSystemDual"] = false,
["EmbedBelowTop"] = true,
["EmbedMain"] = "Skada",
["EmbedLeft"] = "",
["EmbedRight"] = "",
["EmbedFrameStrata"] = "2-LOW",
["EmbedFrameLevel"] = 2,
["SkadaBackdrop"] = false
}
end
-- Profile creation
local db = LibStub("AceDB-3.0"):New(AddOnSkinsDB)
db:SetProfile(profileName)
if IsAddOnLoaded("Skada") then
AddOnSkinsDB.profiles[profileName] = {
["LoginMsg"] = false,
["EmbedSystemMessage"] = false,
["ElvUISkinModule"] = true,
["EmbedSystem"] = true,
["EmbedSystemDual"] = false,
["EmbedBelowTop"] = true,
["EmbedMain"] = "Skada",
["EmbedLeft"] = "",
["EmbedRight"] = "",
["EmbedFrameStrata"] = "2-LOW",
["EmbedFrameLevel"] = 2,
["SkadaBackdrop"] = false
}
end
-- Profile creation
local db = LibStub("AceDB-3.0"):New(AddOnSkinsDB)
db:SetProfile(profileName)
end
\ No newline at end of file
......@@ -6,184 +6,96 @@ local ReloadUI = ReloadUI
--Global variables that we don't cache, list them here for the mikk's Find Globals script
-- GLOBALS: BigWigs3DB, LibStub
function MER:LoadBigWigsProfile(layout)
function MER:LoadBigWigsProfile()
--[[----------------------------------
-- BigWigs - Settings
--]]----------------------------------
if layout == "small" then
BigWigs3DB = {
["namespaces"] = {
["BigWigs_Plugins_Victory"] = {},
["BigWigs_Plugins_Colors"] = {},
["BigWigs_Plugins_Alt Power"] = {
["profiles"] = {
["MerathilisUI"] = {
["posx"] = 335.58,
["fontSize"] = 11,
["fontOutline"] = "",
["font"] = "Merathilis Roboto-Bold",
["lock"] = true,
["posy"] = 74,
},
BigWigs3DB = {
["namespaces"] = {
["BigWigs_Plugins_Victory"] = {},
["BigWigs_Plugins_Colors"] = {},
["BigWigs_Plugins_Alt Power"] = {
["profiles"] = {
["MerathilisUI"] = {
["posx"] = 335.58,
["fontSize"] = 11,
["fontOutline"] = "",
["font"] = "Expressway",
["lock"] = true,
["posy"] = 74,
},
},
["BigWigs_Plugins_BossBlock"] = {},
["BigWigs_Plugins_Bars"] = {
["profiles"] = {
["MerathilisUI"] = {
["BigWigsEmphasizeAnchor_y"] = 274.777784431353,
["fontSize"] = 11,
["BigWigsAnchor_width"] = 239.999954223633,
["BigWigsAnchor_y"] = 265.177697393337,
["BigWigsEmphasizeAnchor_x"] = 251.977762177876,
["barStyle"] = "MerathilisUI",
["emphasizeGrowup"] = true,
["BigWigsAnchor_x"] = 1018.51096216262,
["outline"] = "OUTLINE",
["BigWigsEmphasizeAnchor_width"] = 244.999984741211,
["font"] = "Expressway",
["emphasizeScale"] = 1.1,
["texture"] = "MerathilisUI2",
},
},
},
["BigWigs_Plugins_Super Emphasize"] = {
["profiles"] = {
["MerathilisUI"] = {
["font"] = "Expressway",
},
},
},
["BigWigs_Plugins_Sounds"] = {},
["BigWigs_Plugins_Messages"] = {
["profiles"] = {
["MerathilisUI"] = {
["outline"] = "OUTLINE",
["fontSize"] = 20,
["BWEmphasizeCountdownMessageAnchor_x"] = 664,
["BWMessageAnchor_x"] = 608,
["growUpwards"] = false,
["BWEmphasizeCountdownMessageAnchor_y"] = 523,
["font"] = "Merathilis Roboto-Bold",
["BWEmphasizeMessageAnchor_y"] = 614,
["BWMessageAnchor_y"] = 676,
["BWEmphasizeMessageAnchor_x"] = 610,
},
},
},
["BigWigs_Plugins_Statistics"] = {},
["BigWigs_Plugins_Respawn"] = {},
["BigWigs_Plugins_Proximity"] = {
["profiles"] = {
["MerathilisUI"] = {
["posx"] = 886.58,
["font"] = "Merathilis Roboto-Bold",
["lock"] = true,
["height"] = 99.0000381469727,
["posy"] = 88.22,
},
},
},
["BigWigs_Plugins_Raid Icons"] = {},
["LibDualSpec-1.0"] = {},
},
["profiles"] = {
["MerathilisUI"] = {
["fakeDBMVersion"] = true,
},
},
}
elseif layout == "big" then
BigWigs3DB = {
["namespaces"] = {
["BigWigs_Plugins_Victory"] = {},
["BigWigs_Plugins_Colors"] = {},
["BigWigs_Plugins_Alt Power"] = {
["profiles"] = {
["MerathilisUI"] = {
["posx"] = 335.58,
["fontSize"] = 11,
["fontOutline"] = "",
["font"] = "Expressway",
["lock"] = true,
["posy"] = 74,
},
},
},
["BigWigs_Plugins_BossBlock"] = {},
["BigWigs_Plugins_Bars"] = {
["profiles"] = {
["MerathilisUI"] = {
["BigWigsEmphasizeAnchor_y"] = 274.777784431353,
["fontSize"] = 11,
["BigWigsAnchor_width"] = 239.999954223633,
["BigWigsAnchor_y"] = 265.177697393337,
["BigWigsEmphasizeAnchor_x"] = 251.977762177876,
["barStyle"] = "MerathilisUI",
["emphasizeGrowup"] = true,
["BigWigsAnchor_x"] = 1018.51096216262,
["outline"] = "OUTLINE",
["BigWigsEmphasizeAnchor_width"] = 244.999984741211,
["font"] = "Expressway",
["emphasizeScale"] = 1.1,
["texture"] = "MerathilisUI2",
},
["BigWigs_Plugins_BossBlock"] = {},
["BigWigs_Plugins_Bars"] = {
["profiles"] = {
["MerathilisUI"] = {
["BigWigsEmphasizeAnchor_y"] = 274.777784431353,
["fontSize"] = 11,
["BigWigsAnchor_width"] = 239.999954223633,
["BigWigsAnchor_y"] = 265.177697393337,
["BigWigsEmphasizeAnchor_x"] = 251.977762177876,
["barStyle"] = "MerathilisUI",
["emphasizeGrowup"] = true,
["BigWigsAnchor_x"] = 1018.51096216262,
["outline"] = "OUTLINE",
["BigWigsEmphasizeAnchor_width"] = 244.999984741211,
["font"] = "Expressway",
["emphasizeScale"] = 1.1,
["texture"] = "MerathilisUI2",
},
},
["BigWigs_Plugins_Super Emphasize"] = {
["profiles"] = {
["MerathilisUI"] = {
["font"] = "Expressway",
},
},
["BigWigs_Plugins_Super Emphasize"] = {
["profiles"] = {
["MerathilisUI"] = {
["font"] = "Expressway",
},
},
["BigWigs_Plugins_Sounds"] = {},
["BigWigs_Plugins_Messages"] = {
["profiles"] = {
["MerathilisUI"] = {
["outline"] = "OUTLINE",
["fontSize"] = 20,
["BWEmphasizeCountdownMessageAnchor_x"] = 664,
["BWMessageAnchor_x"] = 608,
["growUpwards"] = false,
["BWEmphasizeCountdownMessageAnchor_y"] = 523,
["font"] = "Expressway",
["BWEmphasizeMessageAnchor_y"] = 614,
["BWMessageAnchor_y"] = 676,
["BWEmphasizeMessageAnchor_x"] = 610,
},
},
["BigWigs_Plugins_Sounds"] = {},
["BigWigs_Plugins_Messages"] = {
["profiles"] = {
["MerathilisUI"] = {
["outline"] = "OUTLINE",
["fontSize"] = 20,
["BWEmphasizeCountdownMessageAnchor_x"] = 664,
["BWMessageAnchor_x"] = 608,
["growUpwards"] = false,
["BWEmphasizeCountdownMessageAnchor_y"] = 523,
["font"] = "Expressway",
["BWEmphasizeMessageAnchor_y"] = 614,
["BWMessageAnchor_y"] = 676,
["BWEmphasizeMessageAnchor_x"] = 610,
},
},
["BigWigs_Plugins_Statistics"] = {},
["BigWigs_Plugins_Respawn"] = {},
["BigWigs_Plugins_Proximity"] = {
["profiles"] = {
["MerathilisUI"] = {
["posx"] = 886.58,
["font"] = "Expressway",
["lock"] = true,
["height"] = 99.0000381469727,
["posy"] = 88.22,
},
},
["BigWigs_Plugins_Statistics"] = {},
["BigWigs_Plugins_Respawn"] = {},
["BigWigs_Plugins_Proximity"] = {
["profiles"] = {
["MerathilisUI"] = {
["posx"] = 886.58,
["font"] = "Expressway",
["lock"] = true,
["height"] = 99.0000381469727,
["posy"] = 88.22,
},
},
["BigWigs_Plugins_Raid Icons"] = {},
["LibDualSpec-1.0"] = {},
},
["profiles"] = {
["MerathilisUI"] = {
["fakeDBMVersion"] = true,
},
["BigWigs_Plugins_Raid Icons"] = {},
["LibDualSpec-1.0"] = {},
},
["profiles"] = {
["MerathilisUI"] = {
["fakeDBMVersion"] = true,
},
}
end
},
}
end
E.PopupDialogs["MUI_INSTALL_BW_LAYOUT"] = {
text = L["MUI_INSTALL_SETTINGS_LAYOUT_BW"],
OnAccept = function() MER:LoadBigWigsProfile("small"); ReloadUI() end,
OnCancel = function() MER:LoadBigWigsProfile("big"); ReloadUI() end,
button1 = 'Layout Small',
button2 = 'Layout Big',
OnAccept = function() MER:LoadBigWigsProfile(); ReloadUI() end,
button1 = 'BigWigs Layout',
}
\ No newline at end of file
......@@ -13,98 +13,96 @@ function MER:LoadMasqueProfile()
--[[----------------------------------
-- Masque - Settings | Note: You have to create a seperate profile for each class to use the class color.
--]]----------------------------------
if(not MasqueDB.profiles[profileName]) then
MasqueDB.profiles[profileName] = {
["Groups"] = {
["ElvUI"] = {
["Colors"] = {
["Normal"] = {
MER.ClassColor.r, -- [1]
MER.ClassColor.g, -- [2]
MER.ClassColor.b, -- [3]
1, -- [4]
},
MasqueDB.profiles[profileName] = {
["Groups"] = {
["ElvUI"] = {
["Colors"] = {
["Normal"] = {
MER.ClassColor.r, -- [1]
MER.ClassColor.g, -- [2]
MER.ClassColor.b, -- [3]
1, -- [4]
},
["SkinID"] = "MerathilisUI",
["Gloss"] = 0.6,
},
["ElvUI_Buffs"] = {
["Colors"] = {
["Normal"] = {
MER.ClassColor.r, -- [1]
MER.ClassColor.g, -- [2]
MER.ClassColor.b, -- [3]
1, -- [4]
},
["SkinID"] = "MerathilisUI",
["Gloss"] = 0.6,
},
["ElvUI_Buffs"] = {
["Colors"] = {
["Normal"] = {
MER.ClassColor.r, -- [1]
MER.ClassColor.g, -- [2]
MER.ClassColor.b, -- [3]
1, -- [4]
},
["SkinID"] = "MerathilisUI",
["Gloss"] = 0.6,
},
["ElvUI_Debuffs"] = {
["Colors"] = {
["Normal"] = {
MER.ClassColor.r, -- [1]
MER.ClassColor.g, -- [2]
MER.ClassColor.b, -- [3]
1, -- [4]
},
["SkinID"] = "MerathilisUI",
["Gloss"] = 0.6,
},
["ElvUI_Debuffs"] = {
["Colors"] = {
["Normal"] = {
MER.ClassColor.r, -- [1]
MER.ClassColor.g, -- [2]
MER.ClassColor.b, -- [3]
1, -- [4]
},
["SkinID"] = "MerathilisUI",
["Gloss"] = 0.6,
},
["ElvUI_Pet Bar"] = {
["Gloss"] = 0.6,
["SkinID"] = "MerathilisUI",
["Colors"] = {
["Normal"] = {
MER.ClassColor.r, -- [1]
MER.ClassColor.g, -- [2]
MER.ClassColor.b, -- [3]
1, -- [4]
},
["SkinID"] = "MerathilisUI",
["Gloss"] = 0.6,
},
["ElvUI_Pet Bar"] = {
["Gloss"] = 0.6,
["SkinID"] = "MerathilisUI",
["Colors"] = {
["Normal"] = {
MER.ClassColor.r, -- [1]
MER.ClassColor.g, -- [2]
MER.ClassColor.b, -- [3]
1, -- [4]