Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: BigWigsMods/oRA3
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v10.2.2
Choose a base ref
...
head repository: BigWigsMods/oRA3
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Nov 12, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    65afa74 View commit details

Commits on Nov 22, 2023

  1. Copy the full SHA
    67b58b4 View commit details

Commits on Jan 16, 2024

  1. bump toc

    funkydude committed Jan 16, 2024
    Copy the full SHA
    7b75aae View commit details
  2. Update workflow

    funkydude committed Jan 16, 2024
    Copy the full SHA
    8f80c23 View commit details
  3. Add compat code for UnitAura changes

    funkydude committed Jan 16, 2024
    Copy the full SHA
    be15058 View commit details

Commits on Jan 26, 2024

  1. Alerts: Throttle CC breaks

    nebularg committed Jan 26, 2024
    Copy the full SHA
    8606a9c View commit details
  2. Gear: Update GetItemStats usage

    Resolves #137
    nebularg committed Jan 26, 2024
    Copy the full SHA
    464cebd View commit details

Commits on Feb 11, 2024

  1. Fix spell ordering on CC break alert (#138)

    Arrhae authored Feb 11, 2024
    Copy the full SHA
    dae54f7 View commit details

Commits on May 8, 2024

  1. bump toc

    funkydude committed May 8, 2024
    Copy the full SHA
    6c2e401 View commit details

Commits on May 12, 2024

  1. Fix LibDialog-1.0 issues

    nebularg committed May 12, 2024
    Copy the full SHA
    8964bb3 View commit details

Commits on Jun 21, 2024

  1. BattleRes: Inspect for engineer tinker

    nebularg committed Jun 21, 2024
    Copy the full SHA
    954a633 View commit details

Commits on Jul 9, 2024

  1. bump toc

    funkydude committed Jul 9, 2024
    Copy the full SHA
    91fa5ac View commit details

Commits on Jul 10, 2024

  1. Compat code for WoW 11

    funkydude committed Jul 10, 2024
    Copy the full SHA
    134461a View commit details

Commits on Jul 25, 2024

  1. Update C_Spell compat

    nebularg committed Jul 25, 2024
    Copy the full SHA
    1fdb6a9 View commit details
  2. Cooldowns: Comment out removed spell ids

    Closes #139
    Closes #140
    nebularg committed Jul 25, 2024
    Copy the full SHA
    5f6d160 View commit details
  3. Cooldowns: Actually fix GetSpellCooldown

    nebularg committed Jul 25, 2024
    Copy the full SHA
    c9e2fe7 View commit details

Commits on Jul 31, 2024

  1. Update frFR (#142)

    Alyndel authored Jul 31, 2024
    Copy the full SHA
    9efba29 View commit details

Commits on Aug 15, 2024

  1. RoleIcons: Fix icons

    Fixes #143
    nebularg committed Aug 15, 2024
    Copy the full SHA
    faa2c0f View commit details
  2. RoleIcons: Show tooltips while not in a raid

    nebularg committed Aug 15, 2024
    Copy the full SHA
    fdca7ca View commit details

Commits on Aug 23, 2024

  1. Copy the full SHA
    3bf0fd5 View commit details
  2. Purge unused luacheckrc globals

    nebularg committed Aug 23, 2024
    Copy the full SHA
    e6f2b82 View commit details

Commits on Sep 10, 2024

  1. bump toc

    funkydude committed Sep 10, 2024
    Copy the full SHA
    41e7f70 View commit details

Commits on Sep 16, 2024

  1. Consumables: Add TWW Flasks (#148)

    Ragowit authored Sep 16, 2024
    Copy the full SHA
    714cb1f View commit details

Commits on Oct 3, 2024

  1. Consumables: Add Hearty Well Fed (#150)

    Ragowit authored Oct 3, 2024
    Copy the full SHA
    035577c View commit details
  2. Update zhCN (#149)

    nanjuekaien1 authored Oct 3, 2024
    Copy the full SHA
    78b9c44 View commit details

Commits on Oct 30, 2024

  1. Consumables: Add Augmentation Rune, some food, maybe Vantus

    nebularg committed Oct 30, 2024
    Copy the full SHA
    51b7221 View commit details

Commits on Nov 21, 2024

  1. bump toc

    funkydude committed Nov 21, 2024
    Copy the full SHA
    1fa3bed View commit details

Commits on Jan 25, 2025

  1. bump toc

    funkydude committed Jan 25, 2025
    Copy the full SHA
    c64295c View commit details
2 changes: 1 addition & 1 deletion .github/workflows/build-classic.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:

steps:
- name: Checkout addon
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:

steps:
- name: Checkout addon
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ jobs:

steps:
- name: Checkout addon
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run luacheck
uses: BigWigsMods/actions/luacheck@master
136 changes: 21 additions & 115 deletions .luacheckrc
Original file line number Diff line number Diff line change
@@ -14,6 +14,11 @@ ignore = {
"432/self", -- Shadowing an upvalue argument
}
globals = {
-- Addons
"ElvUI",
"LibStub",
"Tukui",

-- wow std api
"abs",
"acos",
@@ -83,135 +88,72 @@ globals = {
"tremove",
"wipe",

-- framexml
"AuraUtil",
"CopyTable",
"getprinthandler",
"hash_SlashCmdList",
"setprinthandler",
"tContains",
"tDeleteItem",
"tInvert",
"tostringall",
"UIPanelWindows",
-- FrameXML
"CanOpenPanels",
"ChatTypeInfo",
"CopyTable",
"FriendsFrame",
"GameFontNormal",
"GameTooltip",
"GameTooltip_Hide",
"GetUIPanel",
"GetUIPanelWidth",
"SecondsToTime",
"SlashCmdList",
"UIPanelWindows",
"UIParent",
"tContains",

-- everything else
"AlertFrame",
-- API
"Ambiguate",
"BNGetFriendIndex",
"BNInviteFriend",
"BNIsSelf",
"BNSendWhisper",
"BasicMessageDialog",
"BossBanner",
"C_AddOns",
"C_BattleNet",
"C_CVar",
"C_ChatInfo",
"C_EncounterJournal",
"C_FriendList",
"C_GuildInfo",
"C_Item",
"C_Map",
"C_PaperDollInfo",
"C_PartyInfo",
"C_RaidLocks",
"C_Scenario",
"C_Spell",
"C_Timer",
"C_TradeSkillUI",
"C_UIWidgetManager",
"ChatFrame_ImportAllListsToHash",
"ChatTypeInfo",
"CheckInteractDistance",
"CinematicFrame_CancelCinematic",
"CollapseFactionHeader",
"C_UnitAuras",
"CombatLogGetCurrentEventInfo",
"CombatLog_String_GetIcon",
"CreateFrame",
"DemoteAssistant",
"DoReadyCheck",
"EJ_GetCreatureInfo",
"EJ_GetEncounterInfo",
"EJ_GetTierInfo",
"ElvUI",
"EnableAddOn",
"ExpandFactionHeader",
"FlashClientIcon",
"FriendsFrame",
"GameFontHighlight",
"GameFontNormal",
"GameTooltip",
"GameTooltip_Hide",
"GetAddOnDependencies",
"GetAddOnEnableState",
"GetAddOnInfo",
"GetAddOnMetadata",
"GetAddOnOptionalDependencies",
"GetAverageItemLevel",
"GetBattlefieldStatus",
"GetCVarBool",
"GetChannelDisplayInfo",
"GetChannelName",
"GetDetailedItemLevelInfo",
"GetDifficultyInfo",
"GetExpansionLevel",
"GetFactionInfo",
"GetFramesRegisteredForEvent",
"GetGuildInfo",
"GetGuildRosterInfo",
"GetInstanceInfo",
"GetInventoryItemLink",
"GetInventoryItemQuality",
"GetItemCount",
"GetItemSpell",
"GetItemStats",
"GetLFGMode",
"GetLocale",
"GetMaxBattlefieldID",
"GetMaxLevelForLatestExpansion",
"GetNumAddOns",
"GetNumDisplayChannels",
"GetNumFactions",
"GetNumGroupMembers",
"GetNumGuildMembers",
"GetNumSubgroupMembers",
"GetPartyAssignment",
"GetPlayerFacing",
"GetProfessionInfo",
"GetProfessions",
"GetRaidDifficultyID",
"GetRaidRosterInfo",
"GetRaidTargetIndex",
"GetReadyCheckStatus",
"GetReadyCheckTimeLeft",
"GetRealZoneText",
"GetRealmName",
"GetSpecialization",
"GetSpecializationInfoByID",
"GetSpecializationRole",
"GetSpecializationRoleByID",
"GetSpellBookItemName",
"GetSpellBookItemTexture",
"GetSpellCharges",
"GetSpellCooldown",
"GetSpellDescription",
"GetSpellInfo",
"GetSpellLink",
"GetSpellTabInfo",
"GetSpellTexture",
"GetSubZoneText",
"GetTexCoordsForRole",
"GetTexCoordsForRoleSmallCircle",
"GetTime",
"GetTrackedAchievements",
"GuildControlGetNumRanks",
"GuildControlGetRankName",
"InCombatLockdown",
"IsAddOnLoadOnDemand",
"IsAddOnLoaded",
"IsAltKeyDown",
"IsControlKeyDown",
"IsEncounterInProgress",
"IsEveryoneAssistant",
@@ -220,61 +162,31 @@ globals = {
"IsInGuild",
"IsInInstance",
"IsInRaid",
"IsItemInRange",
"IsLoggedIn",
"IsPartyLFG",
"IsShiftKeyDown",
"IsSpellKnown",
"IsTestBuild",
"LFGDungeonReadyPopup",
"LibStub",
"LoadAddOn",
"LoggingCombat",
"MovieFrame",
"ObjectiveTrackerFrame",
"PlaySound",
"PlaySoundFile",
"PlayerHasToy",
"PromoteToAssistant",
"RaidBossEmoteFrame",
"RaidNotice_AddMessage",
"RaidWarningFrame",
"RolePollPopup",
"SecondsToTime",
"SendChatMessage",
"SetEveryoneIsAssistant",
"SetPortraitToTexture",
"SetRaidDifficulties",
"SetRaidTarget",
"SlashCmdList",
"StopSound",
"Tukui",
"UIErrorsFrame",
"UIParent",
"UninviteUnit",
"UnitAffectingCombat",
"UnitAura",
"UnitCanAttack",
"UnitCastingInfo",
"UnitChannelInfo",
"UnitClass",
"UnitClassBase",
"UnitDetailedThreatSituation",
"UnitEffectiveLevel",
"UnitExists",
"UnitFactionGroup",
"UnitGUID",
"UnitGetTotalAbsorbs",
"UnitGroupRolesAssigned",
"UnitHealth",
"UnitHealthMax",
"UnitInBattleground",
"UnitInParty",
"UnitInRaid",
"UnitInRange",
"UnitInVehicle",
"UnitIsConnected",
"UnitIsCorpse",
"UnitIsDead",
"UnitIsDeadOrGhost",
"UnitIsFeignDeath",
@@ -287,11 +199,5 @@ globals = {
"UnitIsVisible",
"UnitLevel",
"UnitName",
"UnitPlayerControlled",
"UnitPosition",
"UnitPower",
"UnitPowerMax",
"UnitRace",
"UnitSetRole",
"WorldFrame",
}
56 changes: 38 additions & 18 deletions libs/LibDialog-1.0/LibDialog-1.0.lua
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@ local table = _G.table
-- Library namespace.
-----------------------------------------------------------------------
local LibStub = _G.LibStub
local MAJOR = "LibDialog-1.0"
local MAJOR = "LibDialog-1.0n"

_G.assert(LibStub, MAJOR .. " requires LibStub")

local MINOR = 8 -- Should be manually increased
local MINOR = 9 -- Should be manually increased
local lib, oldminor = LibStub:NewLibrary(MAJOR, MINOR)

if not lib then
@@ -124,6 +124,29 @@ local editbox_heap = lib.editbox_heap
-----------------------------------------------------------------------
-- Helper functions.
-----------------------------------------------------------------------
-- May 7th 2024, 1.15.2 and other clients still diverge on StaticPopup_DisplayedFrames / StaticPopup_HasDisplayedFrames
-- so we still need both to find the last StaticPopup for anchoring
local function _SetupAnchor(dialog)
local default_dialog
if _G.StaticPopup_DisplayedFrames then
default_dialog = _G.StaticPopup_DisplayedFrames[#_G.StaticPopup_DisplayedFrames]
elseif (_G.StaticPopup_HasDisplayedFrames and _G.StaticPopup_IsLastDisplayedFrame) then
if StaticPopup_HasDisplayedFrames() then
for idx = STATICPOPUP_NUMDIALOGS,1,-1 do
local test_dialog = _G["StaticPopup"..idx]
if StaticPopup_IsLastDisplayedFrame(test_dialog) then
default_dialog = test_dialog
end
end
end
end
if default_dialog then
dialog:SetPoint("TOP", default_dialog, "BOTTOM", 0, 0)
else
dialog:SetPoint("TOP", _G.UIParent, "TOP", 0, -135)
end
end

local function _ProcessQueue()
if #active_dialogs == MAX_DIALOGS then
return
@@ -148,13 +171,7 @@ local function _RefreshDialogAnchors()
current_dialog:ClearAllPoints()

if index == 1 then
local default_dialog = _G.StaticPopup_DisplayedFrames[#_G.StaticPopup_DisplayedFrames]

if default_dialog then
current_dialog:SetPoint("TOP", default_dialog, "BOTTOM", 0, 0)
else
current_dialog:SetPoint("TOP", _G.UIParent, "TOP", 0, -135)
end
_SetupAnchor(current_dialog)
else
current_dialog:SetPoint("TOP", active_dialogs[index - 1], "BOTTOM", 0, 0)
end
@@ -378,7 +395,11 @@ local function _AcquireCheckBox(parent, index)
active_checkboxes[#active_checkboxes + 1] = checkbox

checkbox:SetPoint("LEFT", 0, 0)
checkbox.text:SetText(parent.delegate.checkboxes[index].label or "")
if checkbox.Text then
checkbox.Text:SetText(parent.delegate.checkboxes[index].label or "")
elseif checkbox.text then
checkbox.text:SetText(parent.delegate.checkboxes[index].label or "")
end
checkbox.container:SetParent(parent)
checkbox:SetID(index)
checkbox:SetChecked(CheckBox_GetValue(checkbox))
@@ -675,7 +696,12 @@ local function _BuildDialog(delegate, data)
local max_string_width = 0

for index = 1, #dialog.checkboxes do
local string_width = dialog.checkboxes[index].text:GetStringWidth()
local string_width = 0
if dialog.checkboxes[index].Text then
dialog.checkboxes[index].Text:GetStringWidth()
elseif dialog.checkboxes[index].text then
dialog.checkboxes[index].text:GetStringWidth()
end

if string_width > max_string_width then
max_string_width = string_width
@@ -830,13 +856,7 @@ function lib:Spawn(reference, data)
if #active_dialogs > 0 then
dialog:SetPoint("TOP", active_dialogs[#active_dialogs], "BOTTOM", 0, 0)
else
local default_dialog = _G.StaticPopup_DisplayedFrames[#_G.StaticPopup_DisplayedFrames]

if default_dialog then
dialog:SetPoint("TOP", default_dialog, "BOTTOM", 0, 0)
else
dialog:SetPoint("TOP", _G.UIParent, "TOP", 0, -135)
end
_SetupAnchor(dialog)
end
active_dialogs[#active_dialogs + 1] = dialog
dialog:Show()
8 changes: 4 additions & 4 deletions locales/frFR.lua
Original file line number Diff line number Diff line change
@@ -149,7 +149,7 @@ L["hideDead"] = "Cacher quand mort"
L["hideOffline"] = "Cacher quand déconnecté"
L["hideOutOfCombat"] = "Cacher quand hors de combat"
L["hideOutOfRange"] = "Cacher quand hors de portée"
-- L["hideInGroupDesc"] = "Hide cooldowns in this type of group."
L["hideInGroupDesc"] = "Cache les temps de recharge de ce type de groupe."
L["hideInInstanceDesc"] = "Cache les temps de recharge dans ce type d'instance."
L["hideRolesDesc"] = "Cache les temps de recharge des joueurs ayant ce rôle."
L["hideGroupDesc"] = "Cache les temps de recharge des joueurs de ce groupe."
@@ -169,7 +169,7 @@ L["labelTextSettings"] = "Paramètre du texte du libellé"
L["durationTextSettings"] = "Paramètres du texte de durée"
L["useClassColor"] = "Couleur de classe"
L["customColor"] = "Couleur personnalisée"
-- L["classColorBorder"] = "Class color borders"
L["classColorBorder"] = "Bordures des couleurs de classe"
L["backgroundColor"] = "Couleur de l'arrière-plan"
L["useStatusColor"] = "Utiliser une couleur de statut"
L["useStatusColorDesc"] = "Change la couleur de la barre quand un joueur est hors portée, mort ou hors-ligne."
@@ -248,8 +248,8 @@ L["lockMonitor"] = "Verrouiller le moniteur"
L["battleResLockDesc"] = "Verrouille ou non le moniteur. Ceci masquera le texte d'en-tête, l'arrière-plan, et empêchera son déplacement."
L["showMonitor"] = "Afficher le moniteur"
L["battleResShowDesc"] = "Affiche ou cache le moniteur."
-- L["battleResAlwaysShow"] = "Always show"
-- L["battleResAlwaysShowDesc"] = "Show the display even when no class in the group can use a battle res."
L["battleResAlwaysShow"] = "Toujours afficher"
L["battleResAlwaysShowDesc"] = "Affiche le moniteur même si aucune classe du groupe ne peut utiliser de rez combat."

-- Consumables Module
L["consumables"] = "Vérif. des consommables"
Loading