Skip to content

Commit

Permalink
4.4.0 (54737)
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed May 17, 2024
1 parent 6d67162 commit 8dcd94a
Show file tree
Hide file tree
Showing 20 changed files with 112 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,20 @@ local AchievementInfo =
{ Name = "supercedingAchievements", Type = "table", InnerType = "number", Nilable = false },
},
},
{
Name = "IsGuildAchievement",
Type = "Function",

Arguments =
{
{ Name = "achievementId", Type = "number", Nilable = false },
},

Returns =
{
{ Name = "isGuild", Type = "bool", Nilable = false },
},
},
{
Name = "IsValidAchievement",
Type = "Function",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,16 @@ local PartyInfo =
{ Name = "invalidQueues", Type = "table", InnerType = "QueueSpecificInfo", Nilable = false },
},
},
{
Name = "InviteUnit",
Type = "Function",
Documentation = { "Attempt to invite the named unit to a party, requires confirmation in some cases (e.g. the party will convert to a raid, or if there is a party sync in progress)." },

Arguments =
{
{ Name = "targetName", Type = "cstring", Nilable = false },
},
},
{
Name = "IsCrossFactionParty",
Type = "Function",
Expand Down
10 changes: 5 additions & 5 deletions Interface/AddOns/Blizzard_ChatFrameBase/Classic/ChatFrame.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4309,7 +4309,7 @@ end

local function ChatEdit_SetDeactivated(editBox)
editBox:SetFrameStrata("LOW");
if ( editBox.disableActivate or GetCVar("chatStyle") == "classic" and not editBox.isGM ) then
if ( editBox.disableActivate or (GetCVar("chatStyle") == "classic" and not IsVoiceTranscription(editBox.chatFrame)) and not editBox.isGM ) then
editBox:Hide();
else
editBox:SetText("");
Expand Down Expand Up @@ -4338,7 +4338,7 @@ function ChatEdit_DeactivateChat(editBox)
end

function ChatEdit_ChooseBoxForSend(preferredChatFrame)
if ( GetCVar("chatStyle") == "classic" ) then
if ( (not IsVoiceTranscription(ChatEdit_GetLastActiveWindow().chatFrame)) and GetCVar("chatStyle") == "classic" ) then
return DEFAULT_CHAT_FRAME.editBox;
elseif ( preferredChatFrame and preferredChatFrame:IsShown() ) then
return preferredChatFrame.editBox;
Expand All @@ -4356,13 +4356,13 @@ function ChatEdit_SetLastActiveWindow(editBox)

local previousValue = LAST_ACTIVE_CHAT_EDIT_BOX;
if ( LAST_ACTIVE_CHAT_EDIT_BOX and not LAST_ACTIVE_CHAT_EDIT_BOX.isGM and LAST_ACTIVE_CHAT_EDIT_BOX ~= editBox ) then
if ( GetCVar("chatStyle") == "im" ) then
if ( IsVoiceTranscription(editBox.chatFrame) or GetCVar("chatStyle") == "im" ) then
LAST_ACTIVE_CHAT_EDIT_BOX:Hide();
end
end

LAST_ACTIVE_CHAT_EDIT_BOX = editBox;
if ( editBox and GetCVar("chatStyle") == "im" and ACTIVE_CHAT_EDIT_BOX ~= editBox ) then
if ( editBox and (IsVoiceTranscription(editBox.chatFrame) or GetCVar("chatStyle") == "im") and ACTIVE_CHAT_EDIT_BOX ~= editBox ) then
editBox:Show();
ChatEdit_SetDeactivated(editBox);
end
Expand Down Expand Up @@ -4716,7 +4716,7 @@ end

function ChatEdit_ClearChat(editBox)
ChatEdit_ResetChatTypeToSticky(editBox);
if ( not editBox.isGM and (GetCVar("chatStyle") ~= "im" or IsMacroEditBox(editBox)) ) then
if ( not editBox.isGM and ((not IsVoiceTranscription(editBox.chatFrame) and GetCVar("chatStyle") ~= "im") or IsMacroEditBox(editBox)) ) then
editBox:SetText("");
editBox:Hide();
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1600,12 +1600,13 @@ function FCF_Tab_OnClick(self, button)
-- Close all dropdowns
CloseDropDownMenus();

local lastChatFrame = SELECTED_CHAT_FRAME;
-- If frame is docked assume that a click is to select a chat window, not drag it
SELECTED_CHAT_FRAME = chatFrame;
if ( chatFrame.isDocked and FCFDock_GetSelectedWindow(GENERAL_CHAT_DOCK) ~= chatFrame ) then
FCF_SelectDockFrame(chatFrame);
end
if ( GetCVar("chatStyle") ~= "classic" ) then
if ( (IsVoiceTranscription(lastChatFrame) or IsVoiceTranscription(chatFrame)) or GetCVar("chatStyle") ~= "classic" ) then
ChatEdit_SetLastActiveWindow(chatFrame.editBox);
end
chatFrame:ResetAllFadeTimes();
Expand Down Expand Up @@ -1847,6 +1848,9 @@ end

function FCF_MinimizeFrame(chatFrame, side)
local chatTab = _G[chatFrame:GetName().."Tab"];
if chatTab == nil then
return;
end

local createdFrame = false;
if ( not chatFrame.minFrame ) then
Expand All @@ -1870,6 +1874,9 @@ end
function FCF_MaximizeFrame(chatFrame)
local minFrame = chatFrame.minFrame;
local chatTab = _G[chatFrame:GetName().."Tab"];
if chatTab == nil then
return;
end

chatFrame.minimized = false;

Expand Down Expand Up @@ -2606,6 +2613,14 @@ end

FloatingChatFrameMinimizeButtonMixin = {};

function FloatingChatFrameMinimizeButtonMixin:OnLoad()
local chatFrame = self:GetParent();
local chatTab = _G[chatFrame:GetName().."Tab"];
if chatTab == nil then
self:Hide();
end
end

function FloatingChatFrameMinimizeButtonMixin:OnClick()
local chatFrame = self:GetParent();
FCF_MinimizeFrame(chatFrame, strupper(chatFrame.buttonSide));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,7 @@
<Anchor point="LEFT" relativeTo="$parentButtonFrame" relativePoint="LEFT" x="0" y="0"/>
</Anchors>
<Scripts>
<OnLoad method="OnLoad"/>
<OnClick method="OnClick"/>
</Scripts>
<NormalTexture file="Interface\ChatFrame\UI-ChatIcon-Minimize-Up"/>
Expand Down
2 changes: 2 additions & 0 deletions Interface/AddOns/Blizzard_Deprecated/Deprecated_4_4_0.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@ do
local result = newSendAddonMessageLoggedFunc(...);
return (result == Enum.RegisterAddonMessagePrefixResult.Success), result;
end

InviteUnit = C_PartyInfo.InviteUnit;
end
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Shared\CinematicFrame.xml
Classic\ColorPickerFrame.lua
Classic\ColorPickerFrame.xml
TBC\WorldStateFrame.lua
TBC\WorldStateFrame.xml
Cata\WorldStateFrame.xml
Classic\TalentFrameBase_Shared.lua
Cata\TalentFrameBase.lua
Cata\Blizzard_TalentUITemplates.xml
Expand Down
1 change: 0 additions & 1 deletion Interface/AddOns/Blizzard_FrameXML/Timer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ function TimerTracker_OnEvent(self, event, ...)
elseif event == "START_PLAYER_COUNTDOWN" then
local initiatedBy, timeSeconds, totalTime = ...;
TimerTracker_StartTimerOfType(self, TIMER_TYPE_PLAYER_COUNTDOWN, timeSeconds, totalTime);
PlaySound(SOUNDKIT.READY_CHECK);
elseif event == "CANCEL_PLAYER_COUNTDOWN" then
local initiatedBy = ...;
TimerTracker_StartTimerOfType(self, TIMER_TYPE_PLAYER_COUNTDOWN, 0, 0);
Expand Down
43 changes: 43 additions & 0 deletions Interface/AddOns/Blizzard_FrameXMLBase/Shared/Constants.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,46 @@
MAX_RAID_MEMBERS = 40;
NUM_RAID_GROUPS = 8;
MEMBERS_PER_RAID_GROUP = 5;

CALENDAR_INVITESTATUS_INFO = {
["UNKNOWN"] = {
name = UNKNOWN,
color = NORMAL_FONT_COLOR,
},
[Enum.CalendarStatus.Confirmed] = {
name = CALENDAR_STATUS_CONFIRMED,
color = GREEN_FONT_COLOR,
},
[Enum.CalendarStatus.Available] = {
name = CALENDAR_STATUS_ACCEPTED,
color = GREEN_FONT_COLOR,
},
[Enum.CalendarStatus.Declined] = {
name = CALENDAR_STATUS_DECLINED,
color = RED_FONT_COLOR,
},
[Enum.CalendarStatus.Out] = {
name = CALENDAR_STATUS_OUT,
color = RED_FONT_COLOR,
},
[Enum.CalendarStatus.Standby] = {
name = CALENDAR_STATUS_STANDBY,
color = ORANGE_FONT_COLOR,
},
[Enum.CalendarStatus.Invited] = {
name = CALENDAR_STATUS_INVITED,
color = NORMAL_FONT_COLOR,
},
[Enum.CalendarStatus.Signedup] = {
name = CALENDAR_STATUS_SIGNEDUP,
color = GREEN_FONT_COLOR,
},
[Enum.CalendarStatus.NotSignedup] = {
name = CALENDAR_STATUS_NOT_SIGNEDUP,
color = GRAY_FONT_COLOR,
},
[Enum.CalendarStatus.Tentative] = {
name = CALENDAR_STATUS_TENTATIVE,
color = ORANGE_FONT_COLOR,
},
};
4 changes: 3 additions & 1 deletion Interface/AddOns/Blizzard_GMChatUI/Blizzard_GMChatUI.lua
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ function GMChatFrame_OnLoad(self)
self:SetFont(DEFAULT_CHAT_FRAME:GetFont());
FCF_SetButtonSide(self, "left", true);
self.buttonFrame:SetAlpha(1);
self.buttonFrame.minimizeButton:Hide();
if self.buttonFrame.minimizeButton ~= nil then
self.buttonFrame.minimizeButton:Hide();
end

self.editBox:ClearAllPoints();
self.editBox:SetPoint("TOPRIGHT", self, "BOTTOMRIGHT", 8, -2);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ServerAlert.xml
Classic\AccountLogin.lua
Classic\AccountLogin.xml
TBC\RealmList.lua
TBC\RealmList.xml
Cata\RealmList.xml
Classic\CharacterServicesPatchwerk.xml
Classic\CharacterSelect.lua
TBC\CharacterSelect.xml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2620,7 +2620,7 @@ StaticPopupDialogs["CONVERT_TO_RAID"] = {
button2 = CANCEL,
OnAccept = function(self, data)
ConvertToRaid();
InviteUnit(data);
C_PartyInfo.InviteUnit(data);
end,
timeout = 0,
exclusive = 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ Classic\WorldFrame.xml
Classic\UIParentDebugMenu.lua
Cata\UIParent.lua
Classic\UIParent.xml
Shared\Localization.lua
Shared\Localization.lua
Shared\UIParent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ Classic\WorldFrame.xml
Classic\UIParentDebugMenu.lua
Vanilla\UIParent.lua
Classic\UIParent.xml
Shared\Localization.lua
Shared\Localization.lua
Shared\UIParent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ Classic\WorldFrame.xml
Classic\UIParentDebugMenu.lua
Wrath\UIParent.lua
Classic\UIParent.xml
Shared\Localization.lua
Shared\Localization.lua
Shared\UIParent.lua
2 changes: 1 addition & 1 deletion Interface/AddOns/Blizzard_UIParent/Cata/UIParent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2385,7 +2385,7 @@ function InviteToGroup(name)
dialog.data = name;
end
else
InviteUnit(name);
C_PartyInfo.InviteUnit(name);
end
end

Expand Down
2 changes: 1 addition & 1 deletion Interface/AddOns/Blizzard_UIParent/TBC/UIParent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2224,7 +2224,7 @@ function InviteToGroup(name)
dialog.data = name;
end
else
InviteUnit(name);
C_PartyInfo.InviteUnit(name);
end
end

Expand Down
2 changes: 1 addition & 1 deletion Interface/AddOns/Blizzard_UIParent/Vanilla/UIParent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2198,7 +2198,7 @@ function InviteToGroup(name)
dialog.data = name;
end
else
InviteUnit(name);
C_PartyInfo.InviteUnit(name);
end
end

Expand Down
2 changes: 1 addition & 1 deletion Interface/AddOns/Blizzard_UIParent/Wrath/UIParent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +2320,7 @@ function InviteToGroup(name)
dialog.data = name;
end
else
InviteUnit(name);
C_PartyInfo.InviteUnit(name);
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1230,14 +1230,17 @@ end

--Utility Functions
function CompactUnitFrame_UtilShouldDisplayBuff(unit, index, filter)
local name, icon, count, debuffType, duration, expirationTime, unitCaster, canStealOrPurge, _, spellId, canApplyAura = UnitBuff(unit, index, filter);
local name, icon, count, debuffType, duration, expirationTime, unitCaster, canStealOrPurge, shouldConsolidate, spellId, canApplyAura = UnitBuff(unit, index, filter);
if GetClassicExpansionLevel() < LE_EXPANSION_CATACLYSM then
shouldConsolidate = false;
end

local hasCustom, alwaysShowMine, showForMySpec = SpellGetVisibilityInfo(spellId, UnitAffectingCombat("player") and "RAID_INCOMBAT" or "RAID_OUTOFCOMBAT");

if ( hasCustom ) then
return showForMySpec or (alwaysShowMine and (unitCaster == "player" or unitCaster == "pet" or unitCaster == "vehicle"));
else
return (unitCaster == "player" or unitCaster == "pet" or unitCaster == "vehicle") and canApplyAura and not SpellIsSelfBuff(spellId);
return (unitCaster == "player" or unitCaster == "pet" or unitCaster == "vehicle") and not shouldConsolidate and canApplyAura and not SpellIsSelfBuff(spellId);
end
end

Expand Down

0 comments on commit 8dcd94a

Please sign in to comment.