Compare commits

...

19 Commits

Author SHA1 Message Date
2ae826654a Update LibRangeCheck version
Should fix taint issues as reported in https://www.wowace.com/projects/ice-hud/issues/353
2024-04-04 08:14:32 -05:00
acee3f4725 Fix error when loading in while mounted 2024-02-10 14:12:28 -06:00
2db6ddea57 Only hide Blizzard Vigor bar, not all fill-ups
This fixes the bar from the Digging event in 10.2.5 not showing. For real this time.
2024-02-10 10:47:04 -06:00
7e4a6ecab6 Attempt to fix other uses of PowerBarContainer
Apparently other things are now using the game's UIWidgetPowerBarContainerFrame but we're forcing it to be hidden due to a variety of factors. This attempts to restrict the Hide behavior of that frame to only when we're Dragonriding.
2024-01-21 12:36:15 -06:00
af33ab9781 Fix Vigor showing up sometimes when it shouldn't
Seems like UnitPowerMax for the AlternateMount power returns the actual max from PLAYER_ENTERING_WORLD until you mount and then dismount a Dragonriding mount. This wasn't previously the case.

Now we rely on the native widget info to tell us whether it believes it should be on or not.
2024-01-19 09:02:41 -06:00
c0262de622 Only use HasBuff method as a fallback
If we can check the power type, we should rely on only that.
2024-01-19 07:26:55 -06:00
cfa86813a7 Update TOC 2024-01-16 17:27:43 -06:00
c85c304eb6 Enable GCD, target target buffs in Classic 1.15+ 2024-01-07 14:49:42 -06:00
5321f7c64d Prevent error
Wowace ticket #351
2023-12-26 15:47:36 -06:00
6b2eb8d6e2 Update TOC for Classic-era 2023-12-10 18:58:52 -06:00
c72b67235d Enable TargetCastBar on Classic-era 1.15+ 2023-12-10 18:58:08 -06:00
140596b930 Fix Stagger bar error for 10.2.0
Fixes wowace ticket 348
2023-11-08 09:33:17 -06:00
6ddb056cdf Update TOC 2023-11-07 16:36:03 -06:00
8df330d3b4 Update TOC 2023-09-08 10:30:11 -05:00
1f9a1a3100 Update TOC for Classic-era 2023-08-23 14:38:11 -05:00
40a25a3315 Apply Strata adjustment in a few more places 2023-08-02 17:38:47 -05:00
6cee8c738c Apply strata adjustment inside BarFactory instead of every callsite 2023-08-02 08:25:34 -05:00
40fc8187fd Add ability to adjust strata globally
Submitted by slowkerd from Curseforge (thanks!)
2023-08-02 08:16:12 -05:00
b32f090644 using table.remove to not leave a hole in the array (#36) 2023-07-23 23:57:22 -05:00
31 changed files with 280 additions and 70 deletions

View File

@ -40,8 +40,8 @@ externals:
libs/AceHook-3.0:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceHook-3.0
tag: latest
libs/LibRangeCheck-2.0:
url: https://github.com/WeakAuras/LibRangeCheck-2.0/
libs/LibRangeCheck-3.0:
url: https://github.com/WeakAuras/LibRangeCheck-3.0/
libs/LibSharedMedia-3.0:
url: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/trunk
tag: latest
@ -57,11 +57,11 @@ externals:
optional-dependencies:
- libdogtag-3-0
- libdogtag-unit-3-0
- librangecheck-2-0
- librangecheck-3-0
move-folders:
IceHUD/IceHUD_Options: IceHUD_Options
IceHUD/libs/LibRangeCheck-2.0/LibRangeCheck-2.0: IceHUD/libs/LibRangeCheck-2.0
IceHUD/libs/LibRangeCheck-3.0/LibRangeCheck-3.0: IceHUD/libs/LibRangeCheck-3.0
tools-used:
- libdatabroker-1-1

View File

@ -996,7 +996,7 @@ function IceBarElement.prototype:CreateBackground()
self.frame = CreateFrame("Frame", "IceHUD_"..self.elementName, self.masterFrame)
end
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
self.frame:SetHeight(self.settings.barHeight)
@ -1041,6 +1041,7 @@ end
-- Creates the actual bar
function IceBarElement.prototype:CreateBar()
self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK", "Bar")
self:SetBarCoord(self.barFrame)
self.barFrame.bar:SetBlendMode(self.settings.barBlendMode)
@ -1055,7 +1056,7 @@ function IceBarElement.prototype:BarFactory(barFrame, frameStrata, textureLayer,
barFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_"..(nameSuffix or "Bar"), self.frame)
end
barFrame:SetFrameStrata(frameStrata and frameStrata or "LOW")
barFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata(frameStrata and frameStrata or "LOW"))
barFrame:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
barFrame:SetHeight(self.settings.barHeight)
self:SetBarFramePoints(barFrame)

View File

@ -361,7 +361,7 @@ function IceCastBar.prototype:MyOnUpdate()
local timeString = self.moduleSettings.showCastTime and string.format("%.1fs ", remainingTime) or ""
local empowerString = self.NumStages ~= nil and (L["Stage %d"]):format(self:GetCurrentStage()) or ""
local line1 = timeString .. self.actionMessage
local line1 = timeString .. (self.actionMessage or "")
if self.moduleSettings.empowerStageTextDisplay == "TOPLINE" then
line1 = line1 .. " " .. empowerString
end

View File

@ -116,6 +116,8 @@ function IceCore.prototype:SetupDefaults()
bHideInBarberShop = true,
bHideDuringShellGame = true,
bHideDuringCataloging = true,
addedStrata = 0,
},
global = {
lastRunVersion = 0,
@ -610,7 +612,7 @@ function IceCore.prototype:IsEnabled()
end
function IceCore.prototype:DrawFrame()
self.IceHUDFrame:SetFrameStrata("BACKGROUND")
self.IceHUDFrame:SetFrameStrata(self:DetermineStrata("BACKGROUND"))
self.IceHUDFrame:SetWidth(self.settings.gap)
self.IceHUDFrame:SetHeight(20)
@ -931,6 +933,48 @@ function IceCore.prototype:SetColor(color, r, g, b)
self:Redraw()
end
function IceCore.prototype:GetAddedStrata()
return self.settings.addedStrata
end
function IceCore.prototype:SetAddedStrata(value)
self.settings.addedStrata = value
end
-- Preventing ugly if-else blocks in module creations
-- (but could probably itself be smarter/prettier)
-- Frisbees/AddonWhiner
function IceCore.prototype:DetermineStrata(baseStrata)
if self.settings.addedStrata == 0 then
return baseStrata
end
if self.settings.addedStrata == 1 then
if baseStrata == "BACKGROUND" then
return "LOW"
elseif baseStrata == "LOW" then
return "MEDIUM"
elseif baseStrata == "MEDIUM" then
return "HIGH"
elseif baseStrata == "HIGH" then
return "DIALOG"
end
end
if self.settings.addedStrata == 2 then
if baseStrata == "BACKGROUND" then
return "MEDIUM"
elseif baseStrata == "LOW" then
return "HIGH"
elseif baseStrata == "MEDIUM" then
return "DIALOG"
elseif baseStrata == "HIGH" then
return "FULLSCREEN"
end
end
return baseStrata -- failsafe
end
function IceCore.prototype:IsInConfigMode()
return self.bConfigMode

View File

@ -74,7 +74,7 @@ function IceElement.prototype:Create(parent)
self.parent = parent
if not self.masterFrame then
self.masterFrame = CreateFrame("Frame", "IceHUD_Element_"..self.elementName, self.parent)
self.masterFrame:SetFrameStrata("MEDIUM")
self.masterFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
end
self:CreateFrame()
self:Show(false)

View File

@ -36,6 +36,7 @@ else
end
-- compatibility/feature flags
IceHUD.CanShowTargetCasting = not IceHUD.WowClassic or LibClassicCasterino or (IceHUD.WowClassic and IceHUD.WowVer >= 11500)
IceHUD.GetPlayerAuraBySpellID = _G["C_UnitAuras"] and C_UnitAuras.GetPlayerAuraBySpellID
IceHUD.SpellFunctionsReturnRank = IceHUD.WowMain and IceHUD.WowVer < 80000
IceHUD.EventExistsPlayerPetChanged = IceHUD.WowMain and IceHUD.WowVer < 80000
@ -48,8 +49,8 @@ IceHUD.EventExistsUnitDynamicFlags = IceHUD.WowMain and IceHUD.WowVer < 80000
IceHUD.EventExistsUnitHealthFrequent = not IceHUD.WowMain or (IceHUD.WowVer >= 40000 and IceHUD.WowVer < 90000)
IceHUD.PerPowerEventsExist = IceHUD.WowMain and IceHUD.WowVer < 40000
IceHUD.PerTargetComboPoints = IceHUD.WowVer < 60000
IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic
IceHUD.CanTrackGCD = not IceHUD.WowClassic
IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic or IceHUD.WowVer >= 11500
IceHUD.CanTrackGCD = not IceHUD.WowClassic or IceHUD.WowVer >= 11500
IceHUD.GetSpellInfoReturnsFunnel = IceHUD.WowMain and IceHUD.WowVer < 60000
IceHUD.CanHookDestroyTotem = IceHUD.WowClassic or IceHUD.WowClassicBC or IceHUD.WowClassicWrath
IceHUD.ShouldUpdateTargetHealthEveryTick = (IceHUD.WowClassic or IceHUD.WowClassicBC) and GetCVarBool("predictedHealth")

View File

@ -1,8 +1,8 @@
## Interface: 100105
## Interface-Retail: 100105
## Interface-Classic: 11403
## Interface: 100205
## Interface-Retail: 100205
## Interface-Classic: 11500
## Interface-BCC: 20504
## Interface-Wrath: 30402
## Interface-Wrath: 30403
## Author: Parnic, originally created by Iceroth
## Name: IceHUD
## Title: IceHUD |cff7fff7f-Ace3-|r
@ -15,7 +15,7 @@
#@end-non-debug@
## SavedVariables: IceCoreDB
## IconTexture: Interface\Icons\Spell_Frost_Frost
## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets
## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-3.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets
## X-Category: HUDs
## X-Website: https://www.wowace.com/projects/ice-hud
## X-Curse-Project-ID: 5394

View File

@ -1,8 +1,8 @@
## Interface: 100105
## Interface-Retail: 100105
## Interface-Classic: 11403
## Interface: 100205
## Interface-Retail: 100205
## Interface-Classic: 11500
## Interface-BCC: 20504
## Interface-Wrath: 30402
## Interface-Wrath: 30403
## Title: IceHUD |cff7fff7f-Options-|r
## Author: Parnic
## Version: @project-version@

View File

@ -444,6 +444,22 @@ The Classic game client doesn't provide this information to addons because it wa
hidden = not IceHUD.HasCataloging,
order = 36,
},
bIncreaseStrata = {
type = 'range',
name = L["Added strata"],
desc = L["Push IceHUD modules to the foreground. Increase if other addons are covering IceHUD. Requires reload."],
get = function()
return IceHUD.IceCore:GetAddedStrata()
end,
set = function(info, v)
IceHUD.IceCore:SetAddedStrata(v)
end,
min = 0,
max = 2,
step = 1,
order = 37,
},
}
},

