Commit a221df5d authored by Merathilis's avatar Merathilis

Merge branch 'development' into ptr

parents f065eddd f1bd36fd
[b][color=orange]v4.32[/color], 15.09.2019[/b][list]
[*]Fixed EncounterJournal Tab backdrop.
[*]Fixed AutoButton Usable Button color options.
[*]Added an own Minimap Difficulty Indicator => Text.
[*]Added combat hide option for Minimap Buttons.
[*]Added own Durability DataText = > MUI Durability
[*]Added new Style Panels under my existing Panels.
[*]Code cleanup, you dont need to apply twice the install step for ActionBars/UnitFrames.[/list]
[b][color=orange]v4.31[/color], 06.09.2019[/b][list]
[*]Removed my own ProgressBar. Was a good idea, but nah.
[*]Remove transparent options for Bags/ActionBars. Now in ElvUI.
[*]Enhance AutoButtons.
[*]Hide the progress Tooltip if Raider.IO is loaded.
[*]Updated some Skins.
[*]Code cleanup. And hopefully fix some nil errors.
[*]Added back TradeSkillTabs.
[*]Added FPS and Latency to my MicroButton Time Tooltip.[/list]
[b][color=orange]v4.30[/color], 19.08.2019[/b][list]
[*]More code cleanup.
[*]Fixed an issue, which can happen with BenikUI FlightMode.
[*]Added a description for my Tags in the UnitFrame options.
[*]Added option to change the Paragon Bar Color and Text Style.
[*]Added a notification for Paragon Rewards.[/list]
[b][color=orange]v4.29[/color], 18.08.2019[/b][list]
[*]Code Cleanup.
[*]Fixed an error in Notifications.
[*]Updated Community skin.
[*]Updated ObjectiveTracker skin.
[*]Fixed some backdrops on my skins.
[*]Fixed the border from AutoButtons.
[*]Removed the NP Castbar Target.
[*]Updated BW/Details Profiles.
[*]Removed OzCooldowns Profile.
[*]Added iFilger Profile.
[*]Layout Updates. See inGame changelog info!!
[*]Added an own ProgressBar over the Minimap.[/list]
[b][color=orange]v4.28[/color], 05.08.2019[/b][list]
[*]Added Pawn Skin, needs AddOnSkins to work.
[*]Adjust some install settings.
[*]Added a Paragon Reputation feature.
[*]Finally fixed a db error if AAP + HandyNotes are enabled. Big thanks to NihilisticPandemonium <3[/list]
[b][color=orange]v4.27[/color], 29.07.2019[/b][list]
[*]Update some skins.
[*]Update Azerite Armor Tooltip.
......
** v4.32 15.09.2019**
* Fixed EncounterJournal Tab backdrop.
* Fixed AutoButton Usable Button color options.
* Added an own Minimap Difficulty Indicator => Text.
* Added combat hide option for Minimap Buttons.
* Added own Durability DataText = > MUI Durability
* Added new Style Panels under my existing Panels.
* Code cleanup, you dont need to apply twice the install step for ActionBars/UnitFrames.
** v4.31 06.09.2019**
* Removed my own ProgressBar. Was a good idea, but nah.
* Remove transparent options for Bags/ActionBars. Now in ElvUI.
* Enhance AutoButtons.
* Hide the progress Tooltip if Raider.IO is loaded.
* Updated some Skins.
* Code cleanup. And hopefully fix some nil errors.
* Added back TradeSkillTabs.
* Added FPS and Latency to my MicroButton Time Tooltip.
** v4.30 19.08.2019**
* More code cleanup.
* Fixed an issue, which can happen with BenikUI FlightMode.
* Added a description for my Tags in the UnitFrame options.
* Added option to change the Paragon Bar Color and Text Style.
* Added a notification for Paragon Rewards.
** v4.29 18.08.2019**
* Code Cleanup.
* Fixed an error in Notifications.
* Updated Community skin.
* Updated ObjectiveTracker skin.
* Fixed some backdrops on my skins.
* Fixed the border from AutoButtons.
* Removed the NP Castbar Target.
* Updated BW/Details Profiles.
* Removed OzCooldowns Profile.
* Added iFilger Profile.
* Layout Updates. See inGame changelog info!!
* Added an own ProgressBar over the Minimap.
** v4.28 05.08.2019**
* Added Pawn Skin, needs AddOnSkins to work.
* Adjust some install settings.
* Added a Paragon Reputation feature.
* Finally fixed a db error if AAP + HandyNotes are enabled. Big thanks to NihilisticPandemonium <3
** v4.27 29.07.2019**
* Update some skins.
* Update Azerite Armor Tooltip.
......
......@@ -33,4 +33,16 @@
<Binding name="CLICK AutoQuestButton10:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoQuestButton11:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoQuestButton12:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton1:LeftButton" header= "AutoUsableButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton2:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton3:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton4:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton5:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton6:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton7:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton8:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton9:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton10:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton11:LeftButton" category="BINDING_HEADER_MER"/>
<Binding name="CLICK AutoUsableButton12:LeftButton" category="BINDING_HEADER_MER"/>
</Bindings>
## Interface: 80200
## Author: Merathilis
## Version: 4.27
## Version: 4.32
## Title: |cFF00c0faElvUI|r |cffff7d0aMerathilisUI|r
## Notes: A decorative edit for ElvUI + additional features.
## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.
......@@ -10,8 +10,8 @@
## SavedVariablesPerCharacter: MERDataPerChar
## OptionalDeps: SharedMedia, AddOnSkins, BigWigs, ls_Toasts
## X-Credits: Benik, Blazeflack, Azilroka, Simpy, NihilisticPandemonium, Darth Predator, fgprodigal, siweia, Solor, Elv & all AddOn Authors who inspired me.
## X-ElvVersion: 11.20
## X-Curse-Packaged-Version: 4.27
## X-ElvVersion: 11.22
## X-Curse-Packaged-Version: 4.32
## X-Curse-Project-Name: MerathilisUI
## X-Curse-Project-ID: merathilis-ui
## X-Tukui-ProjectID: 1
......@@ -19,10 +19,10 @@
libs\load_libs.xml
locales\load_locales.xml
core\load_core.xml
Init.lua
settings\load_settings.xml
developer\load_developer.xml
modules\load_modules.xml
layout\layout.lua
core\load_core.xml
media\load_media.xml
modules\load_modules.xml
layout\load_layout.xml
Bindings.xml
local E, L, V, P, G = unpack(ElvUI)
local EP = LibStub('LibElvUIPlugin-1.0')
local addon, Engine = ...
local MER = E.Libs.AceAddon:NewAddon(addon, 'AceConsole-3.0', 'AceEvent-3.0', 'AceHook-3.0', 'AceTimer-3.0')
local locale = (E.global.general.locale and E.global.general.locale ~= "auto") and E.global.general.locale or GetLocale()
local L = E.Libs.ACL:GetLocale('ElvUI', locale)
-- Cache global variables
-- Lua functions
local _G = _G
local pairs = pairs
-- WoW API / Variables
-- GLOBALS:
--Setting up table to unpack.
Engine[1] = MER
Engine[2] = E
Engine[3] = L
Engine[4] = V
Engine[5] = P
Engine[6] = G
_G[addon] = Engine
MER.Config = {}
MER.RegisteredModules = {}
function MER:AddOptions()
for _, func in pairs(MER.Config) do
func()
end
end
-- Register own Modules
function MER:RegisterModule(name)
if self.initialized then
local module = self:GetModule(name)
if (module and module.Initialize) then
module:Initialize()
end
else
self["RegisteredModules"][#self["RegisteredModules"] + 1] = name
end
end
function MER:GetRegisteredModules()
return self["RegisteredModules"]
end
function MER:InitializeModules()
for _, moduleName in pairs(MER["RegisteredModules"]) do
local module = self:GetModule(moduleName)
if module.Initialize then
module:Initialize()
end
end
end
function MER:Init()
self.initialized = true
self:Initialize()
self:InitializeModules()
EP:RegisterPlugin(addon, self.AddOptions)
end
E.Libs.EP:HookInitialize(MER, MER.Init)
......@@ -7,10 +7,21 @@ copyrighted to their authors with all rights reserved.
This addon is free to use and the authors hereby grants you the following rights:
1. You may make modifications to this addon for private use only, you may not publicize (upload) any portion of this addon. The only exception being you may
upload to the tukui.org or github website, after a permission.
upload to the tukui.org or git.tukui.org website, AFTER a permission.
2. Do not modify the name of this addon, including the addon folders.
3. This copyright notice shall be included in all copies or substantial
portions of the Software.
3. This copyright notice shall be included in all copies or substantial portions of the Software.
All rights not explicitly addressed in this license are reserved by
the copyright holders.
\ No newline at end of file
All rights not explicitly addressed in this license are reserved by the copyright holders.
Following people have permissions to use parts of MerathilisUI code mentioned. There permissions are not inherited by third-parties aquiring code from listed people.
Elv: Full permission
Tukz: Full permission
Darth Predator: Full permission
Repoooc: Full permission
Benik: Full permission
Azilroka: Full permission
NihilisticPandemonium: Full permission
Simpy: Full permission
liquidbase: Full permission
siweia: Full permission
\ No newline at end of file
......@@ -36,7 +36,7 @@ function MER:LoadAddOnSkinsProfile()
AS.db['DBMRadarTrans'] = false
AS.db['WeakAuraAuraBar'] = false
AS.db['WeakAuraIconCooldown'] = false
AS.db['SkinTemplate'] = 'Transparent'
AS.db['SkinTemplate'] = 'MerathilisUI'
AS.db['HideChatFrame'] = 'NONE'
AS.db['Parchment'] = false
AS.db['ParchmentRemover'] = false
......
local MER, E, L, V, P, G = unpack(select(2, ...))
--Cache global variables
--WoW API / Variables
--Global variables that we don't cache, list them here for the mikk's Find Globals script
-- GLOBALS: OzCooldownsDB, LibStub
local playerName = UnitName("player")
local profileName = playerName.."-mUI"
function MER:LoadOCDProfile()
--[[----------------------------------
-- AddOnSkins - Settings
--]]----------------------------------
-- defaults
OzCooldownsDB.profiles[profileName] = {
["Masque"] = true,
["StatusBarTexture"] = "Duffed",
["StackFont"] = "Expressway",
["StackFontFlag"] = "OUTLINE",
["StackFontSize"] = 12,
["Tooltips"] = false,
["Size"] = 30,
["FadeMode"] = "GreenToRed",
["Announce"] = false,
["CooldownText"] = {
["Font"] = "Expressway",
["FontFlag"] = "OUTLINE",
["FontSize"] = 14,
},
}
E.db["movers"]["OzCooldownsMover"] = "BOTTOM,ElvUIParent,BOTTOM,-250,350"
-- Profile creation
local db = LibStub("AceDB-3.0"):New(OzCooldownsDB)
db:SetProfile(profileName)
end
\ No newline at end of file
local MER, E, L, V, P, G = unpack(select(2, ...))
--Cache global variables
local _G = _G
--WoW API / Variables
-- GLOBALS:
function MER:LoadiFilgerProfile()
--[[----------------------------------
-- ProjectAzilroka - Settings
--]]----------------------------------
local IF = _G.iFilger
IF.data:SetProfile('MerathilisUI')
IF.db["FocusDebuffs"]["Enable"] = false
IF.db["FocusBuffs"]["Enable"] = false
IF.db["PvPTargetBuffs"]["Enable"] = false
IF.db["PvPTargetDebuffs"]["Enable"] = false
IF.db["Enhancements"]["Enable"] = false
IF.db["RaidDebuffs"]["Enable"] = false
IF.db["PvPPlayerDebuffs"]["Enable"] = false
IF.db["Cooldowns"]["Enable"] = false
IF.db["Buffs"]["Enable"] = true
IF.db["Buffs"]["Direction"] = "LEFT"
IF.db["Buffs"]["Spacing"] = 2
IF.db["Buffs"]["IconSize"] = 32
IF.db["StackCountFont"] = "Expressway"
IF.db["StackCountFontFlag"] = "OUTLINE"
IF.db["CooldownText"]["Font"] = "Expressway"
IF.db["CooldownText"]["FontFlag"] = "OUTLINE"
end
......@@ -5,8 +5,8 @@
<script file="DeadlyBossMods.lua"/>
<script file="Details.lua"/>
<script file="FCT.lua"/>
<script file="iFilger.lua"/>
<script file="ls_Toasts.lua"/>
<script file="OzCooldown.lua"/>
<script file="ProjectAzilroka.lua"/>
<script file="Skada.lua"/>
<script file="template.lua"/>
......
......@@ -17,14 +17,16 @@ local DISABLED_FONT_COLOR = DISABLED_FONT_COLOR
local ChangeLogData = {
"Changes:",
"• Update some skins",
"• Update Azerite Armor Tooltip",
"• Hide the RaidManager during Pet Battles",
"• Removed WeakAuras Skin",
"• Fixed EncounterJournal Tab backdrop",
"• Fixed AutoButton Usable Button color options",
"• Added an own Minimap Difficulty Indicator => Text",
"• Added combat hide option for Minimap Buttons",
"• Added own Durability DataText = > MUI Durability",
"• Added new Style Panels under my existing Panels",
-- "• ''",
" ",
"Notes:",
"• As always, if you want my latest layout, do the install progress again",
-- "• ''",
}
......
......@@ -169,12 +169,8 @@ end
function COMP:Initialize()
end
hooksecurefunc(
E,
"CheckIncompatible",
function(self)
COMP:RunCompatibilityFunctions()
end
)
hooksecurefunc(E, "CheckIncompatible", function(self)
COMP:RunCompatibilityFunctions()
end)
MER:RegisterModule(COMP:GetName())
local MER, E, _, V, P, G = unpack(select(2, ...))
local L = E.Libs.ACL:GetLocale('ElvUI', E.global.general.locale or 'enUS')
local MER, E, L, V, P, G = unpack(select(2, ...))
local COMP = MER:GetModule("mUICompatibility")
if E.db.mui == nil then E.db.mui = {} end
......@@ -135,12 +134,6 @@ local function AddOptions()
name = L["Combat State"],
desc = L["Enable/Disable the '+'/'-' combat message if you enter/leave the combat."],
},
MerchantiLevel = {
order = 9,
type = "toggle",
name = L["Show Merchant ItemLevel"],
desc = L["Display the item level on the MerchantFrame, to change the font you have to set it in ElvUI - Bags - ItemLevel"],
},
},
},
info = {
......
local E, _, V, P, G = unpack(ElvUI)
local L = E.Libs.ACL:GetLocale('ElvUI', E.global.general.locale or 'enUS')
local MER, E, L, V, P, G = unpack(select(2, ...))
local LSM = E.LSM
local EP = LibStub("LibElvUIPlugin-1.0")
local addon, Engine = ...
local MER = LibStub("AceAddon-3.0"):NewAddon(addon, "AceConsole-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceHook-3.0")
MER.callbacks = MER.callbacks or LibStub("CallbackHandler-1.0"):New(MER)
-- Cache global variables
-- Lua functions
local _G = _G
local format = string.format
local print, pairs = print, pairs
local pcall = pcall
local tinsert = table.insert
-- WoW API / Variables
local CreateFrame = CreateFrame
local GetAddOnEnableState = GetAddOnEnableState
local IsAddOnLoaded = IsAddOnLoaded
local SetCVar = SetCVar
-- Global variables that we don"t cache, list them here for the mikk"s Find Globals script
-- GLOBALS: LibStub, ElvDB, ElvUI_SLE, hooksecurefunc, BINDING_HEADER_MER
-- GLOBALS: ElvDB, hooksecurefunc, BINDING_HEADER_MER
-- GLOBALS: MERData, MERDataPerChar
--Setting up table to unpack.
Engine[1] = MER
Engine[2] = E
Engine[3] = L
Engine[4] = V
Engine[5] = P
Engine[6] = G
_G[addon] = Engine;
MER.Config = {}
MER["styling"] = {}
MER.Logo = [[Interface\AddOns\ElvUI_MerathilisUI\media\textures\mUI.tga]]
MER.LogoSmall = [[Interface\AddOns\ElvUI_MerathilisUI\media\textures\mUI1.tga]]
......@@ -48,25 +27,10 @@ function MER:cOption(name)
return (color):format(name)
end
function MER:AddOptions()
for _, func in pairs(MER.Config) do
func()
end
end
function MER:DasOptions()
E:ToggleOptionsUI(); LibStub("AceConfigDialog-3.0-ElvUI"):SelectGroup("ElvUI", "mui")
end
function MER:SetMoverPosition(mover, point, anchor, secondaryPoint, x, y)
if not _G[mover] then return end
local frame = _G[mover]
frame:ClearAllPoints()
frame:SetPoint(point, anchor, secondaryPoint, x, y)
E:SaveMoverPosition(mover)
end
function MER:LoadCommands()
self:RegisterChatCommand("mui", "DasOptions")
end
......@@ -81,17 +45,12 @@ function MER:RegisterMedia()
E.media.muiGothic = LSM:Fetch("font", "Merathilis Gothic-Bold")
-- Background
E.media.muiBrushedMetal = LSM:Fetch("background", "Merathilis BrushedMetal")
E.media.muiSmoke = LSM:Fetch("background", "Merathilis Smoke")
-- Border
E.media.muiglowTex = LSM:Fetch("border", "MerathilisGlow")
--Textures
E.media.muiBlank = LSM:Fetch("statusbar", "MerathilisBlank")
E.media.muiBorder = LSM:Fetch("statusbar", "MerathilisBorder")
E.media.muiEmpty = LSM:Fetch("statusbar", "MerathilisEmpty")
E.media.muiFlat = LSM:Fetch("statusbar", "MerathilisFlat")
E.media.muiMelli = LSM:Fetch("statusbar", "MerathilisMelli")
E.media.muiMelliDark = LSM:Fetch("statusbar", "MerathilisMelliDark")
E.media.muiOnePixel = LSM:Fetch("statusbar", "MerathilisOnePixel")
......@@ -114,41 +73,11 @@ function MER:IsAddOnEnabled(addon) -- Credit: Azilroka
return GetAddOnEnableState(E.myname, addon) == 2
end
local f = CreateFrame("Frame")
f:RegisterEvent("PLAYER_LOGIN")
f:SetScript("OnEvent", function()
MER:Initialize()
end)
-- Register own Modules
MER["RegisteredModules"] = {}
local modules = {}
function MER:RegisterModule(name)
if self.initialized then
local module = self:GetModule(name)
if (module and module.Initialize) then
module:Initialize()
end
else
self["RegisteredModules"][#self["RegisteredModules"] + 1] = name
end
end
function MER:InitializeModules()
for _, moduleName in pairs(MER["RegisteredModules"]) do
local module = self:GetModule(moduleName)
if module.Initialize then
module:Initialize()
else
MER:Print("Module <"..moduleName.."> does not loaded.")
end
end
MER.Modules = modules
end
function MER:Initialize()
self.initialized = true
self:RegisterMedia()
self:LoadCommands()
self:SplashScreen()
self:AddMoverCategories()
-- ElvUI versions check
if MER.ElvUIV < MER.ElvUIX then
......@@ -156,16 +85,6 @@ function MER:Initialize()
return -- If ElvUI Version is outdated stop right here. So things don't get broken.
end
-- Make sure my db exists.
if not E.db.mui then
E.db.mui = {}
end
-- Create the media table earlier, i really dont get it.
if not E.db.mui.media then
E.db.mui.media = {}
end
-- Create empty saved vars if they doesn't exist
if not MERData then
MERData = {}
......@@ -175,12 +94,6 @@ function MER:Initialize()
MERDataPerChar = {}
end
self:RegisterMedia()
self:LoadCommands()
self:SplashScreen()
self:AddMoverCategories()
self:InitializeModules()
self:SetupProfileCallbacks()
E:Delay(6, function() MER:CheckVersion() end)
......@@ -199,10 +112,4 @@ function MER:Initialize()
if E.private.install_complete == E.version and E.db.mui.installed == nil then
E:GetModule("PluginInstaller"):Queue(MER.installTable)
end
if MER.MSQ then
MER.MSQ:Register(addon)
end
EP:RegisterPlugin(addon, self.AddOptions)
end
......@@ -5,9 +5,9 @@ local MER, E, L, V, P, G = unpack(select(2, ...))
local _G = _G
local assert, pairs, print, select, tonumber, type, unpack = assert, pairs, print, select, tonumber, type, unpack
local getmetatable = getmetatable
local find, format, match, split = string.find, string.format, string.match, string.split
local find, format, match, split, strfind = string.find, string.format, string.match, string.split, strfind
local strmatch = strmatch
local tconcat = table.concat
local tconcat, twipe = table.concat, table.wipe
-- WoW API / Variables
local CreateFrame = CreateFrame
local GetAchievementInfo = GetAchievementInfo
......@@ -26,8 +26,8 @@ local UnitReaction = UnitReaction
--Global variables that we don't cache, list them here for the mikk's Find Globals script
-- GLOBALS: NUM_BAG_SLOTS, hooksecurefunc, MER_NORMAL_QUEST_DISPLAY, MER_TRIVIAL_QUEST_DISPLAY, FACTION_BAR_COLORS
local backdropr, backdropg, backdropb, backdropa = unpack(E["media"].backdropcolor)
local borderr, borderg, borderb, bordera = unpack(E["media"].bordercolor)
local backdropr, backdropg, backdropb, backdropa = unpack(E.media.backdropcolor)
local borderr, borderg, borderb, bordera = unpack(E.media.bordercolor)
MER.dummy = function() return end
MER.Title = format("|cffff7d0a%s |r", "MerathilisUI")
......@@ -40,8 +40,12 @@ MER.WoWBuild = select(2, GetBuildInfo()) MER.WoWBuild = tonumber(MER.WoWBuild)
MER_NORMAL_QUEST_DISPLAY = "|cffffffff%s|r"
MER_TRIVIAL_QUEST_DISPLAY = TRIVIAL_QUEST_DISPLAY:gsub("000000", "ffffff")
--Info Color RGB: 0, 191/255, 250/255
MER.InfoColor = "|cff70C0F5"
MER.GreyColor = "|cffB5B5B5"
MER.RedColor = "|cffff2735"
MER.GreenColor = "|cff3a9d36"
MER.LineString = MER.GreyColor.."---------------"
MER.LeftButton = " |TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:13:11:0:-1:512:512:12:66:230:307|t "
......@@ -49,37 +53,17 @@ MER.RightButton = " |TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:13:11:0:-1:512
MER.ScrollButton = " |TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:13:11:0:-1:512:512:12:66:127:204|t "
-- Class Color stuff
MER.ClassColor = E.myclass == "PRIEST" and E.PriestColors or (CUSTOM_CLASS_COLORS and CUSTOM_CLASS_COLORS[E.myclass] or RAID_CLASS_COLORS[E.myclass])