Compare commits

...

5 Commits

6 changed files with 55 additions and 24 deletions

View File

@ -2,54 +2,58 @@ package-as: IceHUD
externals: externals:
libs/LibStub: libs/LibStub:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/LibStub url: https://repos.wowace.com/wow/libstub/trunk
tag: latest tag: latest
libs/CallbackHandler-1.0: libs/CallbackHandler-1.0:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/CallbackHandler-1.0 url: https://repos.wowace.com/wow/callbackhandler/trunk
tag: latest tag: latest
libs/AceEvent-3.0: libs/AceEvent-3.0:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceEvent-3.0 url: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
tag: latest tag: latest
libs/AceTimer-3.0: libs/AceTimer-3.0:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceTimer-3.0 url: https://repos.wowace.com/wow/ace3/trunk/AceTimer-3.0
tag: latest tag: latest
libs/AceDB-3.0: libs/AceDB-3.0:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceDB-3.0 url: https://repos.wowace.com/wow/ace3/trunk/AceDB-3.0
tag: latest tag: latest
libs/AceDBOptions-3.0: libs/AceDBOptions-3.0:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceDBOptions-3.0 url: https://repos.wowace.com/wow/ace3/trunk/AceDBOptions-3.0
tag: latest tag: latest
libs/AceConfig-3.0: libs/AceConfig-3.0:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceConfig-3.0 url: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
tag: latest tag: latest
libs/AceGUI-3.0: libs/AceGUI-3.0:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceGUI-3.0 url: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
tag: latest tag: latest
libs/AceGUI-3.0-SharedMediaWidgets: libs/AceGUI-3.0-SharedMediaWidgets:
url: svn://svn.wowace.com/wow/ace-gui-3-0-shared-media-widgets/mainline/trunk/AceGUI-3.0-SharedMediaWidgets url: https://repos.wowace.com/wow/ace-gui-3-0-shared-media-widgets/trunk
tag: latest tag: latest
libs/AceAddon-3.0: libs/AceAddon-3.0:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceAddon-3.0 url: https://repos.wowace.com/wow/ace3/trunk/AceAddon-3.0
tag: latest tag: latest
libs/AceConsole-3.0: libs/AceConsole-3.0:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceConsole-3.0 url: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
tag: latest tag: latest
libs/AceLocale-3.0: libs/AceLocale-3.0:
url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.0 url: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
tag: latest tag: latest
libs/LibRangeCheck-2.0: libs/LibRangeCheck-2.0:
url: svn://svn.wowace.com/wow/librangecheck-2-0/mainline/trunk/LibRangeCheck-2.0 url: https://repos.wowace.com/wow/librangecheck-2-0/trunk
libs/LibSharedMedia-3.0: libs/LibSharedMedia-3.0:
url: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/trunk url: https://repos.wowace.com/wow/libsharedmedia-3-0/trunk
tag: latest tag: latest
libs/LibDogTag-3.0: libs/LibDogTag-3.0:
url: git://git.wowace.com/wow/libdogtag-3-0/mainline.git url: https://repos.wowace.com/wow/libdogtag-3-0
tag: latest
type: git
libs/LibDogTag-Unit-3.0: libs/LibDogTag-Unit-3.0:
url: git://git.wowace.com/wow/libdogtag-unit-3-0/mainline.git url: https://repos.wowace.com/wow/libdogtag-unit-3-0
tag: latest
type: git
libs/LibDBIcon-1.0: libs/LibDBIcon-1.0:
url: svn://svn.wowace.com/wow/libdbicon-1-0/mainline/trunk/LibDBIcon-1.0 url: https://repos.wowace.com/wow/libdbicon-1-0/trunk
libs/LibDualSpec-1.0: libs/LibDualSpec-1.0:
url: git://git.wowace.com/wow/libdualspec-1-0/mainline.git url: https://repos.wowace.com/wow/libdualspec-1-0
optional-dependencies: optional-dependencies:
- libdogtag-3-0 - libdogtag-3-0

View File

@ -1,5 +1,5 @@
#@retail@ #@retail@
## Interface: 90001 ## Interface: 90002
#@end-retail@ #@end-retail@
#@non-retail@ #@non-retail@
# ## Interface: 11305 # ## Interface: 11305

View File

@ -1,5 +1,5 @@
#@retail@ #@retail@
## Interface: 90001 ## Interface: 90002
#@end-retail@ #@end-retail@
#@non-retail@ #@non-retail@
# ## Interface: 11305 # ## Interface: 11305

View File

@ -1,8 +1,13 @@
# Changelog # Changelog
vNext: v1.13.2:
- Fixed which version of LibDogTag was being packaged. The previous version did not have 9.0 compatibility and was generating errors (ticket #293).
v1.13.1:
- Added support for Anima-charged combo points for Kyrian covenant (ticket #291). - Added support for Anima-charged combo points for Kyrian covenant (ticket #291).
- Updated TOC for 9.0.2
v1.13.0: v1.13.0:

View File

@ -223,8 +223,29 @@ function ComboPoints.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 35
} }
if IceHUD.WowVer >= 90000 then
opts["bShowAnimaCharged"] = {
type = 'toggle',
width = 'double',
name = L["Show Anima-charged points"],
desc = L["Whether or not to color an anima-charged combo point a separate color. Set the KyrianAnimaComboPoint color to the color you would like it to be."],
get = function()
return self.moduleSettings.bShowAnimaCharged
end,
set = function(info, v)
self.moduleSettings.bShowAnimaCharged = v
self:UpdateChargedComboPoints()
end,
disabled = function()
return not self.moduleSettings.enabled
end,
order = 36
}
end
return opts return opts
end end
@ -243,6 +264,7 @@ function ComboPoints.prototype:GetDefaultSettings()
defaults["comboGap"] = 0 defaults["comboGap"] = 0
defaults["showAnticipation"] = true defaults["showAnticipation"] = true
defaults["bShowWithNoTarget"] = true defaults["bShowWithNoTarget"] = true
defaults["bShowAnimaCharged"] = true
return defaults return defaults
end end
@ -420,7 +442,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
g = g - ((1 / maxComboPoints)*i) g = g - ((1 / maxComboPoints)*i)
end end
if i == self.chargedPowerPointIndex then if i == self.chargedPowerPointIndex and self.moduleSettings.bShowAnimaCharged then
self.frame.graphical[i].texture:SetVertexColor(self:GetColor("KyrianAnimaComboPoint")) self.frame.graphical[i].texture:SetVertexColor(self:GetColor("KyrianAnimaComboPoint"))
else else
self.frame.graphical[i].texture:SetVertexColor(r, g, b) self.frame.graphical[i].texture:SetVertexColor(r, g, b)

View File

@ -1,5 +1,5 @@
# Changelog # Changelog
vNext: v1.13.2:
- Added support for Anima-charged combo points for Kyrian covenant (ticket #291). - Fixed which version of LibDogTag was being packaged. The previous version did not have 9.0 compatibility and was generating errors (ticket #293).