View File

@ -179,7 +179,7 @@ function IceUnitBar.prototype:CreateFlashFrame()
self.flashFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_Flash", self.frame)
end
self.flashFrame:SetFrameStrata("BACKGROUND")
self.flashFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.flashFrame:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
self.flashFrame:SetHeight(self.settings.barHeight)

View File

@ -1,5 +1,60 @@
# Changelog
v1.14.37:
- Update LibRangeCheck version to address taint issues (wowace ticket #353)
v1.14.36:
- Really fix IceHUD stomping on other uses of the PowerBarContainer such as the Digging bar for the Archive event.
v1.14.35:
- Fix IceHUD stomping on other uses of the PowerBarContainer such as the Digging bar for the Archive event.
v1.14.34:
- Fix Vigor showing up sometimes when it shouldn't.
v1.14.33:
- Update TOC for Dragonflight to 10.2.5
v1.14.32:
- Enable GlobalCoolDown module in Classic Era 1.15.0+
- Enable tracking target buffs/debuffs in Classic Era 1.15.0+
v1.14.31:
- Fix nil concatenation error (wowace ticket #351)
v1.14.30:
- Update Classic-era TOC for 1.15.0
- Enable TargetCastBar module on Classic-era 1.15+
v1.14.29:
- Fix Stagger bar error for 10.2.0 (wowace ticket #348)
v1.14.28:
- Update TOC for Dragonflight to 10.2.0
v1.14.27:
- Update TOC for Dragonflight to 10.1.7
v1.14.26:
- Update TOC for classic-era to 1.14.4
v1.14.25:
- Fixed lua error that would appear when targetting webwrapped players in heroic alpha/beta titan rune dungeons.
- Added ability to adjust strata globally.
v1.14.24:
- Fixed an error when targeting a player and right-clicking a module that should show a menu in 10.1.5.

View File

@ -14,7 +14,7 @@
<Include file="libs\AceHook-3.0\AceHook-3.0.xml"/>
<Include file="libs\LibDogTag-3.0\lib.xml"/>
<Include file="libs\LibDogTag-Unit-3.0\lib.xml"/>
<Script file="libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
<Script file="libs\LibRangeCheck-3.0\LibRangeCheck-3.0.lua"/>
<Include file="libs\LibSharedMedia-3.0\lib.xml"/>
<Include file="libs\AceGUI-3.0-SharedMediaWidgets\widget.xml"/>
<Script file="LibDataBroker-1.1.lua"/>

View File

@ -731,7 +731,7 @@ end
function IceClassPowerCounter.prototype:CreateFrame()
IceClassPowerCounter.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("LOW")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.frame:SetHeight(self.runeHeight)
self.frame:ClearAllPoints()
self.frame:SetPoint("TOP", self.parent, "BOTTOM", self.moduleSettings.hpos, self.moduleSettings.vpos)
@ -807,7 +807,7 @@ function IceClassPowerCounter.prototype:CreateRune(i)
-- create runes
if (not self.frame.graphical[i]) then
self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "BORDER")
self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)

View File

@ -337,7 +337,7 @@ end
function ComboPoints.prototype:CreateFrame()
ComboPoints.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.graphicalLayout == "Horizontal" then
self.frame:SetWidth((self.comboSize - 5)*self:GetMaxComboPoints())
self.frame:SetHeight(1)
@ -396,7 +396,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
end
end
self.frame.graphicalBG[i]:SetFrameStrata("BACKGROUND")
self.frame.graphicalBG[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphicalBG[i]:SetWidth(self.comboSize)
self.frame.graphicalBG[i]:SetHeight(self.comboSize)
if self.moduleSettings.graphicalLayout == "Horizontal" then
@ -432,7 +432,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
end
end
self.frame.graphical[i]:SetFrameStrata("LOW")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.frame.graphical[i]:SetAllPoints(self.frame.graphicalBG[i])
local r, g, b = self:GetColor("ComboPoints")
@ -471,7 +471,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
end
end
self.frame.graphicalAnt[i]:SetFrameStrata("LOW")
self.frame.graphicalAnt[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.frame.graphicalAnt[i]:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel() + 1)
self.frame.graphicalAnt[i]:SetWidth(math.floor(self.comboSize / 2))
self.frame.graphicalAnt[i]:SetHeight(math.floor(self.comboSize / 2))

View File

@ -326,7 +326,7 @@ end
function IceCustomCount.prototype:CreateFrame()
IceCustomCount.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.graphicalLayout == "Horizontal" then
self.frame:SetWidth((self.countSize + self.moduleSettings.countGap)*IceStackCounter_GetMaxCount(self))
self.frame:SetHeight(1)
@ -382,7 +382,7 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
end
end
self.frame.graphicalBG[i]:SetFrameStrata("BACKGROUND")
self.frame.graphicalBG[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphicalBG[i]:SetWidth(self.countSize)
self.frame.graphicalBG[i]:SetHeight(self.countSize)
if self.moduleSettings.graphicalLayout == "Horizontal" then
@ -416,7 +416,7 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
end
end
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i]:SetAllPoints(self.frame.graphicalBG[i])
self.frame.graphical[i]:Hide()

View File

@ -38,6 +38,7 @@ function DragonridingVigor.prototype:Enable(core)
end
DragonridingVigor.super.prototype.Enable(self, core)
self:Show(false)
self:RegisterEvent("UNIT_AURA", "CheckShouldShow")
self:RegisterEvent("UPDATE_UI_WIDGET", "UpdateVigorRecharge")
@ -54,16 +55,29 @@ function DragonridingVigor.prototype:CheckShouldShow(event, unit, info)
return
end
if knowsAlternateMountEnum and UnitPowerMax(self.unit, unitPowerType) > 0 then
self:Show(true)
elseif IceHUD:HasAnyBuff("player", DragonridingBuffs) then
self:Show(true)
else
local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(vigorWidgetID)
if not info or info.shownState == 0 then
self:Show(false)
self.suppressHideBlizz = true
if self.moduleSettings.hideBlizz then
self:ShowBlizz()
end
return
end
self:Show(true)
-- if knowsAlternateMountEnum and UnitPowerMax(self.unit, unitPowerType) > 0 then
-- self:Show(true)
-- elseif not knowsAlternateMountEnum and IceHUD:HasAnyBuff("player", DragonridingBuffs) then
-- self:Show(true)
-- else
-- self:Show(false)
-- if self.moduleSettings.hideBlizz then
-- self:ShowBlizz()
-- end
-- end
end
function DragonridingVigor.prototype:UpdateRunePower(event, arg1, arg2)
@ -78,6 +92,13 @@ function DragonridingVigor.prototype:UpdateVigorRecharge(event, widget)
return
end
local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(vigorWidgetID)
if not info then
return
end
self.suppressHideBlizz = not info or info.shownState == 0
if event ~= "internal" then
if self.moduleSettings.hideBlizz then
self:HideBlizz()
@ -86,11 +107,6 @@ function DragonridingVigor.prototype:UpdateVigorRecharge(event, widget)
end
end
local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(vigorWidgetID)
if not info then
return
end
if info.numFullFrames == info.numTotalFrames then
return
end
@ -150,11 +166,21 @@ function DragonridingVigor.prototype:GetPartialRuneAtlas(rune)
end
function DragonridingVigor.prototype:ShowBlizz()
UIWidgetPowerBarContainerFrame:Show()
local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(vigorWidgetID)
if not info or info.shownState == 0 then
return
end
UIWidgetPowerBarContainerFrame.widgetFrames[vigorWidgetID]:Show()
end
function DragonridingVigor.prototype:HideBlizz()
UIWidgetPowerBarContainerFrame:Hide()
if not UIWidgetPowerBarContainerFrame.widgetFrames or not UIWidgetPowerBarContainerFrame.widgetFrames[vigorWidgetID] then
return
end
if not self.suppressHideBlizz then
UIWidgetPowerBarContainerFrame.widgetFrames[vigorWidgetID]:Hide()
end
end
-- Load us up

View File

@ -422,9 +422,9 @@ end
function FocusHealth.prototype:UpdateRaidFocusIcon()
if self.moduleSettings.raidIconOnTop then
self.frame.raidIcon:SetFrameStrata("MEDIUM")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
else
self.frame.raidIcon:SetFrameStrata("LOW")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
end
if not (UnitExists(self.unit)) or not self.moduleSettings.showRaidIcon then

View File

@ -38,7 +38,7 @@ function GlobalCoolDown.prototype:Enable(core)
self:Show(false)
self.frame:SetFrameStrata("LOW")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.CDSpellId = self:GetSpellId()
end
@ -289,6 +289,12 @@ function GlobalCoolDown.prototype:GetSpellId()
if not GetSpellInfo(defaultSpells["PALADIN"]) then
defaultSpells["PALADIN"] = 635
end
if not GetSpellInfo(defaultSpells["MAGE"]) then
defaultSpells["MAGE"] = 133
end
if not GetSpellInfo(defaultSpells["WARRIOR"]) then
defaultSpells["WARRIOR"] = 6673
end
local _, unitClass = UnitClass("player")
return defaultSpells[unitClass]

View File

@ -475,7 +475,7 @@ function PlayerMana.prototype:CreateTickerFrame()
self.tickerFrame = CreateFrame("Frame", nil, self.barFrame)
end
self.tickerFrame:SetFrameStrata("BACKGROUND")
self.tickerFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.tickerFrame:SetWidth(self.settings.barWidth)
self.tickerFrame:SetHeight(self.settings.barHeight)

View File

@ -11,7 +11,7 @@ function RangeCheck.prototype:init()
self.scalingEnabled = true
LibRange = LibStub("LibRangeCheck-2.0", true)
LibRange = LibStub("LibRangeCheck-3.0", true)
end
function RangeCheck.prototype:Enable(core)
@ -126,7 +126,7 @@ function RangeCheck.prototype:CreateFrame(redraw)
end
self.frame:SetScale(self.moduleSettings.scale)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(200)
self.frame:SetHeight(32)
self.frame:ClearAllPoints()

View File

@ -456,7 +456,7 @@ end
function Runes.prototype:CreateFrame()
Runes.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(self.runeSize*self.numRunes)
self.frame:SetHeight(1)
self.frame:ClearAllPoints()
@ -516,7 +516,7 @@ function Runes.prototype:CreateRune(i, type, name)
self.frame.graphical[i].shine = self.frame.graphical[i]:CreateTexture(nil, "OVERLAY")
end
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i]:SetWidth(self.runeSize)
self.frame.graphical[i]:SetHeight(self.runeSize)
@ -546,7 +546,7 @@ function Runes.prototype:CreateRune(i, type, name)
self.frame.graphical[i]:Hide()
end
self.frame.graphical[i].cd:SetFrameStrata("BACKGROUND")
self.frame.graphical[i].cd:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i].cd:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
self.frame.graphical[i].cd:ClearAllPoints()
self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])

