Skip to content

Commit

Permalink
11.0.7 (57788)
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Nov 26, 2024
1 parent ea41915 commit b9101f2
Show file tree
Hide file tree
Showing 54 changed files with 827 additions and 379 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,9 @@ local BattlePetConstants =
{
Name = "BattlepetDeletedReason",
Type = "Enumeration",
NumValues = 7,
NumValues = 8,
MinValue = 0,
MaxValue = 6,
MaxValue = 7,
Fields =
{
{ Name = "Unknown", Type = "BattlepetDeletedReason", EnumValue = 0 },
Expand All @@ -375,6 +375,7 @@ local BattlePetConstants =
{ Name = "CageError", Type = "BattlepetDeletedReason", EnumValue = 4 },
{ Name = "DelJournal", Type = "BattlepetDeletedReason", EnumValue = 5 },
{ Name = "TradingPost", Type = "BattlepetDeletedReason", EnumValue = 6 },
{ Name = "AccountStore", Type = "BattlepetDeletedReason", EnumValue = 7 },
},
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ RecruitAFriendSharedDocumentation.lua
ReportSystemConstantsDocumentation.lua
ScreenLocationConstantsDocumentation.lua
ScriptRegionSharedDocumentation.lua
SeasonsConstantsDocumentation.lua
SharedScriptObjectModelLightDocumentation.lua
SharedScriptObjectUnitPositionFrameDocumentation.lua
SharedTraitsEnumsDocumentation.lua
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@ local ChatConstants =
{
Tables =
{
{
Name = "ChannelPlayerFlags",
Type = "Enumeration",
NumValues = 5,
MinValue = 0,
MaxValue = 8,
Fields =
{
{ Name = "ChannelPlayerNone", Type = "ChannelPlayerFlags", EnumValue = 0 },
{ Name = "ChannelPlayerOwner", Type = "ChannelPlayerFlags", EnumValue = 1 },
{ Name = "ChannelPlayerModerator", Type = "ChannelPlayerFlags", EnumValue = 2 },
{ Name = "ChannelPlayerTextAllow", Type = "ChannelPlayerFlags", EnumValue = 4 },
{ Name = "ChannelPlayerHidden", Type = "ChannelPlayerFlags", EnumValue = 8 },
},
},
{
Name = "ChatChannelRuleset",
Type = "Enumeration",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,21 @@ local GameRules =
{ Name = "value", Type = "number", Nilable = false },
},
},
{
Name = "GetGameRuleAsFrameStrata",
Type = "Function",
Documentation = { "Returns the value specified in the Game Rule converted to a frame strata" },

Arguments =
{
{ Name = "gameRule", Type = "GameRule", Nilable = false },
},

Returns =
{
{ Name = "frameStrata", Type = "cstring", Nilable = false },
},
},
{
Name = "IsGameRuleActive",
Type = "Function",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
local SeasonsConstants =
{
Tables =
{
{
Name = "SeasonID",
Type = "Enumeration",
NumValues = 6,
MinValue = 0,
MaxValue = 12,
Fields =
{
{ Name = "NoSeason", Type = "SeasonID", EnumValue = 0 },
{ Name = "SeasonOfMastery", Type = "SeasonID", EnumValue = 1 },
{ Name = "SeasonOfDiscovery", Type = "SeasonID", EnumValue = 2 },
{ Name = "Hardcore", Type = "SeasonID", EnumValue = 3 },
{ Name = "Fresh", Type = "SeasonID", EnumValue = 11 },
{ Name = "FreshHardcore", Type = "SeasonID", EnumValue = 12 },
},
},
},
};

APIDocumentation:AddDocumentationTable(SeasonsConstants);
Original file line number Diff line number Diff line change
Expand Up @@ -807,19 +807,6 @@ local UIWidgetManager =
{ Name = "Outline", Type = "UIWidgetFontType", EnumValue = 2 },
},
},
{
Name = "UIWidgetModelSceneLayer",
Type = "Enumeration",
NumValues = 3,
MinValue = 0,
MaxValue = 2,
Fields =
{
{ Name = "None", Type = "UIWidgetModelSceneLayer", EnumValue = 0 },
{ Name = "Front", Type = "UIWidgetModelSceneLayer", EnumValue = 1 },
{ Name = "Back", Type = "UIWidgetModelSceneLayer", EnumValue = 2 },
},
},
{
Name = "UIWidgetMotionType",
Type = "Enumeration",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,19 @@ local UIWidgetManagerShared =
{ Name = "HorizontalForceNewRow", Type = "UIWidgetLayoutDirection", EnumValue = 4 },
},
},
{
Name = "UIWidgetModelSceneLayer",
Type = "Enumeration",
NumValues = 3,
MinValue = 0,
MaxValue = 2,
Fields =
{
{ Name = "None", Type = "UIWidgetModelSceneLayer", EnumValue = 0 },
{ Name = "Front", Type = "UIWidgetModelSceneLayer", EnumValue = 1 },
{ Name = "Back", Type = "UIWidgetModelSceneLayer", EnumValue = 2 },
},
},
{
Name = "UIWidgetScale",
Type = "Enumeration",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,20 @@ local WorldLootObject =
{ Name = "isWorldLootObject", Type = "bool", Nilable = false },
},
},
{
Name = "IsWorldLootObjectByGUID",
Type = "Function",

Arguments =
{
{ Name = "guid", Type = "WOWGUID", Nilable = false },
},

Returns =
{
{ Name = "isWorldLootObject", Type = "bool", Nilable = false },
},
},
{
Name = "IsWorldLootObjectInRange",
Type = "Function",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ local AccountStoreCardUpdateCadenceSeconds = 1.0;
local CreatureModelSceneID = 76;
local TransmogModelSceneID = 420;
local DefaultTransmogSetAppearances = {
195323, -- Chest
198778, -- Gloves
198782, -- Legs
198784, -- Boots
169000, -- Chest
169001, -- Waist
169002, -- Legs
169003, -- Boots
};


Expand Down Expand Up @@ -170,10 +170,11 @@ function AccountStoreBaseCardMixin:SelectCard()
StaticPopup_Hide("GENERIC_CONFIRMATION");

StaticPopup_ShowGenericConfirmation(confirmation, function ()
PlaySound(SOUNDKIT.ACCOUNT_STORE_ITEM_PURCHASE);
if isRefundable then
PlaySound(SOUNDKIT.ACCOUNT_STORE_ITEM_REFUND);
C_AccountStore.RefundItem(itemInfo.id);
else
PlaySound(SOUNDKIT.ACCOUNT_STORE_ITEM_PURCHASE);
C_AccountStore.BeginPurchase(itemInfo.id);
end
end);
Expand Down Expand Up @@ -258,10 +259,40 @@ function AccountStoreTransmogSetCardMixin:UpdateCardDisplay()
local forceUpdate = true;
self.ModelScene:SetFromModelSceneID(modelSceneID, forceUpdate);

local function GetPlayerActorName()
local useNativeForm = true;
local playerRaceName = nil;
local playerGender = nil;
if C_Glue.IsOnGlueScreen() then
local members = C_WoWLabsMatchmaking.GetCurrentParty();
for i, member in ipairs(members) do
if member.isLocalPlayer then
playerRaceName = member.raceFilename;
playerGender = member.gender;
break;
end
end
else
local _, raceFilename = UnitRace("player");
playerRaceName = raceFilename:lower();
playerGender = UnitSex("player");
end

local overrideActorName;
if playerRaceName == "dracthyr" then
useNativeForm = false;
overrideActorName = "dracthyr-alt";
end

return playerRaceName and playerRaceName:lower() or overrideActorName, playerGender, useNativeForm;
end

local function SetUpPlayerActor()
if C_Glue.IsOnGlueScreen() then
local members = C_WoWLabsMatchmaking.GetCurrentParty();
local playerActor = self.ModelScene:GetPlayerActor();
local playerRaceName, playerGender = GetPlayerActorName();
local overrideActorName = nil;
local playerActor = self.ModelScene:GetPlayerActor(overrideActorName, playerRaceName, playerGender);
if playerActor then
playerActor:ReleaseFrontEndCharacterDisplays();
end
Expand All @@ -274,15 +305,15 @@ function AccountStoreTransmogSetCardMixin:UpdateCardDisplay()

return playerActor;
else
local playerRaceName, playerGender, useNativeForm = GetPlayerActorName();
local overrideActorName = nil;
local flags = select(4, C_ModelInfo.GetModelSceneInfoByID(modelSceneID));
local sheatheWeapons = bit.band(flags, Enum.UIModelSceneFlags.SheatheWeapon) == Enum.UIModelSceneFlags.SheatheWeapon;
local hideWeapons = bit.band(flags, Enum.UIModelSceneFlags.HideWeapon) == Enum.UIModelSceneFlags.HideWeapon;
local autoDress = bit.band(flags, Enum.UIModelSceneFlags.Autodress) == Enum.UIModelSceneFlags.Autodress;
local useNativeForm = true;
local itemModifiedAppearanceIDs = nil; -- We set these below.
SetupPlayerForModelScene(self.ModelScene, overrideActorName, itemModifiedAppearanceIDs, sheatheWeapons, autoDress, hideWeapons, useNativeForm);
return self.ModelScene:GetPlayerActor(overrideActorName);
SetupPlayerForModelScene(self.ModelScene, overrideActorName, itemModifiedAppearanceIDs, sheatheWeapons, autoDress, hideWeapons, useNativeForm, playerRaceName, playerGender);
return self.ModelScene:GetPlayerActor(overrideActorName, playerRaceName, playerGender);
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
AccountStoreCategoryMixin = {};

function AccountStoreCategoryMixin:OnClick()
PlaySound(SOUNDKIT.ACCOUNT_STORE_CATEGORY_SELECT);
EventRegistry:TriggerEvent("AccountStore.CategorySelected", self.categoryID);
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@ function KeybindReminderMixin:OnEvent(event, ...)
end
if(event == "PLAYER_SOFT_INTERACT_CHANGED") then
local previousTarget, currentTarget = ...;

if(currentTarget ~= nil) then
local isWorldLootObj = C_WorldLootObject.IsWorldLootObject(currentTarget);
local isWorldLootObj = C_WorldLootObject.IsWorldLootObjectByGUID(currentTarget);
if(isWorldLootObj) then
self:ShowReminder(C_WorldLootObject.GetWorldLootObjectInfo(currentTarget).inventoryType);
else
self:ShowReminder(C_WorldLootObject.GetWorldLootObjectInfoByGUID(currentTarget).inventoryType);
elseif(self.spellSlot ~= nil) then
self:HideReminder();
end
elseif(self.spellSlot ~= nil) then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@
<Texture parentKey="RightIndicator" atlas="plunderstorm-pickup-arrow" useAtlasSize="true">
<KeyValues>
<KeyValue key="layoutIndex" value="3" type="number"/>
<KeyValue key="topPadding" value="-15" type="number"/>
<KeyValue key="bottomPadding" value="10" type="number"/>
<KeyValue key="leftPadding" value="10" type="number"/>
<KeyValue key="rightPadding" value="10" type="number"/>
</KeyValues>
<Anchors>
<Anchor point="RIGHT" relativeKey="$parent" relativePoint="RIGHT" x="0" y="0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4641,6 +4641,11 @@ function ChatEdit_ResetChatType(self)
if ( self:GetAttribute("chatType") == "INSTANCE_CHAT" and (not IsInGroup(LE_PARTY_CATEGORY_INSTANCE)) ) then
self:SetAttribute("chatType", "SAY");
end

if ( C_Glue.IsOnGlueScreen() and C_GameEnvironmentManager.GetCurrentGameEnvironment() == Enum.GameEnvironment.WoWLabs and IsInGroup(LE_PARTY_CATEGORY_HOME) ) then
self:SetAttribute("chatType", "PARTY");
end

self.lastTabComplete = nil;
self.tabCompleteText = nil;
self.tabCompleteTableIndex = 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,14 @@
if MOVING_CHATFRAME then
return;
end


local tabName = self:GetText();
if not tabName then
return;
end

GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
GameTooltip_SetTitle(GameTooltip, string.format(CHAT_TAB_NAME, self:GetText()));
GameTooltip_SetTitle(GameTooltip, string.format(CHAT_TAB_NAME, tabName));
GameTooltip_AddColoredLine(GameTooltip, CHAT_TAB_RIGHT_CLICK, GREEN_FONT_COLOR);
GameTooltip:Show();
</OnEnter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
</Layer>
</Layers>
</Frame>
<Frame name="CompactRaidFrameManager" enableMouse="true" frameStrata="LOW" hidden="true" toplevel="true" parent="UIParent">
<Frame name="CompactRaidFrameManager" enableMouse="true" frameStrata="MEDIUM" hidden="true" toplevel="true" parent="UIParent">
<Size x="222" y="140"/>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="UIParent" relativePoint="TOPLEFT" x="7" y="-140"/>
Expand Down
5 changes: 3 additions & 2 deletions Interface/AddOns/Blizzard_GlueDialogs/Mainline/GlueDialog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -445,12 +445,13 @@ StaticPopupDialogs["ACCOUNT_STORE_BEGIN_PURCHASE_OR_REFUND"] = {
button1 = YES,
button2 = NO,
OnAccept = function()
PlaySound(SOUNDKIT.ACCOUNT_STORE_ITEM_PURCHASE);


local itemInfo = GlueDialog.data;
if itemInfo.status == Enum.AccountStoreItemStatus.Refundable then
PlaySound(SOUNDKIT.ACCOUNT_STORE_ITEM_REFUND);
C_AccountStore.RefundItem(itemInfo.id);
else
PlaySound(SOUNDKIT.ACCOUNT_STORE_ITEM_PURCHASE);
C_AccountStore.BeginPurchase(itemInfo.id);
end
end
Expand Down
12 changes: 0 additions & 12 deletions Interface/AddOns/Blizzard_GlueParent/Mainline/GlueParent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -577,18 +577,6 @@ function GlueParent_CheckCinematic()
end
end

function GlueParent_CheckPhotosensitivity()
local lastPhotosensitivityExpansionShown = (tonumber(GetCVar("showPhotosensitivityWarning")) or 0);
if LE_EXPANSION_LEVEL_CURRENT > lastPhotosensitivityExpansionShown then
SetCVar("showPhotosensitivityWarning", LE_EXPANSION_LEVEL_CURRENT);
GlueParent_OpenSecondaryScreen("photosensitivity");

return true;
end

return false;
end

function ToggleFrame(frame)
frame:SetShown(not frame:IsShown());
end
Expand Down
26 changes: 20 additions & 6 deletions Interface/AddOns/Blizzard_GlueParent/Shared/GlueParentUtil.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,28 @@ end
function GlueParentBlockingFrame_OnKeyDown(self, key)
if key == "ESCAPE" then
local frame = modalFrames[#modalFrames];
local continueHide = true;
if frame.onCloseCallback then
continueHide = frame.onCloseCallback(self);
end
if continueHide then
frame:Hide();
if not frame.disableHideOnEscape then
local continueHide = true;
if frame.onCloseCallback then
continueHide = frame.onCloseCallback(self);
end
if continueHide then
frame:Hide();
end
end
elseif key == "PRINTSCREEN" then
Screenshot();
end
end

function GlueParent_CheckPhotosensitivity()
local lastPhotosensitivityExpansionShown = (tonumber(GetCVar("showPhotosensitivityWarning")) or -1);
if LE_EXPANSION_LEVEL_CURRENT > lastPhotosensitivityExpansionShown then
SetCVar("showPhotosensitivityWarning", LE_EXPANSION_LEVEL_CURRENT);
GlueParent_OpenSecondaryScreen("photosensitivity");

return true;
end

return false;
end
Loading

0 comments on commit b9101f2

Please sign in to comment.