Compare commits

..

10 Commits

Author SHA1 Message Date
Sumsebrum
ff619e7228 Merge branch 'hotfix/v2.27-readme' into main 2023-10-03 19:19:07 +02:00
Sumsebrum
8bd027c614 v2.27-Release readme 2023-10-03 19:18:46 +02:00
Sumsebrum
393af7875d Merge branch 'hotfix/v2.27' into main 2023-10-03 19:14:44 +02:00
Sumsebrum
468cbf24f3 #81 NeatPlates fix & version v2.27-Release 2023-10-03 19:14:16 +02:00
Sumsebrum
50987addb5 Merge branch 'hotfix/v2.26' into main 2023-09-30 20:46:27 +02:00
Sumsebrum
7930335294 v2.26 2023-09-30 20:45:57 +02:00
Sumsebrum
535fedab1a plater fix 2023-09-30 20:44:22 +02:00
Sumsebrum
6be69bc51c Merge branch 'hotfix/v2.25' into main 2023-09-29 20:42:55 +02:00
Sumsebrum
5f8807a879 bump version v2.25-Release 2023-09-29 20:42:19 +02:00
Sumsebrum
c122e24054 #81 elvui totemplates fix 2023-09-29 20:37:54 +02:00
7 changed files with 32 additions and 19 deletions

View File

@ -26,11 +26,11 @@ local LibStub = LibStub
--------------------------- ---------------------------
local MAJOR, MINOR = "Gladdy", 12 local MAJOR, MINOR = "Gladdy", 15
local Gladdy = LibStub:NewLibrary(MAJOR, MINOR) local Gladdy = LibStub:NewLibrary(MAJOR, MINOR)
local L local L
Gladdy.version_major_num = 2 Gladdy.version_major_num = 2
Gladdy.version_minor_num = 0.24 Gladdy.version_minor_num = 0.27
Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num
Gladdy.version_releaseType = RELEASE_TYPES.release Gladdy.version_releaseType = RELEASE_TYPES.release
Gladdy.version = PREFIX .. string.format("%.2f", Gladdy.version_num) .. "-" .. Gladdy.version_releaseType Gladdy.version = PREFIX .. string.format("%.2f", Gladdy.version_num) .. "-" .. Gladdy.version_releaseType

View File

@ -1,5 +1,5 @@
## Title: Gladdy |cFFFF0000 game client not supported|r ## Title: Gladdy |cFFFF0000 game client not supported|r
## Version: 2.24-Release ## Version: 2.27-Release
## Notes: The most powerful arena AddOn for WoW Classic TBC/WotLK ## Notes: The most powerful arena AddOn for WoW Classic TBC/WotLK
## Author: XiconQoo, DnB_Junkee, Knall ## Author: XiconQoo, DnB_Junkee, Knall
## X-Email: contact me on discord Knall#1751 ## X-Email: contact me on discord Knall#1751

View File

@ -1,6 +1,6 @@
## Interface: 20504 ## Interface: 20504
## Title: Gladdy - TBC ## Title: Gladdy - TBC
## Version: 2.24-Release ## Version: 2.27-Release
## Notes: The most powerful arena AddOn for WoW 2.5.4 ## Notes: The most powerful arena AddOn for WoW 2.5.4
## Author: XiconQoo, DnB_Junkee, Knall ## Author: XiconQoo, DnB_Junkee, Knall
## X-Email: contact me on discord Knall#1751 ## X-Email: contact me on discord Knall#1751

View File

@ -1,6 +1,6 @@
## Interface: 30402 ## Interface: 30402
## Title: Gladdy - WotLK ## Title: Gladdy - WotLK
## Version: 2.24-Release ## Version: 2.27-Release
## Notes: The most powerful arena AddOn for WoW 3.4.2 ## Notes: The most powerful arena AddOn for WoW 3.4.2
## Author: XiconQoo, DnB_Junkee, Knall ## Author: XiconQoo, DnB_Junkee, Knall
## X-Email: contact me on discord Knall#1751 ## X-Email: contact me on discord Knall#1751

View File

@ -173,7 +173,6 @@ Debuff({ 20170 } ,{ buffType = "physical", }, "PALADIN") -- Seal of Justice stun
Debuff({ 63529 } ,{ buffType = "magic", }, "PALADIN") -- Shield of the Templar Debuff({ 63529 } ,{ buffType = "magic", }, "PALADIN") -- Shield of the Templar
Debuff({ 61840 } ,{ buffType = "magic", }, "PALADIN") -- Righteous Vengeance Debuff({ 61840 } ,{ buffType = "magic", }, "PALADIN") -- Righteous Vengeance
Debuff({ 10326 }, { buffType = "magic"}, "PALADIN") -- Turn Evil Debuff({ 10326 }, { buffType = "magic"}, "PALADIN") -- Turn Evil
Debuff({ 31803 }, { buffType = "magic"}, "PALADIN") -- Holy Vengeance
------------- -------------

View File