View File

@ -17,6 +17,12 @@ local staggerIds = {LightID, ModerateID, HeavyID}
local MinLevel = 10
local STAGGER_YELLOW_TRANSITION, STAGGER_RED_TRANSITION = STAGGER_YELLOW_TRANSITION, STAGGER_RED_TRANSITION
if STAGGER_STATES then
STAGGER_YELLOW_TRANSITION = STAGGER_STATES.YELLOW.threshold
STAGGER_RED_TRANSITION = STAGGER_STATES.RED.threshold
end
StaggerBar.prototype.StaggerDuration = 0
StaggerBar.prototype.StaggerEndTime = 0

View File

@ -204,6 +204,6 @@ end
-- Fulzamoth 2019-09-27 : load in Classic if LibClassicCasterino exists
-- Load us up
if not IceHUD.WowClassic or LibClassicCasterino then
if IceHUD.CanShowTargetCasting then
IceHUD.TargetCast = TargetCast:new()
end

View File

@ -984,9 +984,9 @@ end
function IceTargetHealth.prototype:UpdateRaidTargetIcon()
if self.moduleSettings.raidIconOnTop then
self.frame.raidIcon:SetFrameStrata("MEDIUM")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
else
self.frame.raidIcon:SetFrameStrata("LOW")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
end
if not self.moduleSettings.showRaidIcon or (not UnitExists(self.unit) and (not self.configMode and not IceHUD.IceCore:IsInConfigMode())) then

