Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
4290324
TOCs
Luckyone961 Oct 2, 2025
cad89fd
Restore chat
Luckyone961 Oct 2, 2025
32c3913
Add E.Midnight dummy constant
Luckyone961 Oct 2, 2025
2c13501
Sync Ace GUI Widget compatibility
Luckyone961 Oct 4, 2025
6b4166d
Comment this out with a note temporary
Luckyone961 Oct 4, 2025
40ec951
Chat
Luckyone961 Oct 5, 2025
d9f85d3
TT
Luckyone961 Oct 5, 2025
db44c0b
Check toc so I can swap clients w/o edit
Luckyone961 Oct 5, 2025
e58f3de
Update PVP.lua skin
Luckyone961 Oct 5, 2025
0c1a8d3
Update LFG.lua skin
Luckyone961 Oct 5, 2025
2087867
Implement Housing Dashboard skin
Luckyone961 Oct 5, 2025
fa83322
Add Housing Dashboard locales
Luckyone961 Oct 5, 2025
aa1b765
Update EncounterJournal.lua skin
Luckyone961 Oct 5, 2025
eae6347
Merge branch 'ptr' into alpha
Luckyone961 Oct 6, 2025
cc08f8f
Merge branch 'main' into alpha
kodewdle Oct 6, 2025
585f30c
Merge branch 'main' into alpha
kodewdle Oct 7, 2025
228f2b3
s
kodewdle Oct 7, 2025
c214106
Merge branch 'main' into alpha
Azilroka Oct 16, 2025
1b67734
Merge branch 'main' into alpha
kodewdle Oct 29, 2025
a7c9467
ss
kodewdle Nov 1, 2025
75b03a8
ss
kodewdle Nov 1, 2025
d2cbb3c
s
kodewdle Nov 1, 2025
63ff9ed
ssss
kodewdle Nov 1, 2025
55b7a39
s
kodewdle Nov 1, 2025
f171f4b
ss
kodewdle Nov 1, 2025
d6558a0
Merge branch 'main' into alpha
kodewdle Nov 5, 2025
c3662dd
Merge branch 'main' into alpha
kodewdle Nov 5, 2025
3d6d951
Merge branch 'main' into alpha
kodewdle Nov 7, 2025
853e2d7
s
kodewdle Nov 16, 2025
3b66e6e
s
kodewdle Nov 16, 2025
ec66a91
s
kodewdle Nov 16, 2025
e6106df
s
kodewdle Nov 16, 2025
39ccd83
s
kodewdle Nov 16, 2025
c61387c
s
kodewdle Nov 16, 2025
08adcb3
s
kodewdle Nov 16, 2025
a46ae47
s
kodewdle Nov 16, 2025
e1d79a1
s
kodewdle Nov 16, 2025
a1924e1
s
kodewdle Nov 16, 2025
3d09b44
s
kodewdle Nov 16, 2025
d2bbc69
s
kodewdle Nov 16, 2025
e8d0e51
s
kodewdle Nov 16, 2025
af315bf
s
kodewdle Nov 16, 2025
39ec2b4
s
kodewdle Nov 16, 2025
af6053e
s
kodewdle Nov 16, 2025
b7fc694
s
kodewdle Nov 16, 2025
8c22715
s
kodewdle Nov 16, 2025
b42e799
s
kodewdle Nov 16, 2025
9c53f76
s
kodewdle Nov 16, 2025
2e3fe5a
s
kodewdle Nov 16, 2025
64f25ca
s
kodewdle Nov 16, 2025
03c27cd
s
kodewdle Nov 16, 2025
2eef3e8
s
kodewdle Nov 16, 2025
6ff1ada
s
kodewdle Nov 16, 2025
2343b93
s
kodewdle Nov 16, 2025
03c9d3d
s
kodewdle Nov 16, 2025
63a93b1
s
kodewdle Nov 16, 2025
63a7f0c
s
kodewdle Nov 16, 2025
7ee1b5e
s
kodewdle Nov 16, 2025
860eb59
s
kodewdle Nov 16, 2025
db4afc0
s
kodewdle Nov 16, 2025
33b0811
s
kodewdle Nov 16, 2025
052ba32
s
kodewdle Nov 16, 2025
904bab7
s
kodewdle Nov 16, 2025
b680cef
s
kodewdle Nov 16, 2025
6786456
s
kodewdle Nov 16, 2025
e58e397
s
kodewdle Nov 16, 2025
6b64469
s
kodewdle Nov 16, 2025
98dc1f3
Merge branch 'beta' into alpha
kodewdle Nov 17, 2025
58d2e29
undo chat and minimap change
kodewdle Nov 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ElvUI/Core/General/API.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ local ElvUF = E.oUF

local _G = _G
local setmetatable = setmetatable
local issecrettable = issecrettable
local hooksecurefunc = hooksecurefunc
local type, pairs, unpack, strmatch = type, pairs, unpack, strmatch
local wipe, max, next, tinsert, date, time = wipe, max, next, tinsert, date, time
Expand Down Expand Up @@ -53,7 +54,6 @@ local GetWatchedFactionData = C_Reputation.GetWatchedFactionData

local GetColorDataForItemQuality = ColorManager and ColorManager.GetColorDataForItemQuality
local GetAuraDataByIndex = C_UnitAuras.GetAuraDataByIndex
local UnpackAuraData = AuraUtil.UnpackAuraData

local GetSpecialization = C_SpecializationInfo.GetSpecialization or GetSpecialization
local GetSpecializationInfo = C_SpecializationInfo.GetSpecializationInfo or GetSpecializationInfo
Expand Down Expand Up @@ -517,8 +517,20 @@ do -- Spell renaming provided by BigWigs
end

do
function E:UnpackAuraData(data)
local name, icon, applications, dispelName, duration, expirationTime, sourceUnit, isStealable, nameplateShowPersonal, spellId, canApplyAura, isBossAura, isFromPlayerOrPlayerPet, nameplateShowAll, timeMod = data.name, data.icon, data.applications, data.dispelName, data.duration, data.expirationTime, data.sourceUnit, data.isStealable, data.nameplateShowPersonal, data.spellId, data.canApplyAura, data.isBossAura, data.isFromPlayerOrPlayerPet, data.nameplateShowAll, data.timeMod
if issecrettable and issecrettable(data.points) then
return name, icon, applications, dispelName, duration, expirationTime, sourceUnit, isStealable, nameplateShowPersonal, spellId, canApplyAura, isBossAura, isFromPlayerOrPlayerPet, nameplateShowAll, timeMod
else
return name, icon, applications, dispelName, duration, expirationTime, sourceUnit, isStealable, nameplateShowPersonal, spellId, canApplyAura, isBossAura, isFromPlayerOrPlayerPet, nameplateShowAll, timeMod, unpack(data.points)
end
end

function E:GetAuraData(unitToken, index, filter)
return UnpackAuraData(GetAuraDataByIndex(unitToken, index, filter))
local data = GetAuraDataByIndex(unitToken, index, filter)
if not data then return end

return E:UnpackAuraData(data)
end

local function FindAura(key, value, unit, index, filter, ...)
Expand Down
22 changes: 16 additions & 6 deletions ElvUI/Core/Modules/ActionBars/ActionBars.lua
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,12 @@ function AB:CreateBar(id)
local button = LAB:CreateButton(i, format('%sButton%d', barName, i), bar)

button.AuraCooldown.targetAura = true
E:RegisterCooldown(button.AuraCooldown, 'actionbar')

if E.Retail then
if not E.Midnight then
E:RegisterCooldown(button.AuraCooldown, 'actionbar')
end

if E.Retail and not E.Midnight then
button.ProfessionQualityOverlayFrame = CreateFrame('Frame', nil, button, 'ActionButtonProfessionOverlayTemplate')
end

Expand Down Expand Up @@ -737,7 +740,10 @@ function AB:StyleButton(button, noBackdrop, useMasque, ignoreNormal)
end

if not AB.handledbuttons[button] then
E:RegisterCooldown(button.cooldown, 'actionbar')
if not E.Midnight then
E:RegisterCooldown(button.cooldown, 'actionbar')
end

AB.handledbuttons[button] = true
end

Expand Down Expand Up @@ -899,7 +905,7 @@ do

if (E.Retail and (canGlide or CanGlide() or IsPossessBarVisible() or HasOverrideActionBar()))
or UnitCastingInfo('player') or UnitChannelInfo('player') or UnitExists('target') or UnitExists('focus')
or UnitExists('vehicle') or UnitAffectingCombat('player') or (UnitHealth('player') ~= UnitHealthMax('player')) then
or UnitExists('vehicle') or UnitAffectingCombat('player') or (not E.Midnight and (UnitHealth('player') ~= UnitHealthMax('player'))) then
self.mouseLock = true
E:UIFrameFadeIn(self, 0.2, self:GetAlpha(), 1)
AB:FadeBlings(1)
Expand Down Expand Up @@ -1123,6 +1129,7 @@ do
MicroButtonAndBagsBar = true,
OverrideActionBar = true,
MainMenuBar = true,
MainActionBar = E.Midnight or nil,
[E.Retail and 'StanceBar' or 'StanceBarFrame'] = true,
[E.Retail and 'PetActionBar' or 'PetActionBarFrame'] = true,
[E.Retail and 'PossessActionBar' or 'PossessBarFrame'] = true
Expand Down Expand Up @@ -1644,7 +1651,8 @@ function AB:UpdateAuraCooldown(button, duration)
if not cd then return end

local oldstate = cd.hideText
cd.hideText = (not E.db.cooldown.targetAura) or (button.chargeCooldown and not button.chargeCooldown.hideText) or (button.cooldown and button.cooldown.currentCooldownType == COOLDOWN_TYPE_LOSS_OF_CONTROL) or (duration and duration > 1.5) or nil
cd.hideText = (not E.db.cooldown.targetAura) or (button.chargeCooldown and not button.chargeCooldown.hideText) or (button.cooldown and button.cooldown.currentCooldownType == COOLDOWN_TYPE_LOSS_OF_CONTROL) or (not E.Midnight and duration and duration > 1.5) or nil

if cd.timer and (oldstate ~= cd.hideText) then
E:ToggleBlizzardCooldownText(cd, cd.timer)
E:Cooldown_TimerUpdate(cd.timer)
Expand Down Expand Up @@ -1718,7 +1726,9 @@ function AB:LAB_FlyoutCreated(btn)
end

function AB:LAB_ChargeCreated(_, cd)
E:RegisterCooldown(cd, 'actionbar')
if not E.Midnight then
E:RegisterCooldown(cd, 'actionbar')
end
end

function AB:LAB_MouseUp()
Expand Down
3 changes: 2 additions & 1 deletion ElvUI/Core/Modules/ActionBars/MicroBar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,9 @@ function AB:SetupMicroBar()

if _G.ResetMicroMenuPosition then
_G.ResetMicroMenuPosition()
else
elseif _G.UpdateMicroButtonsParent then
_G.UpdateMicroButtonsParent(microBar)

AB:SecureHook('UpdateMicroButtonsParent')
end

Expand Down
31 changes: 16 additions & 15 deletions ElvUI/Core/Modules/Auras/Auras.lua
Original file line number Diff line number Diff line change
Expand Up @@ -304,21 +304,20 @@ function A:UpdateAura(button, index)
local db = A.db[button.auraType]
button.text:SetShown(db.showDuration)
button.statusBar:SetShown((db.barShow and duration > 0) or (db.barShow and db.barNoDuration and duration == 0))
button.count:SetText(not count or count <= 1 and '' or count)
button.texture:SetTexture(icon)

local dtype = debuffType or 'none'
if button.debuffType ~= dtype then
local color = (button.filter == 'HARMFUL' and A.db.colorDebuffs and DebuffColors[dtype]) or E.db.general.bordercolor
button:SetBackdropBorderColor(color.r, color.g, color.b)
button.statusBar.backdrop:SetBackdropBorderColor(color.r, color.g, color.b)
button.debuffType = dtype
end
button.count:SetText(not count and '' or (not E.Midnight and count <= 1 and '') or count)

if duration > 0 and expiration then
A:SetAuraTime(button, expiration, duration, modRate)
else
A:ClearAuraTime(button)
local color = (button.filter == 'HARMFUL' and A.db.colorDebuffs and DebuffColors[debuffType or 'none']) or E.db.general.bordercolor
button:SetBackdropBorderColor(color.r, color.g, color.b)
button.statusBar.backdrop:SetBackdropBorderColor(color.r, color.g, color.b)

if not E.Midnight then
if duration > 0 and expiration then
A:SetAuraTime(button, expiration, duration, modRate)
else
A:ClearAuraTime(button)
end
end
end

Expand All @@ -336,9 +335,11 @@ function A:UpdateTempEnchant(button, index, expiration)
button:SetBackdropBorderColor(r, g, b)
button.statusBar.backdrop:SetBackdropBorderColor(r, g, b)

local remaining = (expiration * 0.001) or 0
A:SetAuraTime(button, remaining + GetTime(), (remaining <= 3600 and remaining > 1800) and 3600 or (remaining <= 1800 and remaining > 600) and 1800 or 600)
else
if not E.Midnight then
local remaining = (expiration * 0.001) or 0
A:SetAuraTime(button, remaining + GetTime(), (remaining <= 3600 and remaining > 1800) and 3600 or (remaining <= 1800 and remaining > 600) and 1800 or 600)
end
elseif not E.Midnight then
A:ClearAuraTime(button)
end
end
Expand Down
Loading