@ -203,13 +203,15 @@ end
function TotemPlates:NAME_PLATE_UNIT_REMOVED(unitID) function TotemPlates:NAME_PLATE_UNIT_REMOVED(unitID)
local nameplate = C_NamePlate.GetNamePlateForUnit(unitID) local nameplate = C_NamePlate.GetNamePlateForUnit(unitID)
self.activeTotemNameplates[unitID] = nil self.activeTotemNameplates[unitID] = nil
--self:ToggleAddon(nameplate, true)
if nameplate.gladdyTotemFrame then if nameplate.gladdyTotemFrame then
nameplate.gladdyTotemFrame:Hide() nameplate.gladdyTotemFrame:Hide()
nameplate.gladdyTotemFrame:SetParent(nil) nameplate.gladdyTotemFrame:SetParent(nil)
tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame) tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame)
nameplate.gladdyTotemFrame = nil nameplate.gladdyTotemFrame = nil
end end
if (self.addon == "ElvUI") then
self:ToggleAddon(nameplate, true)
end
end end
--------------------------------------------------- ---------------------------------------------------
@ -373,23 +375,25 @@ function TotemPlates:ToggleAddon(nameplate, show)
local addonFrames = { self:GetAddonFrame(nameplate) } local addonFrames = { self:GetAddonFrame(nameplate) }
if addonFrames and #addonFrames > 0 then if addonFrames and #addonFrames > 0 then
if show then if show then
for _,v in ipairs(addonFrames) do for _, frame in ipairs(addonFrames) do
if nameplate.unitFrame and nameplate.unitFrame.UpdateAllElements then if frame.UpdateAllElements then
Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_ADDED - nameplate.unitFrame:UpdateAllElements") Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_ADDED - nameplate.unitFrame:UpdateAllElements")
nameplate.unitFrame:UpdateAllElements("NAME_PLATE_UNIT_ADDED") frame:Show()
frame:UpdateAllElements("NAME_PLATE_UNIT_ADDED")
else else
Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_ADDED - Show") Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_ADDED - Show")
v:Show() frame:Show()
end end
end end
else else
for _,v in ipairs(addonFrames) do for _, frame in ipairs(addonFrames) do
if nameplate.unitFrame and nameplate.unitFrame.UpdateAllElements then if frame.UpdateAllElements then
Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_REMOVED - nameplate.unitFrame:UpdateAllElements") Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_REMOVED - nameplate.unitFrame:UpdateAllElements")
nameplate.unitFrame:UpdateAllElements("NAME_PLATE_UNIT_REMOVED") frame:UpdateAllElements("NAME_PLATE_UNIT_REMOVED")
frame:Hide()
else else
Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_REMOVED - Hide") Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_REMOVED - Hide")
v:Hide() frame:Hide()
end end
end end
end end
@ -402,7 +406,7 @@ function TotemPlates.OnUpdate(self)
else else
self.selectionHighlight:SetAlpha(0) self.selectionHighlight:SetAlpha(0)
end end
if (TotemPlates.addon == "Plater" or TotemPlates.addon == "Tukui" or TotemPlates.addon == "ElvUI") and self.parent and self.parent.unitFrame then if (TotemPlates.addon == "Plater" or TotemPlates.addon == "Tukui") and self.parent and self.parent.unitFrame then
self.parent.unitFrame:Hide() self.parent.unitFrame:Hide()
end end
end end
@ -454,7 +458,7 @@ function TotemPlates:OnUnitEvent(unitID)
nameplate.gladdyTotemFrame.parent = nameplate nameplate.gladdyTotemFrame.parent = nameplate
nameplate.gladdyTotemFrame:Show() nameplate.gladdyTotemFrame:Show()
TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, unitID) TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, unitID)
self:ToggleAddon(nameplate) self:ToggleAddon(nameplate, false)
self.activeTotemNameplates[unitID] = nameplate self.activeTotemNameplates[unitID] = nameplate
elseif totemDataEntry and not Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled and Gladdy.db.npTotemsHideDisabledTotems then elseif totemDataEntry and not Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled and Gladdy.db.npTotemsHideDisabledTotems then
if nameplate.gladdyTotemFrame then if nameplate.gladdyTotemFrame then
@ -463,7 +467,7 @@ function TotemPlates:OnUnitEvent(unitID)
tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame) tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame)
nameplate.gladdyTotemFrame = nil nameplate.gladdyTotemFrame = nil
end end
self:ToggleAddon(nameplate) self:ToggleAddon(nameplate, false)
else else
self:ToggleAddon(nameplate, true) self:ToggleAddon(nameplate, true)
end end

View File

@ -4,7 +4,7 @@
--- ---
## [v2.24-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.24-Release/Gladdy_Classic_v2.24-Release.zip) ## [v2.27-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.27-Release/Gladdy_Classic_v2.27-Release.zip)
###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work ###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work
@ -61,6 +61,7 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca
- [dfherr](https://github.com/dfherr) - [dfherr](https://github.com/dfherr)
- [miraage](https://github.com/miraage) - [miraage](https://github.com/miraage)
- [veiz](https://github.com/veiz) - [veiz](https://github.com/veiz)
- [Flamanis](https://github.com/Flamanis)
Thank you! Thank you!
@ -80,6 +81,15 @@ Thank you!
### Changes ### Changes
### v2.27-Release
- fix TotemPlates interfering with NeatPlates
### v2.26-Release
- fix TotemPlates interfering with Plater (thanks again [Flamanis](https://github.com/Flamanis))
### v2.25-Release
- fix TotemPlates interfering with ElvUI (thanks [Flamanis](https://github.com/Flamanis))
### v2.24-Release ### v2.24-Release
- fix for WotLK v30402 (update libs) - fix for WotLK v30402 (update libs)
- update DRList - update DRList