View File

@ -1136,7 +1136,7 @@ do -- OVERRIDE: IceTargetInfo.prototype:CreateFrame(redraw)
self.frame:SetScale(self.moduleSettings.scale)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(self.width)
self.frame:SetHeight(32)
self.frame:ClearAllPoints()
@ -1220,7 +1220,7 @@ function IceTargetInfo.prototype:CreateAuraFrame(aura, redraw)
if (not self.frame[auraFrame]) then
self.frame[auraFrame] = CreateFrame("Frame", nil, self.frame)
self.frame[auraFrame]:SetFrameStrata("BACKGROUND")
self.frame[auraFrame]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame[auraFrame]:SetWidth(1)
self.frame[auraFrame]:SetHeight(1)
self.frame[auraFrame]:Show()
@ -1244,7 +1244,7 @@ end
do
local function FrameFactory(frameType, parentFrame, inheritsFrame)
local frame = CreateFrame(frameType, nil, parentFrame, inheritsFrame)
frame:SetFrameStrata("BACKGROUND")
frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
frame:ClearAllPoints()
return frame
end
@ -1453,7 +1453,7 @@ function IceTargetInfo.prototype:UpdateBuffType(aura)
end
else
self.frame[auraFrame].iconFrames[i]:Hide()
buffData[aura][i] = nil
table.remove(buffData[aura], i)
end
end
end

View File

@ -314,7 +314,7 @@ function TargetOfTarget.prototype:CreateFrame()
self.frame:SetAttribute("unit", self.unit)
end
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.sizeToGap then
self.frame:SetWidth(self.settings.gap)
else
@ -368,7 +368,7 @@ function TargetOfTarget.prototype:CreateBarFrame()
self.frame.bg:SetTexture(0,0,0)
self.frame.bar:SetFrameStrata("BACKGROUND")
self.frame.bar:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.sizeToGap then
self.frame.bg:SetWidth(self.settings.gap + 2)
self.frame.bar:SetWidth(self.settings.gap)
@ -435,7 +435,7 @@ function TargetOfTarget.prototype:CreateDebuffFrame()
end
self.frame.debuffFrame = CreateFrame("Frame", nil, self.frame)
self.frame.debuffFrame:SetFrameStrata("BACKGROUND")
self.frame.debuffFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.debuffFrame:SetWidth(10)
self.frame.debuffFrame:SetHeight(self.height)
@ -451,7 +451,7 @@ function TargetOfTarget.prototype:CreateIconFrames(parent)
for i = 1, IceCore.BuffLimit do
buffs[i] = CreateFrame("Frame", nil, parent)
buffs[i]:SetFrameStrata("BACKGROUND")
buffs[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
buffs[i]:SetWidth(self.buffSize)
buffs[i]:SetHeight(self.buffSize)
buffs[i]:SetPoint("LEFT", (i-1) * self.buffSize + (i-1), 0)

View File

@ -265,7 +265,7 @@ end
function Totems.prototype:CreateFrame()
Totems.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(self.totemSize*self.numTotems)
self.frame:SetHeight(1)
self.frame:ClearAllPoints()
@ -349,7 +349,7 @@ function Totems.prototype:CreateTotem(i, name)
self.frame.graphical[i].totem:SetAllPoints(self.frame.graphical[i])
end
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i]:SetWidth(self.totemSize)
self.frame.graphical[i]:SetHeight(self.totemSize)
@ -380,7 +380,7 @@ function Totems.prototype:CreateTotem(i, name)
end
end
self.frame.graphical[i].cd:SetFrameStrata("BACKGROUND")
self.frame.graphical[i].cd:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i].cd:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
self.frame.graphical[i].cd:ClearAllPoints()
self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])

