Commit 1ddbaefc authored by Ivaria's avatar Ivaria
Browse files

Merge branch 'master' into tbcc

parents 56472b0b 4d201d9c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
## Title: VuhDo ['vu:du:] ## Title: VuhDo ['vu:du:]
## Author: Iza@Gilneas, humfras, Ivaria@Hyjal ## Author: Iza@Gilneas, humfras, Ivaria@Hyjal
## Version: 3.125-tbcc ## Version: 3.126-tbcc
## Notes: Raid Frames providing click-heal functionality, buff and debuff control, main tank management and much more ## Notes: Raid Frames providing click-heal functionality, buff and debuff control, main tank management and much more
## X-Curse-Project-ID: 7950 ## X-Curse-Project-ID: 7950
......
...@@ -600,7 +600,7 @@ local VUHDO_DEFAULT_CONFIG = { ...@@ -600,7 +600,7 @@ local VUHDO_DEFAULT_CONFIG = {
["isName"] = false, ["isName"] = false,
["isShowOnlyForFriendly"] = false, ["isShowOnlyForFriendly"] = false,
["blacklistModi"] = "ALT-CTRL-SHIFT", ["blacklistModi"] = "ALT-CTRL-SHIFT",
["selected"] = "", ["SELECTED"] = "",
["point"] = "TOPRIGHT", ["point"] = "TOPRIGHT",
["xAdjust"] = -2, ["xAdjust"] = -2,
["yAdjust"] = -34, ["yAdjust"] = -34,
......
...@@ -33,7 +33,7 @@ local VUHDO_DEFAULT_PROFILES = { ...@@ -33,7 +33,7 @@ local VUHDO_DEFAULT_PROFILES = {
["animate"] = true, ["animate"] = true,
["scale"] = 0.8, ["scale"] = 0.8,
["isIcon"] = true, ["isIcon"] = true,
["selected"] = "", ["SELECTED"] = "",
["TIMER_TEXT"] = { ["TIMER_TEXT"] = {
["X_ADJUST"] = 20, ["X_ADJUST"] = 20,
["USE_MONO"] = false, ["USE_MONO"] = false,
...@@ -96,7 +96,7 @@ local VUHDO_DEFAULT_PROFILES = { ...@@ -96,7 +96,7 @@ local VUHDO_DEFAULT_PROFILES = {
["isOthers"] = false, ["isOthers"] = false,
["duration"] = 2, ["duration"] = 2,
["showTrailOfLight"] = false, ["showTrailOfLight"] = false,
["selected"] = "", ["SELECTED"] = "",
}, },
["SHOW_TEXT_OVERHEAL"] = true, ["SHOW_TEXT_OVERHEAL"] = true,
}, },
...@@ -748,7 +748,7 @@ local VUHDO_DEFAULT_PROFILES = { ...@@ -748,7 +748,7 @@ local VUHDO_DEFAULT_PROFILES = {
["isOthers"] = false, ["isOthers"] = false,
["duration"] = 2, ["duration"] = 2,
["showTrailOfLight"] = false, ["showTrailOfLight"] = false,
["selected"] = "", ["SELECTED"] = "",
}, },
}, },
["LOCKED"] = false, ["LOCKED"] = false,
...@@ -2569,10 +2569,16 @@ function VUHDO_loadProfile(aName) ...@@ -2569,10 +2569,16 @@ function VUHDO_loadProfile(aName)
if (VUHDO_initCustomDebuffComboModel ~= nil) then if (VUHDO_initCustomDebuffComboModel ~= nil) then
VUHDO_initCustomDebuffComboModel(); VUHDO_initCustomDebuffComboModel();
VuhDoNewOptionsDebuffsCustomStorePanelEditBox:SetText("");
VUHDO_customDebuffUpdateEditBox(VuhDoNewOptionsDebuffsCustomStorePanelEditBox);
end end
if (VUHDO_initSpellTraceComboModel ~= nil) then if (VUHDO_initSpellTraceComboModel ~= nil) then
VUHDO_initSpellTraceComboModel(); VUHDO_initSpellTraceComboModel();
VuhDoNewOptionsGeneralSpellTraceStorePanelEditBox:SetText("");
VUHDO_spellTraceUpdateEditBox(VuhDoNewOptionsGeneralSpellTraceStorePanelEditBox);
end end
collectgarbage('collect'); collectgarbage('collect');
......
...@@ -412,16 +412,20 @@ function VUHDO_deleteCustomDebuffOnClick(aButton) ...@@ -412,16 +412,20 @@ function VUHDO_deleteCustomDebuffOnClick(aButton)
if (tIndex ~= nil and #tValue > 0) then if (tIndex ~= nil and #tValue > 0) then
tremove(VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED"], tIndex); tremove(VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED"], tIndex);
VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue] = nil; VUHDO_CONFIG["CUSTOM_DEBUFF"]["STORED_SETTINGS"][tValue] = nil;
VUHDO_CONFIG["CUSTOM_DEBUFF"]["SELECTED"] = "";
VUHDO_Msg("(de)buff " .. tValue .. " removed.", 1, 0.4, 0.4); VUHDO_Msg("(de)buff " .. tValue .. " removed.", 1, 0.4, 0.4);
else else
VUHDO_Msg("(de)buff " .. tValue .. " doesn't exist.", 1, 0.4, 0.4); VUHDO_Msg("(de)buff " .. tValue .. " doesn't exist.", 1, 0.4, 0.4);
end end
VUHDO_initCustomDebuffComboModel(); VUHDO_initCustomDebuffComboModel();
VuhDoNewOptionsDebuffsCustomStorePanelEditBox:SetText("");
VUHDO_customDebuffUpdateEditBox(VuhDoNewOptionsDebuffsCustomStorePanelEditBox); VUHDO_customDebuffUpdateEditBox(VuhDoNewOptionsDebuffsCustomStorePanelEditBox);
VuhDoNewOptionsDebuffsCustom:Hide(); VuhDoNewOptionsDebuffsCustom:Hide();
VuhDoNewOptionsDebuffsCustom:Show(); VuhDoNewOptionsDebuffsCustom:Show();
VuhDoNewOptionsDebuffsCustomStorePanelEditBox:SetText("");
end end
......
...@@ -176,18 +176,20 @@ function VUHDO_deleteSpellTraceOnClick(aButton) ...@@ -176,18 +176,20 @@ function VUHDO_deleteSpellTraceOnClick(aButton)
if (tIndex ~= nil and #tValue > 0) then if (tIndex ~= nil and #tValue > 0) then
tremove(VUHDO_CONFIG["SPELL_TRACE"]["STORED"], tIndex); tremove(VUHDO_CONFIG["SPELL_TRACE"]["STORED"], tIndex);
VUHDO_CONFIG["SPELL_TRACE"]["STORED_SETTINGS"][tValue] = nil; VUHDO_CONFIG["SPELL_TRACE"]["STORED_SETTINGS"][tValue] = nil;
VUHDO_CONFIG["SPELL_TRACE"]["SELECTED"] = "";
VUHDO_Msg(VUHDO_I18N_SPELL_TRACE .. " on spell \"" .. tValue .. "\" removed.", 1, 0.4, 0.4); VUHDO_Msg(VUHDO_I18N_SPELL_TRACE .. " on spell \"" .. tValue .. "\" removed.", 1, 0.4, 0.4);
else else
VUHDO_Msg(VUHDO_I18N_SPELL_TRACE .. " on spell \"" .. tValue .. "\" doesn't exist.", 1, 0.4, 0.4); VUHDO_Msg(VUHDO_I18N_SPELL_TRACE .. " on spell \"" .. tValue .. "\" doesn't exist.", 1, 0.4, 0.4);
end end
VUHDO_initSpellTraceComboModel(); VUHDO_initSpellTraceComboModel();
VuhDoNewOptionsGeneralSpellTraceStorePanelEditBox:SetText("");
VUHDO_spellTraceUpdateEditBox(VuhDoNewOptionsGeneralSpellTraceStorePanelEditBox); VUHDO_spellTraceUpdateEditBox(VuhDoNewOptionsGeneralSpellTraceStorePanelEditBox);
VuhDoNewOptionsGeneralSpellTrace:Hide(); VuhDoNewOptionsGeneralSpellTrace:Hide();
VuhDoNewOptionsGeneralSpellTrace:Show(); VuhDoNewOptionsGeneralSpellTrace:Show();
VuhDoNewOptionsGeneralSpellTraceStorePanelEditBox:SetText("");
end end
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
## Title: VuhDo ['vu:du:] - Options ## Title: VuhDo ['vu:du:] - Options
## Author: Iza@Gilneas, humfras, Ivaria@Hyjal ## Author: Iza@Gilneas, humfras, Ivaria@Hyjal
## Version: 3.125-tbcc ## Version: 3.126-tbcc
## Notes: VuhDo Options ## Notes: VuhDo Options
## X-Curse-Project-ID: 7950 ## X-Curse-Project-ID: 7950
......
Version 3.126-tbcc
Known issues:
-- Spells by rank can be specified using a rank suffix:
-- Example: Lesser Heal(Rank 1)
-- Debuff tooltips are currently bugged when using ElvUI
-- Deselect 'VuhDo Options > Panels > Tooltips > Tooltips > Debuffs'
-- Shield bar is not working due to unavailable Blizzard APIs
-- Spell trace only works for known spells in the player's spellbook
-- Group roster changes will not be reflected during combat
-- Swapping a player between groups during combat will cause
-- unpredictable, negative results. Be warned!
Bugfixes:
Improvements:
--------------------------------------------------------------
Version 3.126
Known issues:
-- Shadowlands stat squish cleanup still a work in progress
-- AOE Advice spell equations need complete overhaul
-- Some text providers need changes to better display small numbers
-- Debuff tooltips are currently bugged when using ElvUI
-- Deselect 'VuhDo Options > Panels > Tooltips > Tooltips > Debuffs'
Bugfixes:
-- Fixed combobox model reset on profile change
Improvements:
--------------------------------------------------------------
Version 3.125-tbcc Version 3.125-tbcc
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment