mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 22:51:53 -05:00
Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
140596b930
|
|||
6ddb056cdf
|
|||
8df330d3b4
|
|||
1f9a1a3100
|
|||
40a25a3315
|
|||
6cee8c738c
|
|||
40fc8187fd
|
|||
b32f090644 | |||
d9cfb3a09c
|
@ -996,7 +996,7 @@ function IceBarElement.prototype:CreateBackground()
|
|||||||
self.frame = CreateFrame("Frame", "IceHUD_"..self.elementName, self.masterFrame)
|
self.frame = CreateFrame("Frame", "IceHUD_"..self.elementName, self.masterFrame)
|
||||||
end
|
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:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
|
||||||
self.frame:SetHeight(self.settings.barHeight)
|
self.frame:SetHeight(self.settings.barHeight)
|
||||||
|
|
||||||
@ -1041,6 +1041,7 @@ end
|
|||||||
-- Creates the actual bar
|
-- Creates the actual bar
|
||||||
function IceBarElement.prototype:CreateBar()
|
function IceBarElement.prototype:CreateBar()
|
||||||
self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK", "Bar")
|
self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK", "Bar")
|
||||||
|
|
||||||
self:SetBarCoord(self.barFrame)
|
self:SetBarCoord(self.barFrame)
|
||||||
|
|
||||||
self.barFrame.bar:SetBlendMode(self.settings.barBlendMode)
|
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)
|
barFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_"..(nameSuffix or "Bar"), self.frame)
|
||||||
end
|
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:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
|
||||||
barFrame:SetHeight(self.settings.barHeight)
|
barFrame:SetHeight(self.settings.barHeight)
|
||||||
self:SetBarFramePoints(barFrame)
|
self:SetBarFramePoints(barFrame)
|
||||||
|
46
IceCore.lua
46
IceCore.lua
@ -116,6 +116,8 @@ function IceCore.prototype:SetupDefaults()
|
|||||||
bHideInBarberShop = true,
|
bHideInBarberShop = true,
|
||||||
bHideDuringShellGame = true,
|
bHideDuringShellGame = true,
|
||||||
bHideDuringCataloging = true,
|
bHideDuringCataloging = true,
|
||||||
|
|
||||||
|
addedStrata = 0,
|
||||||
},
|
},
|
||||||
global = {
|
global = {
|
||||||
lastRunVersion = 0,
|
lastRunVersion = 0,
|
||||||
@ -610,7 +612,7 @@ function IceCore.prototype:IsEnabled()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function IceCore.prototype:DrawFrame()
|
function IceCore.prototype:DrawFrame()
|
||||||
self.IceHUDFrame:SetFrameStrata("BACKGROUND")
|
self.IceHUDFrame:SetFrameStrata(self:DetermineStrata("BACKGROUND"))
|
||||||
self.IceHUDFrame:SetWidth(self.settings.gap)
|
self.IceHUDFrame:SetWidth(self.settings.gap)
|
||||||
self.IceHUDFrame:SetHeight(20)
|
self.IceHUDFrame:SetHeight(20)
|
||||||
|
|
||||||
@ -931,6 +933,48 @@ function IceCore.prototype:SetColor(color, r, g, b)
|
|||||||
self:Redraw()
|
self:Redraw()
|
||||||
end
|
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()
|
function IceCore.prototype:IsInConfigMode()
|
||||||
return self.bConfigMode
|
return self.bConfigMode
|
||||||
|
@ -74,7 +74,7 @@ function IceElement.prototype:Create(parent)
|
|||||||
self.parent = parent
|
self.parent = parent
|
||||||
if not self.masterFrame then
|
if not self.masterFrame then
|
||||||
self.masterFrame = CreateFrame("Frame", "IceHUD_Element_"..self.elementName, self.parent)
|
self.masterFrame = CreateFrame("Frame", "IceHUD_Element_"..self.elementName, self.parent)
|
||||||
self.masterFrame:SetFrameStrata("MEDIUM")
|
self.masterFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
|
||||||
end
|
end
|
||||||
self:CreateFrame()
|
self:CreateFrame()
|
||||||
self:Show(false)
|
self:Show(false)
|
||||||
|
12
IceHUD.lua
12
IceHUD.lua
@ -886,11 +886,13 @@ local function munge_unit_menu(menu)
|
|||||||
if btns[i].IsMenu() then
|
if btns[i].IsMenu() then
|
||||||
local subbtns = btns[i].GetMenuButtons()
|
local subbtns = btns[i].GetMenuButtons()
|
||||||
for j=1, #subbtns do
|
for j=1, #subbtns do
|
||||||
local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()]
|
if subbtns[j] then
|
||||||
if not blacklisted then
|
local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()]
|
||||||
new_buttons_list[#new_buttons_list+1] = subbtns[j]
|
if not blacklisted then
|
||||||
elseif blacklisted ~= true then
|
new_buttons_list[#new_buttons_list+1] = subbtns[j]
|
||||||
new_buttons_list[#new_buttons_list+1] = blacklisted
|
elseif blacklisted ~= true then
|
||||||
|
new_buttons_list[#new_buttons_list+1] = blacklisted
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
## Interface: 100105
|
## Interface: 100200
|
||||||
## Interface-Retail: 100105
|
## Interface-Retail: 100200
|
||||||
## Interface-Classic: 11403
|
## Interface-Classic: 11404
|
||||||
## Interface-BCC: 20504
|
## Interface-BCC: 20504
|
||||||
## Interface-Wrath: 30402
|
## Interface-Wrath: 30403
|
||||||
## Author: Parnic, originally created by Iceroth
|
## Author: Parnic, originally created by Iceroth
|
||||||
## Name: IceHUD
|
## Name: IceHUD
|
||||||
## Title: IceHUD |cff7fff7f-Ace3-|r
|
## Title: IceHUD |cff7fff7f-Ace3-|r
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
## Interface: 100105
|
## Interface: 100200
|
||||||
## Interface-Retail: 100105
|
## Interface-Retail: 100200
|
||||||
## Interface-Classic: 11403
|
## Interface-Classic: 11404
|
||||||
## Interface-BCC: 20504
|
## Interface-BCC: 20504
|
||||||
## Interface-Wrath: 30402
|
## Interface-Wrath: 30403
|
||||||
## Title: IceHUD |cff7fff7f-Options-|r
|
## Title: IceHUD |cff7fff7f-Options-|r
|
||||||
## Author: Parnic
|
## Author: Parnic
|
||||||
## Version: @project-version@
|
## Version: @project-version@
|
||||||
|
@ -444,6 +444,22 @@ The Classic game client doesn't provide this information to addons because it wa
|
|||||||
hidden = not IceHUD.HasCataloging,
|
hidden = not IceHUD.HasCataloging,
|
||||||
order = 36,
|
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,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ function IceUnitBar.prototype:CreateFlashFrame()
|
|||||||
self.flashFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_Flash", self.frame)
|
self.flashFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_Flash", self.frame)
|
||||||
end
|
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:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
|
||||||
self.flashFrame:SetHeight(self.settings.barHeight)
|
self.flashFrame:SetHeight(self.settings.barHeight)
|
||||||
|
|
||||||
|
25
changelog.md
25
changelog.md
@ -1,5 +1,30 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
v1.14.23:
|
v1.14.23:
|
||||||
|
|
||||||
- Update Dragonflight TOC for 10.1.5
|
- Update Dragonflight TOC for 10.1.5
|
||||||
|
@ -731,7 +731,7 @@ end
|
|||||||
function IceClassPowerCounter.prototype:CreateFrame()
|
function IceClassPowerCounter.prototype:CreateFrame()
|
||||||
IceClassPowerCounter.super.prototype.CreateFrame(self)
|
IceClassPowerCounter.super.prototype.CreateFrame(self)
|
||||||
|
|
||||||
self.frame:SetFrameStrata("LOW")
|
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
|
||||||
self.frame:SetHeight(self.runeHeight)
|
self.frame:SetHeight(self.runeHeight)
|
||||||
self.frame:ClearAllPoints()
|
self.frame:ClearAllPoints()
|
||||||
self.frame:SetPoint("TOP", self.parent, "BOTTOM", self.moduleSettings.hpos, self.moduleSettings.vpos)
|
self.frame:SetPoint("TOP", self.parent, "BOTTOM", self.moduleSettings.hpos, self.moduleSettings.vpos)
|
||||||
@ -807,7 +807,7 @@ function IceClassPowerCounter.prototype:CreateRune(i)
|
|||||||
-- create runes
|
-- create runes
|
||||||
if (not self.frame.graphical[i]) then
|
if (not self.frame.graphical[i]) then
|
||||||
self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
|
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 = self.frame.graphical[i]:CreateTexture(nil, "BORDER")
|
||||||
self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)
|
self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)
|
||||||
|
@ -337,7 +337,7 @@ end
|
|||||||
function ComboPoints.prototype:CreateFrame()
|
function ComboPoints.prototype:CreateFrame()
|
||||||
ComboPoints.super.prototype.CreateFrame(self)
|
ComboPoints.super.prototype.CreateFrame(self)
|
||||||
|
|
||||||
self.frame:SetFrameStrata("BACKGROUND")
|
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
|
||||||
if self.moduleSettings.graphicalLayout == "Horizontal" then
|
if self.moduleSettings.graphicalLayout == "Horizontal" then
|
||||||
self.frame:SetWidth((self.comboSize - 5)*self:GetMaxComboPoints())
|
self.frame:SetWidth((self.comboSize - 5)*self:GetMaxComboPoints())
|
||||||
self.frame:SetHeight(1)
|
self.frame:SetHeight(1)
|
||||||
@ -396,7 +396,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
|
|||||||
end
|
end
|
||||||
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]:SetWidth(self.comboSize)
|
||||||
self.frame.graphicalBG[i]:SetHeight(self.comboSize)
|
self.frame.graphicalBG[i]:SetHeight(self.comboSize)
|
||||||
if self.moduleSettings.graphicalLayout == "Horizontal" then
|
if self.moduleSettings.graphicalLayout == "Horizontal" then
|
||||||
@ -432,7 +432,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
|
|||||||
end
|
end
|
||||||
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])
|
self.frame.graphical[i]:SetAllPoints(self.frame.graphicalBG[i])
|
||||||
|
|
||||||
local r, g, b = self:GetColor("ComboPoints")
|
local r, g, b = self:GetColor("ComboPoints")
|
||||||
@ -471,7 +471,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
|
|||||||
end
|
end
|
||||||
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]:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel() + 1)
|
||||||
self.frame.graphicalAnt[i]:SetWidth(math.floor(self.comboSize / 2))
|
self.frame.graphicalAnt[i]:SetWidth(math.floor(self.comboSize / 2))
|
||||||
self.frame.graphicalAnt[i]:SetHeight(math.floor(self.comboSize / 2))
|
self.frame.graphicalAnt[i]:SetHeight(math.floor(self.comboSize / 2))
|
||||||
|
@ -326,7 +326,7 @@ end
|
|||||||
function IceCustomCount.prototype:CreateFrame()
|
function IceCustomCount.prototype:CreateFrame()
|
||||||
IceCustomCount.super.prototype.CreateFrame(self)
|
IceCustomCount.super.prototype.CreateFrame(self)
|
||||||
|
|
||||||
self.frame:SetFrameStrata("BACKGROUND")
|
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
|
||||||
if self.moduleSettings.graphicalLayout == "Horizontal" then
|
if self.moduleSettings.graphicalLayout == "Horizontal" then
|
||||||
self.frame:SetWidth((self.countSize + self.moduleSettings.countGap)*IceStackCounter_GetMaxCount(self))
|
self.frame:SetWidth((self.countSize + self.moduleSettings.countGap)*IceStackCounter_GetMaxCount(self))
|
||||||
self.frame:SetHeight(1)
|
self.frame:SetHeight(1)
|
||||||
@ -382,7 +382,7 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
|
|||||||
end
|
end
|
||||||
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]:SetWidth(self.countSize)
|
||||||
self.frame.graphicalBG[i]:SetHeight(self.countSize)
|
self.frame.graphicalBG[i]:SetHeight(self.countSize)
|
||||||
if self.moduleSettings.graphicalLayout == "Horizontal" then
|
if self.moduleSettings.graphicalLayout == "Horizontal" then
|
||||||
@ -416,7 +416,7 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
|
|||||||
end
|
end
|
||||||
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]:SetAllPoints(self.frame.graphicalBG[i])
|
||||||
|
|
||||||
self.frame.graphical[i]:Hide()
|
self.frame.graphical[i]:Hide()
|
||||||
|
@ -107,7 +107,7 @@ function EclipseBar.prototype:CreateFrame()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function EclipseBar.prototype:CreateSolarBar()
|
function EclipseBar.prototype:CreateSolarBar()
|
||||||
self.solarBar = self:BarFactory(self.solarBar,"BACKGROUND", "ARTWORK", "Solar")
|
self.solarBar = self:BarFactory(self.solarBar, "BACKGROUND", "ARTWORK", "Solar")
|
||||||
self:SetBarCoord(self.solarBar, 0.5, true)
|
self:SetBarCoord(self.solarBar, 0.5, true)
|
||||||
|
|
||||||
self.solarBar.bar:SetVertexColor(self:GetColor("EclipseSolar", 1))
|
self.solarBar.bar:SetVertexColor(self:GetColor("EclipseSolar", 1))
|
||||||
|
@ -422,9 +422,9 @@ end
|
|||||||
|
|
||||||
function FocusHealth.prototype:UpdateRaidFocusIcon()
|
function FocusHealth.prototype:UpdateRaidFocusIcon()
|
||||||
if self.moduleSettings.raidIconOnTop then
|
if self.moduleSettings.raidIconOnTop then
|
||||||
self.frame.raidIcon:SetFrameStrata("MEDIUM")
|
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
|
||||||
else
|
else
|
||||||
self.frame.raidIcon:SetFrameStrata("LOW")
|
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
|
||||||
end
|
end
|
||||||
|
|
||||||
if not (UnitExists(self.unit)) or not self.moduleSettings.showRaidIcon then
|
if not (UnitExists(self.unit)) or not self.moduleSettings.showRaidIcon then
|
||||||
|
@ -38,7 +38,7 @@ function GlobalCoolDown.prototype:Enable(core)
|
|||||||
|
|
||||||
self:Show(false)
|
self:Show(false)
|
||||||
|
|
||||||
self.frame:SetFrameStrata("LOW")
|
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
|
||||||
|
|
||||||
self.CDSpellId = self:GetSpellId()
|
self.CDSpellId = self:GetSpellId()
|
||||||
end
|
end
|
||||||
|
@ -475,7 +475,7 @@ function PlayerMana.prototype:CreateTickerFrame()
|
|||||||
self.tickerFrame = CreateFrame("Frame", nil, self.barFrame)
|
self.tickerFrame = CreateFrame("Frame", nil, self.barFrame)
|
||||||
end
|
end
|
||||||
|
|
||||||
self.tickerFrame:SetFrameStrata("BACKGROUND")
|
self.tickerFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
|
||||||
self.tickerFrame:SetWidth(self.settings.barWidth)
|
self.tickerFrame:SetWidth(self.settings.barWidth)
|
||||||
self.tickerFrame:SetHeight(self.settings.barHeight)
|
self.tickerFrame:SetHeight(self.settings.barHeight)
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ function RangeCheck.prototype:CreateFrame(redraw)
|
|||||||
end
|
end
|
||||||
|
|
||||||
self.frame:SetScale(self.moduleSettings.scale)
|
self.frame:SetScale(self.moduleSettings.scale)
|
||||||
self.frame:SetFrameStrata("BACKGROUND")
|
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
|
||||||
self.frame:SetWidth(200)
|
self.frame:SetWidth(200)
|
||||||
self.frame:SetHeight(32)
|
self.frame:SetHeight(32)
|
||||||
self.frame:ClearAllPoints()
|
self.frame:ClearAllPoints()
|
||||||
|
@ -456,7 +456,7 @@ end
|
|||||||
function Runes.prototype:CreateFrame()
|
function Runes.prototype:CreateFrame()
|
||||||
Runes.super.prototype.CreateFrame(self)
|
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:SetWidth(self.runeSize*self.numRunes)
|
||||||
self.frame:SetHeight(1)
|
self.frame:SetHeight(1)
|
||||||
self.frame:ClearAllPoints()
|
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")
|
self.frame.graphical[i].shine = self.frame.graphical[i]:CreateTexture(nil, "OVERLAY")
|
||||||
end
|
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]:SetWidth(self.runeSize)
|
||||||
self.frame.graphical[i]:SetHeight(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()
|
self.frame.graphical[i]:Hide()
|
||||||
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:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
|
||||||
self.frame.graphical[i].cd:ClearAllPoints()
|
self.frame.graphical[i].cd:ClearAllPoints()
|
||||||
self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])
|
self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])
|
||||||
|
@ -214,7 +214,7 @@ function SliceAndDice.prototype:CreateFrame()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function SliceAndDice.prototype:CreateDurationBar()
|
function SliceAndDice.prototype:CreateDurationBar()
|
||||||
self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK", "Duration")
|
self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND", "ARTWORK", "Duration")
|
||||||
|
|
||||||
-- Rokiyo: Do we need to call this here?
|
-- Rokiyo: Do we need to call this here?
|
||||||
self.CurrScale = 0
|
self.CurrScale = 0
|
||||||
|
@ -17,6 +17,12 @@ local staggerIds = {LightID, ModerateID, HeavyID}
|
|||||||
|
|
||||||
local MinLevel = 10
|
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.StaggerDuration = 0
|
||||||
StaggerBar.prototype.StaggerEndTime = 0
|
StaggerBar.prototype.StaggerEndTime = 0
|
||||||
|
|
||||||
@ -137,7 +143,7 @@ function StaggerBar.prototype:CreateFrame()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function StaggerBar.prototype:CreateTimerBar()
|
function StaggerBar.prototype:CreateTimerBar()
|
||||||
self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM","ARTWORK", "Timer")
|
self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM", "ARTWORK", "Timer")
|
||||||
|
|
||||||
self.CurrScale = 0
|
self.CurrScale = 0
|
||||||
|
|
||||||
|
@ -984,9 +984,9 @@ end
|
|||||||
|
|
||||||
function IceTargetHealth.prototype:UpdateRaidTargetIcon()
|
function IceTargetHealth.prototype:UpdateRaidTargetIcon()
|
||||||
if self.moduleSettings.raidIconOnTop then
|
if self.moduleSettings.raidIconOnTop then
|
||||||
self.frame.raidIcon:SetFrameStrata("MEDIUM")
|
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
|
||||||
else
|
else
|
||||||
self.frame.raidIcon:SetFrameStrata("LOW")
|
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
|
||||||
end
|
end
|
||||||
|
|
||||||
if not self.moduleSettings.showRaidIcon or (not UnitExists(self.unit) and (not self.configMode and not IceHUD.IceCore:IsInConfigMode())) then
|
if not self.moduleSettings.showRaidIcon or (not UnitExists(self.unit) and (not self.configMode and not IceHUD.IceCore:IsInConfigMode())) then
|
||||||
|
@ -1136,7 +1136,7 @@ do -- OVERRIDE: IceTargetInfo.prototype:CreateFrame(redraw)
|
|||||||
|
|
||||||
self.frame:SetScale(self.moduleSettings.scale)
|
self.frame:SetScale(self.moduleSettings.scale)
|
||||||
|
|
||||||
self.frame:SetFrameStrata("BACKGROUND")
|
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
|
||||||
self.frame:SetWidth(self.width)
|
self.frame:SetWidth(self.width)
|
||||||
self.frame:SetHeight(32)
|
self.frame:SetHeight(32)
|
||||||
self.frame:ClearAllPoints()
|
self.frame:ClearAllPoints()
|
||||||
@ -1220,7 +1220,7 @@ function IceTargetInfo.prototype:CreateAuraFrame(aura, redraw)
|
|||||||
|
|
||||||
if (not self.frame[auraFrame]) then
|
if (not self.frame[auraFrame]) then
|
||||||
self.frame[auraFrame] = CreateFrame("Frame", nil, self.frame)
|
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]:SetWidth(1)
|
||||||
self.frame[auraFrame]:SetHeight(1)
|
self.frame[auraFrame]:SetHeight(1)
|
||||||
self.frame[auraFrame]:Show()
|
self.frame[auraFrame]:Show()
|
||||||
@ -1244,7 +1244,7 @@ end
|
|||||||
do
|
do
|
||||||
local function FrameFactory(frameType, parentFrame, inheritsFrame)
|
local function FrameFactory(frameType, parentFrame, inheritsFrame)
|
||||||
local frame = CreateFrame(frameType, nil, parentFrame, inheritsFrame)
|
local frame = CreateFrame(frameType, nil, parentFrame, inheritsFrame)
|
||||||
frame:SetFrameStrata("BACKGROUND")
|
frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
|
||||||
frame:ClearAllPoints()
|
frame:ClearAllPoints()
|
||||||
return frame
|
return frame
|
||||||
end
|
end
|
||||||
@ -1453,7 +1453,7 @@ function IceTargetInfo.prototype:UpdateBuffType(aura)
|
|||||||
end
|
end
|
||||||
else
|
else
|
||||||
self.frame[auraFrame].iconFrames[i]:Hide()
|
self.frame[auraFrame].iconFrames[i]:Hide()
|
||||||
buffData[aura][i] = nil
|
table.remove(buffData[aura], i)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -314,7 +314,7 @@ function TargetOfTarget.prototype:CreateFrame()
|
|||||||
self.frame:SetAttribute("unit", self.unit)
|
self.frame:SetAttribute("unit", self.unit)
|
||||||
end
|
end
|
||||||
|
|
||||||
self.frame:SetFrameStrata("BACKGROUND")
|
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
|
||||||
if self.moduleSettings.sizeToGap then
|
if self.moduleSettings.sizeToGap then
|
||||||
self.frame:SetWidth(self.settings.gap)
|
self.frame:SetWidth(self.settings.gap)
|
||||||
else
|
else
|
||||||
@ -368,7 +368,7 @@ function TargetOfTarget.prototype:CreateBarFrame()
|
|||||||
|
|
||||||
self.frame.bg:SetTexture(0,0,0)
|
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
|
if self.moduleSettings.sizeToGap then
|
||||||
self.frame.bg:SetWidth(self.settings.gap + 2)
|
self.frame.bg:SetWidth(self.settings.gap + 2)
|
||||||
self.frame.bar:SetWidth(self.settings.gap)
|
self.frame.bar:SetWidth(self.settings.gap)
|
||||||
@ -435,7 +435,7 @@ function TargetOfTarget.prototype:CreateDebuffFrame()
|
|||||||
end
|
end
|
||||||
self.frame.debuffFrame = CreateFrame("Frame", nil, self.frame)
|
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:SetWidth(10)
|
||||||
self.frame.debuffFrame:SetHeight(self.height)
|
self.frame.debuffFrame:SetHeight(self.height)
|
||||||
|
|
||||||
@ -451,7 +451,7 @@ function TargetOfTarget.prototype:CreateIconFrames(parent)
|
|||||||
|
|
||||||
for i = 1, IceCore.BuffLimit do
|
for i = 1, IceCore.BuffLimit do
|
||||||
buffs[i] = CreateFrame("Frame", nil, parent)
|
buffs[i] = CreateFrame("Frame", nil, parent)
|
||||||
buffs[i]:SetFrameStrata("BACKGROUND")
|
buffs[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
|
||||||
buffs[i]:SetWidth(self.buffSize)
|
buffs[i]:SetWidth(self.buffSize)
|
||||||
buffs[i]:SetHeight(self.buffSize)
|
buffs[i]:SetHeight(self.buffSize)
|
||||||
buffs[i]:SetPoint("LEFT", (i-1) * self.buffSize + (i-1), 0)
|
buffs[i]:SetPoint("LEFT", (i-1) * self.buffSize + (i-1), 0)
|
||||||
|
@ -231,7 +231,7 @@ end
|
|||||||
|
|
||||||
-- create the aggro range indicator bar
|
-- create the aggro range indicator bar
|
||||||
function IceThreat.prototype:CreateAggroBar()
|
function IceThreat.prototype:CreateAggroBar()
|
||||||
self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND","ARTWORK", "Aggro")
|
self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND", "ARTWORK", "Aggro")
|
||||||
|
|
||||||
local r, g, b = self:GetColor("ThreatPullAggro")
|
local r, g, b = self:GetColor("ThreatPullAggro")
|
||||||
if (self.settings.backgroundToggle) then
|
if (self.settings.backgroundToggle) then
|
||||||
|
@ -265,7 +265,7 @@ end
|
|||||||
function Totems.prototype:CreateFrame()
|
function Totems.prototype:CreateFrame()
|
||||||
Totems.super.prototype.CreateFrame(self)
|
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:SetWidth(self.totemSize*self.numTotems)
|
||||||
self.frame:SetHeight(1)
|
self.frame:SetHeight(1)
|
||||||
self.frame:ClearAllPoints()
|
self.frame:ClearAllPoints()
|
||||||
@ -349,7 +349,7 @@ function Totems.prototype:CreateTotem(i, name)
|
|||||||
self.frame.graphical[i].totem:SetAllPoints(self.frame.graphical[i])
|
self.frame.graphical[i].totem:SetAllPoints(self.frame.graphical[i])
|
||||||
end
|
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]:SetWidth(self.totemSize)
|
||||||
self.frame.graphical[i]:SetHeight(self.totemSize)
|
self.frame.graphical[i]:SetHeight(self.totemSize)
|
||||||
|
|
||||||
@ -380,7 +380,7 @@ function Totems.prototype:CreateTotem(i, name)
|
|||||||
end
|
end
|
||||||
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:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
|
||||||
self.frame.graphical[i].cd:ClearAllPoints()
|
self.frame.graphical[i].cd:ClearAllPoints()
|
||||||
self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])
|
self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])
|
||||||
|
@ -1,5 +1,30 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
v1.14.23:
|
v1.14.23:
|
||||||
|
|
||||||
- Update Dragonflight TOC for 10.1.5
|
- Update Dragonflight TOC for 10.1.5
|
||||||
|
Reference in New Issue
Block a user