Commit 784e946b authored by Merathilis's avatar Merathilis

Merge branch 'development'

parents fc40bc41 a468bcc0
[b][color=orange]v3.08[/color], 06.08.2017[/b][list]
[*]Add new filterPriority to install.
[*]Add a new texture.
[*]Add some spell to OzCooldowns.
[*]Fix spellRewards frame in Quest skin.
[*]Update SplashScreen Logo.[/list]
[b][color=orange]v3.07[/color], 31.08.2017[/b][list]
[*]Update install with new filterPriority.
[*]Add the possibility to change the duration text on the Nameplate auras.
......
** v3.07[/color], 31.08.2017**
* Update install with new filterPriority.
* Add the possibility to change the duration text on the Nameplate auras.
* Fix errors with PlaySound API.
* Increase the size of the Orderhall Commandbar.
** v3.08, 06.08.2017**
* Add new filterPriority to install.
* Add a new texture.
* Add some spell to OzCooldowns.
* Fix spellRewards frame in Quest skin.
* Update SplashScreen Logo.
** v3.06, 29.08.2017**
* Implement OzCooldowns - Credits Infinitron
......
## Interface: 70300
## Author: Merathilis
## Credits: Benik, Darth Predator, Blazeflack, Azilroka, Infinitron, fgprodigal, Elv & all AddOn Authors who inspired me
## Version: 3.07
## Credits: Benik, Darth Predator, Blazeflack, Azilroka, Simpy, Infinitron, fgprodigal, Elv & all AddOn Authors who inspired me.
## Version: 3.08
## 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.
......@@ -13,7 +13,7 @@
## SavedVariablesPerCharacter: MERDataPerChar
## OptionalDeps: SharedMedia, XIV_Databar, BigWigs
## X-ElvVersion: 10.62
## X-Curse-Packaged-Version: 3.07
## X-Curse-Packaged-Version: 3.08
## X-Curse-Project-Name: MerathilisUI
## X-Curse-Project-ID: merathilis-ui
## X-Tukui-ProjectID: 1
......
......@@ -41,16 +41,16 @@ function MER:LoadBigWigsProfile(layout)
["BigWigsAnchor_x"] = 1018.51096216262,
["outline"] = "OUTLINE",
["BigWigsEmphasizeAnchor_width"] = 244.999984741211,
["font"] = "Merathilis Roboto-Bold",
["font"] = "Expressway",
["emphasizeScale"] = 1.1,
["texture"] = "MerathilisBlank",
["texture"] = "MerathilisUI1",
},
},
},
["BigWigs_Plugins_Super Emphasize"] = {
["profiles"] = {
["MerathilisUI"] = {
["font"] = "Merathilis Roboto-Bold",
["font"] = "Expressway",
},
},
},
......@@ -127,7 +127,7 @@ function MER:LoadBigWigsProfile(layout)
["BigWigsEmphasizeAnchor_width"] = 244.999984741211,
["font"] = "Expressway",
["emphasizeScale"] = 1.1,
["texture"] = "Skullflower",
["texture"] = "MerathilisUI1",
},
},
},
......
......@@ -1481,7 +1481,7 @@ function MER:LoadDetailsProfile(layout)
0, -- [3]
1, -- [4]
},
["texture_background"] = "MerathilisBlank",
["texture_background"] = "MerathilisUI1",
["alpha"] = 1,
["no_icon"] = false,
["textR_show_data"] = {
......@@ -1492,7 +1492,7 @@ function MER:LoadDetailsProfile(layout)
["texture_background_file"] = "Interface\BUTTONS\WHITE8X8.blp",
["font_face"] = "Merathilis Roboto-Bold",
["texture_class_colors"] = true,
["texture"] = "MerathilisBlank",
["texture"] = "MerathilisUI1",
["fast_ps_update"] = true,
["textR_separator"] = ",",
["height"] = 14,
......@@ -3228,9 +3228,9 @@ function MER:LoadDetailsProfile(layout)
true, -- [3]
},
["texture_background_file"] = "Interface\BUTTONS\WHITE8X8.blp",
["font_face"] = "Merathilis Roboto-Bold",
["font_face"] = "Expressway",
["texture_class_colors"] = true,
["texture"] = "MerathilisBlank",
["texture"] = "MerathilisUI1",
["fast_ps_update"] = true,
["textR_separator"] = ",",
["height"] = 14,
......
......@@ -16,10 +16,11 @@ local SOUNDKIT = SOUNDKIT
local ChangeLogData = {
"Changes:",
"• Update install with new filterPriority.",
"• Add the possibility to change the duration text on the Nameplate auras.",
"• Fix errors with PlaySound API.",
"• Increase the size of the Orderhall Commandbar.",
"• Add new filterPriority to install.",
"• Add a new texture.",
"• Add some spell to OzCooldowns.",
"• Fix spellRewards frame in Quest skin.",
"• Update SplashScreen Logo.",
-- "• ",
" ",
"Notes:",
......
......@@ -131,8 +131,8 @@ local function CreateSplashScreen()
f.lineBottom:SetTexCoord(0.00195313, 0.81835938, 0.01953125, 0.03320313)
f.logo = f:CreateTexture(nil, "OVERLAY")
f.logo:Size(200, 100)
f.logo:SetTexture("Interface\\AddOns\\ElvUI_MerathilisUI\\media\\textures\\mUI.tga")
f.logo:Size(125, 125)
f.logo:SetTexture("Interface\\AddOns\\ElvUI_MerathilisUI\\media\\textures\\mUI1.tga")
f.logo:Point("CENTER", f, "CENTER")
f.version = f:CreateFontString(nil, "OVERLAY")
......
This diff is collapsed.
......@@ -26,6 +26,7 @@ LSM:Register("border","MerathilisGlow", [[Interface\AddOns\ElvUI_MerathilisUI\me
-- Statusbars
LSM:Register("statusbar","MerathilisBlank", [[Interface\BUTTONS\WHITE8X8.blp]])
LSM:Register("statusbar","MerathilisUI1", [[Interface\AddOns\ElvUI_MerathilisUI\media\textures\MaUI4.tga]])
LSM:Register("statusbar","MerathilisFlat", [[Interface\AddOns\ElvUI_MerathilisUI\media\textures\Flat.tga]])
LSM:Register("statusbar","MerathilisOnePixel", [[Interface\AddOns\ElvUI_MerathilisUI\media\textures\OnePixel.tga]])
LSM:Register("statusbar","MerathilisMelli", [[Interface\AddOns\ElvUI_MerathilisUI\media\textures\Melli.tga]])
......
......@@ -28,6 +28,7 @@ local CooldownFrames = {}
local Blacklist = {
[83958] = true, -- Mobile Banking
[125439] = true, -- Pet Bandage
[6603] = true, -- Auto Attack
[131204] = true, -- ChallengeMode Ports
[131205] = true,
......@@ -49,7 +50,10 @@ local Blacklist = {
}
local Whitelist = {
[115151] = true,
[115151] = true, --Renewing Mist
[18562] = true, --Swiftmend
[194466] = true, --Phoenix's Flames
[190784] = true, --Divine Steed
}
local function isPetSpell(SpellID)
......@@ -256,7 +260,6 @@ function OCD:Position()
end
function OCD:CreateCooldownFrame(SpellID)
-- local Name, _, Icon, _, _, _, SpellID = GetSpellInfo(SpellID)
local Name, _, Icon = GetSpellInfo(SpellID)
local Frame = CreateFrame("Button", 'OzCD_'..SpellID, self.frame)
Frame:RegisterForClicks('AnyUp')
......@@ -350,7 +353,7 @@ function OCD:BuildSpellList()
for talentGroup = 1, GetNumSpecGroups() do
for tier = 1, MAX_TALENT_TIERS do
for column = 1, 3 do
local TalentID, Name = GetTalentInfo(tier, column, talentGroup)
local TalentID, Name, _, _, _, SpellID, _, _, _ = GetTalentInfo(tier, column, talentGroup)
if TalentID and Name then
local SpellID = select(7, GetSpellInfo(Name))
if SpellID then
......
......@@ -166,6 +166,10 @@ local function styleQuestFrame()
AvailableQuestsText.SetTextColor = MER.dummy
hooksecurefunc("QuestInfo_Display", function(template, parentFrame, acceptButton, material)
local rewardsFrame = QuestInfoFrame.rewardsFrame
local isQuestLog = QuestInfoFrame.questLog ~= nil
local isMapQuest = rewardsFrame == MapQuestInfoRewardsFrame
QuestInfoTitleHeader:SetTextColor(1, 1, 0)
QuestInfoDescriptionHeader:SetTextColor(1, 1, 0)
QuestInfoObjectivesHeader:SetTextColor(1, 1, 0)
......@@ -203,6 +207,22 @@ local function styleQuestFrame()
end
end
end
-- Spell Rewards
for spellReward in rewardsFrame.spellRewardPool:EnumerateActive() do
if not spellReward.isSkinned then
if isMapQuest then
MERS:SmallItemButtonTemplate(spellReward)
else
MERS:LargeItemButtonTemplate(spellReward)
select(3, spellReward:GetRegions()):Hide() --border
spellReward.Icon:SetPoint("TOPLEFT", 0, 0)
spellReward:SetHitRectInsets(0, 0, 0, 0)
spellReward:SetSize(147, 41)
end
spellReward.isSkinned = true
end
end
end)
hooksecurefunc("QuestInfo_ShowRequiredMoney", function()
......
......@@ -94,4 +94,13 @@ G.unitframe.aurafilters['MER_RaidCDs'] = {
--Racial
[65116] = Defaults(), --Stoneform
},
}
G.unitframe.aurafilters['MER_Blacklist'] = {
['type'] = 'Blacklist',
['spells'] = {
--Druid
[240606] = Defaults(), --Circadian Invocation
[240607] = Defaults(), --Circadian Invocation
},
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment