Skip to content

Commit

Permalink
Merge branch 'main' into ptr
Browse files Browse the repository at this point in the history
  • Loading branch information
kodewdle committed Nov 19, 2024
2 parents 43a91dd + 1ce8c01 commit 175c48f
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 16 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
### Version 13.81 [ November 19th 2024 ]
* Blacklisted Auras: Well-Honed Instincts
* Unitframe color options added to set Health Breakpoint, only for Friendly units, and Color Backdrop. (Thanks BeeVa)
* Chat would error when attempting to move it.
* Attempted a fix for old Dropdowns from other addons causing a Skin error.
* Minimap Right Click for Tracking works on Cataclysm.
* Mover selection uses the new dropdown on Cataclysm.
* Spellbook Tooltips not working on Cataclysm.

### Version 13.80 [ October 29th 2024 ]
* Currency Transfer skin updated.
* Blacklisted Auras: Flight Style, Call of the Elder Druid, DK Blood Draw, WoW's Anniversary, and Warband Mentored Leveling.
Expand Down
4 changes: 2 additions & 2 deletions ElvUI/Core/General/Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1451,9 +1451,7 @@ function E:DBConvertTWW()

E.db.tooltip.itemCount = db
end
end

function E:DBConvertDev()
local healthBreak = E.db.unitframe.colors.healthBreak
local onlyLow = healthBreak.onlyLow
if onlyLow ~= nil then
Expand All @@ -1465,7 +1463,9 @@ function E:DBConvertDev()
healthBreak.threshold.good = false
end
end
end

function E:DBConvertDev()
if not ElvCharacterDB.ConvertKeybindings then
E:ConvertActionBarKeybinds()
ElvCharacterDB.ConvertKeybindings = true
Expand Down
2 changes: 1 addition & 1 deletion ElvUI/Core/Modules/UnitFrames/Groups/Party.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ function UF:Construct_PartyFrames()
self.ResurrectIndicator = UF:Construct_ResurrectionIcon(self)
self.SummonIndicator = UF:Construct_SummonIcon(self)
self.CombatIndicator = UF:Construct_CombatIndicator(self)
self.GroupRoleIndicator = UF:Construct_RoleIcon(self)
self.RaidRoleFramesAnchor = UF:Construct_RaidRoleFrames(self)
self.MouseGlow = UF:Construct_MouseGlow(self)
self.PhaseIndicator = UF:Construct_PhaseIcon(self)
Expand All @@ -44,6 +43,7 @@ function UF:Construct_PartyFrames()

if not E.Classic then
self.PvPClassificationIndicator = UF:Construct_PvPClassificationIndicator(self) -- Cart / Flag / Orb / Assassin Bounty
self.GroupRoleIndicator = UF:Construct_RoleIcon(self)
self.AlternativePower = UF:Construct_AltPowerBar(self)
self.ClassBar = 'AlternativePower'
end
Expand Down
2 changes: 1 addition & 1 deletion ElvUI/Core/Modules/UnitFrames/Groups/Raid.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ function UF:Construct_RaidFrames()
self.AuraWatch = UF:Construct_AuraWatch(self)
self.RaidDebuffs = UF:Construct_RaidDebuffs(self)
self.AuraHighlight = UF:Construct_AuraHighlight(self)
self.GroupRoleIndicator = UF:Construct_RoleIcon(self)
self.RaidRoleFramesAnchor = UF:Construct_RaidRoleFrames(self)
self.MouseGlow = UF:Construct_MouseGlow(self)
self.PhaseIndicator = UF:Construct_PhaseIcon(self)
Expand All @@ -38,6 +37,7 @@ function UF:Construct_RaidFrames()

if not E.Classic then
self.PvPClassificationIndicator = UF:Construct_PvPClassificationIndicator(self) -- Cart / Flag / Orb / Assassin Bounty
self.GroupRoleIndicator = UF:Construct_RoleIcon(self)
self.AlternativePower = UF:Construct_AltPowerBar(self)
self.ClassBar = 'AlternativePower'
end
Expand Down
2 changes: 1 addition & 1 deletion ElvUI/Core/Modules/UnitFrames/UnitFrames.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1332,10 +1332,10 @@ do
end

if iconRoles[which] then
UF:Configure_RoleIcon(frame)
UF:Configure_ReadyCheckIcon(frame)

