Commit 6a72596c authored by Merathilis's avatar Merathilis

Merge branch 'development' into ptr

parents 6f47e3a4 28a1ab81
......@@ -10,6 +10,7 @@ Fixed a bug where nameplate threat scale wasn't being reset on new units that no
Fixed a Style Filter error: Attempt to compare nil with number.
Fixed an error in Petition Skin.
Fixed black Quest Text if Parchment Reomver is enabled. (#1444)
Fixed Penance spellID for castbar ticks.
**Misc. Changes:**
Updated Friends DataText to see the difference between retail and classic.
......
......@@ -488,6 +488,12 @@ local function LoadSkin()
S:HandleScrollBar(_G.CommunitiesFrameGuildDetailsFrameNewsContainer.ScrollBar)
S:HandleButton(CommunitiesFrame.GuildLogButton)
local BossModel = _G.CommunitiesFrameGuildDetailsFrameNews.BossModel
BossModel:StripTextures()
BossModel.TextFrame:StripTextures()
BossModel:SetTemplate("Transparent")
BossModel.TextFrame:SetTemplate("Transparent")
-- Filters Frame
local FiltersFrame = _G.CommunitiesGuildNewsFiltersFrame
FiltersFrame:CreateBackdrop("Transparent")
......
......@@ -1236,6 +1236,7 @@ G.unitframe.ChannelTicks = {
[64843] = 4, -- Divine Hymn
[15407] = 4, -- Mind Flay
[48045] = 5, -- Mind Sear
[47757] = 5, -- Penance (it seems, that this spell have on own ID for channeling. Its not the actual spell itself)
-- Mage
[5143] = 5, -- Arcane Missiles
[12051] = 3, -- Evocation
......@@ -1244,16 +1245,6 @@ G.unitframe.ChannelTicks = {
[740] = 4, -- Tranquility
}
local f = CreateFrame("Frame")
f:RegisterEvent("PLAYER_ENTERING_WORLD")
f:RegisterEvent("PLAYER_TALENT_UPDATE")
f:SetScript("OnEvent", function()
if strlower(E.myclass) ~= "priest" then return end
local penanceTicks = IsPlayerSpell(193134) and 4 or 3
E.global.unitframe.ChannelTicks[47540] = penanceTicks --Penance
end)
G.unitframe.ChannelTicksSize = {
-- Warlock
[198590] = 1, -- Drain Soul
......
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