View File

@ -1,5 +1,60 @@
# Changelog
v1.14.37:
- Update LibRangeCheck version to address taint issues (wowace ticket #353)
v1.14.36:
- Really fix IceHUD stomping on other uses of the PowerBarContainer such as the Digging bar for the Archive event.
v1.14.35:
- Fix IceHUD stomping on other uses of the PowerBarContainer such as the Digging bar for the Archive event.
v1.14.34:
- Fix Vigor showing up sometimes when it shouldn't.
v1.14.33:
- Update TOC for Dragonflight to 10.2.5
v1.14.32:
- Enable GlobalCoolDown module in Classic Era 1.15.0+
- Enable tracking target buffs/debuffs in Classic Era 1.15.0+
v1.14.31:
- Fix nil concatenation error (wowace ticket #351)
v1.14.30:
- Update Classic-era TOC for 1.15.0
- Enable TargetCastBar module on Classic-era 1.15+
v1.14.29:
- Fix Stagger bar error for 10.2.0 (wowace ticket #348)
v1.14.28:
- Update TOC for Dragonflight to 10.2.0
v1.14.27:
- Update TOC for Dragonflight to 10.1.7
v1.14.26:
- Update TOC for classic-era to 1.14.4
v1.14.25:
- Fixed lua error that would appear when targetting webwrapped players in heroic alpha/beta titan rune dungeons.
- Added ability to adjust strata globally.
v1.14.24:
- Fixed an error when targeting a player and right-clicking a module that should show a menu in 10.1.5.