if not E.Classic then
UF:Configure_RoleIcon(frame)
UF:Configure_SummonIcon(frame)
UF:Configure_AltPowerBar(frame)
end
Expand Down
2 changes: 1 addition & 1 deletion ElvUI/Core/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ end
function E:ParseVersionString(addon)
local version = GetAddOnMetadata(addon, 'Version')
if strfind(version, 'project%-version') then
return 13.80, '13.80-git', nil, true
return 13.81, '13.81-git', nil, true
else
local release, extra = strmatch(version, '^v?([%d.]+)(.*)')
return tonumber(release), release..extra, extra ~= ''
Expand Down
29 changes: 19 additions & 10 deletions ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ License: MIT
-- @class file
-- @name LibRangeCheck-3.0
local MAJOR_VERSION = "LibRangeCheck-3.0-ElvUI"
local MINOR_VERSION = 24 -- based off real minor version: 26
local MINOR_VERSION = 25 -- based off real minor version: 26

-- GLOBALS: LibStub, CreateFrame

Expand All @@ -66,7 +66,7 @@ local setmetatable = setmetatable
local IsSpellKnownOrOverridesKnown = IsSpellKnownOrOverridesKnown
local CheckInteractDistance = CheckInteractDistance
local GetInventoryItemLink = GetInventoryItemLink
local GetTime = GetTime
local GetInventorySlotInfo = GetInventorySlotInfo
local InCombatLockdown = InCombatLockdown
local UnitCanAssist = UnitCanAssist
local UnitCanAttack = UnitCanAttack
Expand All @@ -77,6 +77,7 @@ local UnitIsDeadOrGhost = UnitIsDeadOrGhost
local UnitIsUnit = UnitIsUnit
local UnitIsVisible = UnitIsVisible
local UnitRace = UnitRace
local GetTime = GetTime

local GetItemInfo = C_Item.GetItemInfo
local IsItemInRange = C_Item.IsItemInRange
Expand Down Expand Up @@ -141,8 +142,6 @@ end or _G.GetSpellTabInfo
local C_Timer = C_Timer
local Item = Item

local HandSlotId = GetInventorySlotInfo("HANDSSLOT")

local isRetail = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
local isWrath = WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC
local isEra = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
Expand Down Expand Up @@ -1062,7 +1061,6 @@ function lib:init(forced)
local _, playerRace = UnitRace("player")

local interactList = InteractLists[playerRace] or DefaultInteractList
self.handSlotItem = GetInventoryItemLink("player", HandSlotId)

local changed = false
if updateCheckers(self.friendRC, self.friendRCInCombat, createCheckerList(FriendSpells[playerClass], FriendItems, interactList)) then
Expand Down Expand Up @@ -1299,9 +1297,21 @@ function lib:CVAR_UPDATE(_, cvar)
end
end

function lib:UNIT_INVENTORY_CHANGED(event, unit)
if self.initialized and unit == "player" and self.handSlotItem ~= GetInventoryItemLink("player", HandSlotId) then
self:scheduleInit()
do
local ChestSlotID = GetInventorySlotInfo("CHESTSLOT")
local LegSlotID = GetInventorySlotInfo("LEGSSLOT")

local chestSlotItem, legSlotItem -- local cache of the items
function lib:UNIT_INVENTORY_CHANGED(event, unit) -- limited to Mages only currently
local ChestItem = GetInventoryItemLink("player", ChestSlotID) -- Mage: Regeneration
local LegItem = GetInventoryItemLink("player", LegSlotID) -- Mage: Mass Regeneration

if self.initialized and unit == "player" and (chestSlotItem ~= ChestItem or legSlotItem ~= LegItem) then
chestSlotItem = ChestItem
legSlotItem = LegItem

self:scheduleInit()
end
end
end

Expand Down Expand Up @@ -1432,8 +1442,7 @@ function lib:activate()
end

local _, playerClass = UnitClass("player")
if playerClass == "MAGE" or playerClass == "SHAMAN" then
-- Mage and Shaman gladiator gloves modify spell ranges
if playerClass == "MAGE" then
frame:RegisterUnitEvent("UNIT_INVENTORY_CHANGED", "player")
end
end
Expand Down

0 comments on commit 175c48f

Please sign in to comment.