Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ls- committed Nov 3, 2024
2 parents 0af3f94 + f99a548 commit 2d5abae
Show file tree
Hide file tree
Showing 30 changed files with 513 additions and 119 deletions.
31 changes: 31 additions & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ read_globals = {
"DebuffFrame",
"DeleteInboxItem",
"DifficultyUtil",
"DUNGEON_SCORE_LINK_ITEM_LEVEL",
"DUNGEONS_BUTTON",
"EJMicroButton",
"ENCHANTED_TOOLTIP_LINE",
Expand Down Expand Up @@ -218,6 +219,36 @@ read_globals = {
"InboxFrame",
"InCombatLockdown",
"InGuildParty",
"InspectBackSlot",
"InspectChestSlot",
"InspectFeetSlot",
"InspectFinger0Slot",
"InspectFinger1Slot",
"InspectFrame",
"InspectHandsSlot",
"InspectHeadSlot",
"InspectLegsSlot",
"InspectMainHandSlot",
"InspectModelFrame",
"InspectModelFrameBorderBottom",
"InspectModelFrameBorderBottom2",
"InspectModelFrameBorderBottomLeft",
"InspectModelFrameBorderBottomRight",
"InspectModelFrameBorderLeft",
"InspectModelFrameBorderRight",
"InspectModelFrameBorderTop",
"InspectModelFrameBorderTopLeft",
"InspectModelFrameBorderTopRight",
"InspectNeckSlot",
"InspectPaperDollItemsFrame",
"InspectSecondaryHandSlot",
"InspectShirtSlot",
"InspectShoulderSlot",
"InspectTabardSlot",
"InspectTrinket0Slot",
"InspectTrinket1Slot",
"InspectWaistSlot",
"InspectWristSlot",
"IsAltKeyDown",
"IsControlKeyDown",
"IsInActiveWorldPVP",
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# CHANGELOG

## Version 110005.01

- Added 11.0.5 support.

### Action Bars

- Fixed an issue where the guild emblem would appear on top the guild micro button.

### Blizzard

- Added custom inspect panel. Can be found at /LSUI > Blizzard > Inspect Frame, enabled by default.

### Unit Frames

- Fixed an issue where 3D portrait wouldn't fade properly.

## Version 110000.03

### Action Bars
Expand Down
12 changes: 11 additions & 1 deletion ls_UI/core/changelog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@ local _G = getfenv(0)

-- Mine
E.CHANGELOG = [[
- Added 11.0.5 support.
### Action Bars
- Fixed an issue where droids wouldn't get the skyriding bar in the flying form.
- Fixed an issue where the guild emblem would appear on top the guild micro button.
### Blizzard
- Added custom inspect panel. Can be found at /LSUI > Blizzard > Inspect Frame, enabled by default.
### Unit Frames
- Fixed an issue where 3D portrait wouldn't fade properly.
]]
30 changes: 20 additions & 10 deletions ls_UI/core/defaults.lua
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ D.global = {
[335152] = true, -- Sign of Iron
[359082] = true, -- Sign of the Legion
[397734] = true, -- Word of a Worthy Ally
[430191] = true, -- Warband Mentored Leveling
},
["M+ Affixes"] = {
state = true,
Expand All @@ -520,16 +521,18 @@ D.global = {
[226512] = true, -- Sanguine (Sanguine Ichor)
[240443] = true, -- Bursting (Burst)
[240559] = true, -- Grievous (Grievous Wound)
-- DRAGONFLIGHT SEASON 1
[396364] = true, -- Thundering (Mark of Wind)
[396369] = true, -- Thundering (Mark of Lightning)
[396411] = true, -- Thundering (Primal Overload)
-- DRAGONFLIGHT SEASON 2
[408556] = true, -- Entangling (Entangled)
[408805] = true, -- Incorporeal (Destabilize)
[409465] = true, -- Afflicted (Cursed Spirit)
[409470] = true, -- Afflicted (Poisoned Spirit)
[409472] = true, -- Afflicted (Diseased Spirit)
-- TWW SEASON 1
[440313] = true, -- Xal'atath's Bargain: Devour (Void Rift)
[440328] = true, -- Xal'atath's Bargain: Devour (Mending Void)
[465136] = true, -- Xal'atath's Bargain: Devour (Lingering Void)
[461895] = true, -- Xal'atath's Bargain: Ascendant (Unstable Power)
[461904] = true, -- Xal'atath's Bargain: Ascendant (Cosmic Ascension)
[461910] = true, -- Xal'atath's Bargain: Ascendant (Cosmic Ascension)
[461978] = true, -- Xal'atath's Bargain: Frenzied
[462508] = true, -- Xal'atath's Bargain: Voidbound (Dark Prayer)
[462510] = true, -- Xal'atath's Bargain: Voidbound (Dark Prayer)
[462704] = true, -- Xal'atath's Bargain: Oblivion (Shattered Essence)
[463767] = true, -- Xal'atath's Bargain: Oblivion (Void Essence)
},
},
textures = {
Expand Down Expand Up @@ -2814,6 +2817,10 @@ D.profile = {
ilvl = true,
enhancements = true,
},
inspect_frame = {
ilvl = true,
enhancements = true,
},
game_menu = {
scale = 1,
},
Expand Down Expand Up @@ -2891,6 +2898,9 @@ PrD.profile = {
character_frame = { -- CharacterFrame
enabled = true,
},
inspect_frame = { -- InspectFrame
enabled = true,
},
command_bar = { -- OrderHallCommandBar
enabled = true
},
Expand Down
10 changes: 9 additions & 1 deletion ls_UI/core/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,15 @@ do
end
end
elseif line.type == GEM_LINE then
gems[idx] = line.gemIcon and GEM_TEMPLATE:format(line.gemIcon) or SOCKET_TEMPLATE:format(line.socketType)
-- sidestep caching
local gemID = C_Item.GetItemGemID(itemLink, idx)
if gemID then
local _, _, _, _, icon = C_Item.GetItemInfoInstant(gemID)
gems[idx] = GEM_TEMPLATE:format(icon)
else
gems[idx] = SOCKET_TEMPLATE:format(line.socketType)
end

idx = idx + 1
end
end
Expand Down
2 changes: 1 addition & 1 deletion ls_UI/embeds/AceConfig-3.0/AceConfig-3.0.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- as well as associate it with a slash command.
-- @class file
-- @name AceConfig-3.0
-- @release $Id$
-- @release $Id: AceConfig-3.0.lua 1335 2024-05-05 19:35:16Z nevcairiel $

--[[
AceConfig-3.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames.
-- @class file
-- @name AceConfigCmd-3.0
-- @release $Id$
-- @release $Id: AceConfigCmd-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $

--[[
AceConfigCmd-3.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
-- @class file
-- @name AceConfigDialog-3.0
-- @release $Id$
-- @release $Id: AceConfigDialog-3.0.lua 1351 2024-07-24 18:23:24Z funkehdude $

local LibStub = LibStub
local gui = LibStub("AceGUI-3.0")
local reg = LibStub("AceConfigRegistry-3.0")

local MAJOR, MINOR = "AceConfigDialog-3.0", 86
local MAJOR, MINOR = "AceConfigDialog-3.0", 87
local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)

if not AceConfigDialog then return end
Expand Down Expand Up @@ -544,6 +544,7 @@ local function GetFuncName(option)
end
end
do
local InCombatLockdown = InCombatLockdown
local frame = AceConfigDialog.popup
if not frame or oldminor < 81 then
frame = CreateFrame("Frame", nil, UIParent)
Expand All @@ -556,13 +557,15 @@ do
frame:SetFrameLevel(100) -- Lots of room to draw under it
frame:SetScript("OnKeyDown", function(self, key)
if key == "ESCAPE" then
self:SetPropagateKeyboardInput(false)
if not InCombatLockdown() then
self:SetPropagateKeyboardInput(false)
end
if self.cancel:IsShown() then
self.cancel:Click()
else -- Showing a validation error
self:Hide()
end
else
elseif not InCombatLockdown() then
self:SetPropagateKeyboardInput(true)
end
end)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName".
-- @class file
-- @name AceConfigRegistry-3.0
-- @release $Id$
-- @release $Id: AceConfigRegistry-3.0.lua 1296 2022-11-04 18:50:10Z nevcairiel $
local CallbackHandler = LibStub("CallbackHandler-1.0")

local MAJOR, MINOR = "AceConfigRegistry-3.0", 21
Expand Down
41 changes: 39 additions & 2 deletions ls_UI/embeds/AceDB-3.0/AceDB-3.0.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
-- end
-- @class file
-- @name AceDB-3.0.lua
-- @release $Id$
local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 29
-- @release $Id: AceDB-3.0.lua 1353 2024-08-27 13:37:35Z nevcairiel $
local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 30
local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)

if not AceDB then return end -- No upgrade needed
Expand Down Expand Up @@ -525,6 +525,17 @@ function DBObjectLib:DeleteProfile(name, silent)
end
end

-- remove from unloaded namespaces
if self.sv.namespaces then
for nsname, data in pairs(self.sv.namespaces) do
if self.children and self.children[nsname] then
-- already a mapped namespace
elseif data.profiles then
data.profiles[name] = nil
end
end
end

-- switch all characters that use this profile back to the default
if self.sv.profileKeys then
for key, profile in pairs(self.sv.profileKeys) do
Expand Down Expand Up @@ -570,6 +581,20 @@ function DBObjectLib:CopyProfile(name, silent)
end
end

-- copy unloaded namespaces
if self.sv.namespaces then
for nsname, data in pairs(self.sv.namespaces) do
if self.children and self.children[nsname] then
-- already a mapped namespace
elseif data.profiles then
-- reset the current profile
data.profiles[self.keys.profile] = {}
-- copy data
copyTable(data.profiles[name], data.profiles[self.keys.profile])
end
end
end

-- Callback: OnProfileCopied, database, sourceProfileKey
self.callbacks:Fire("OnProfileCopied", self, name)
end
Expand All @@ -596,6 +621,18 @@ function DBObjectLib:ResetProfile(noChildren, noCallbacks)
end
end

-- reset unloaded namespaces
if self.sv.namespaces and not noChildren then
for nsname, data in pairs(self.sv.namespaces) do
if self.children and self.children[nsname] then
-- already a mapped namespace
elseif data.profiles then
-- reset the current profile
data.profiles[self.keys.profile] = nil
end
end
end

-- Callback: OnProfileReset, database
if not noCallbacks then
self.callbacks:Fire("OnProfileReset", self)
Expand Down
2 changes: 1 addition & 1 deletion ls_UI/embeds/AceDBOptions-3.0/AceDBOptions-3.0.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles.
-- @class file
-- @name AceDBOptions-3.0
-- @release $Id$
-- @release $Id: AceDBOptions-3.0.lua 1304 2023-05-19 19:50:10Z nevcairiel $
local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15
local AceDBOptions = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)

Expand Down
2 changes: 1 addition & 1 deletion ls_UI/embeds/AceGUI-3.0/AceGUI-3.0.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
-- f:AddChild(btn)
-- @class file
-- @name AceGUI-3.0
-- @release $Id$
-- @release $Id: AceGUI-3.0.lua 1288 2022-09-25 14:19:00Z funkehdude $
local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 41
local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--[[ $Id$ ]]--
--[[ $Id: AceGUIWidget-DropDown-Items.lua 1272 2022-08-29 15:56:35Z nevcairiel $ ]]--

local AceGUI = LibStub("AceGUI-3.0")

Expand Down
2 changes: 1 addition & 1 deletion ls_UI/embeds/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--[[ $Id$ ]]--
--[[ $Id: AceGUIWidget-DropDown.lua 1284 2022-09-25 09:15:30Z nevcairiel $ ]]--
local AceGUI = LibStub("AceGUI-3.0")

-- Lua APIs
Expand Down
11 changes: 5 additions & 6 deletions ls_UI/embeds/LibKeyBound-1.0/LibKeyBound-1.0.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--[[
Name: LibKeyBound-1.0
Revision: $Rev: 124 $
Revision: $Rev: 126 $
Author(s): Gello, Maul, Toadkiller, Tuller
Website: http://www.wowace.com/wiki/LibKeyBound-1.0
Documentation: http://www.wowace.com/wiki/LibKeyBound-1.0
Expand All @@ -10,7 +10,7 @@ Dependencies: CallbackHandler-1.0
--]]

local MAJOR = 'LibKeyBound-1.0'
local MINOR = 100000 + 3
local MINOR = 100000 + 4

--[[
LibKeyBound-1.0
Expand Down Expand Up @@ -43,7 +43,6 @@ LibKeyBound.L = L
LibKeyBound.Binder = LibKeyBound.Binder or {}

local SaveBindings = SaveBindings or AttemptToSaveBindings
local WoW10 = select(4, GetBuildInfo()) >= 100000

-- #NODOC
function LibKeyBound:Initialize()
Expand Down Expand Up @@ -92,7 +91,7 @@ function LibKeyBound:Initialize()
desc:SetText(format(L.BindingsHelp, GetBindingText('ESCAPE')))

-- Per character bindings checkbox
local perChar = CreateFrame('CheckButton', 'KeyboundDialogCheck', f, WoW10 and 'UICheckButtonTemplate' or 'OptionsCheckButtonTemplate')
local perChar = CreateFrame('CheckButton', 'KeyboundDialogCheck', f, 'UICheckButtonTemplate')
_G[perChar:GetName() .. 'Text']:SetText(CHARACTER_SPECIFIC_KEYBINDINGS)

perChar:SetScript('OnShow', function(self)
Expand All @@ -106,7 +105,7 @@ function LibKeyBound:Initialize()
end)

-- Okay bindings checkbox
local okayBindings = CreateFrame('CheckButton', 'KeyboundDialogOkay', f, WoW10 and 'UIPanelButtonTemplate' or 'OptionsButtonTemplate')
local okayBindings = CreateFrame('CheckButton', 'KeyboundDialogOkay', f, 'UIPanelButtonTemplate')
okayBindings:SetSize(100, 20)
getglobal(okayBindings:GetName() .. 'Text'):SetText(OKAY)

Expand Down Expand Up @@ -136,7 +135,7 @@ function LibKeyBound:Initialize()
end)

-- Cancel bindings checkbox
local cancelBindings = CreateFrame('CheckButton', 'KeyboundDialogCancel', f, WoW10 and 'UIPanelButtonTemplate' or 'OptionsButtonTemplate')
local cancelBindings = CreateFrame('CheckButton', 'KeyboundDialogCancel', f, 'UIPanelButtonTemplate')
cancelBindings:SetSize(100, 20)
getglobal(cancelBindings:GetName() .. 'Text'):SetText(CANCEL)

Expand Down
4 changes: 2 additions & 2 deletions ls_UI/embeds/TaintLess/TaintLess.toc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Interface: 11502, 40400, 100207
## Interface: 11503, 40400, 110002
## Title: TaintLess
## Notes: Eliminates certain classes of taint errors.
## Version: 24-06-02
## Version: 24-08-18
## IconTexture: 134125
TaintLess.xml
Loading

0 comments on commit 2d5abae

Please sign in to comment.