Commit 3fab6356 authored by TOM_RUS's avatar TOM_RUS

WOW-34081patch9.0.1_Beta

parent 7ba4c248
......@@ -123,6 +123,7 @@ RestrictedActionsDocumentation.lua
ScenarioInfoDocumentation.lua
ScrappingMachineUIDocumentation.lua
ScriptWarningsDocumentation.lua
ScriptedAnimationsDocumentation.lua
SecureTransferDocumentation.lua
SkillInfoDocumentation.lua
SocialInfoDocumentation.lua
......@@ -172,6 +173,7 @@ AppearanceSourceDocumentation.lua
AuctionHouseEnumsDocumentation.lua
BaseDocumentation.lua
CalendarConstantsDocumentation.lua
CharacterCustomizationSharedDocumentation.lua
ChatDocumentation.lua
ClubSharedDocumentation.lua
ColorDocumentation.lua
......
local CharacterCustomization =
{
Name = "CharacterCustomization",
Type = "System",
Namespace = "C_CharacterCustomization",
Functions =
{
{
Name = "GetAvailableCustomizations",
Type = "Function",
Arguments =
{
{ Name = "raceID", Type = "number", Nilable = false },
{ Name = "sexID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "categories", Type = "table", InnerType = "CharCustomizationCategory", Nilable = false },
},
},
},
Events =
{
},
Tables =
{
{
Name = "CharCustomizationCategory",
Type = "Structure",
Fields =
{
{ Name = "id", Type = "number", Nilable = false },
{ Name = "orderIndex", Type = "number", Nilable = false },
{ Name = "name", Type = "string", Nilable = false },
{ Name = "icon", Type = "string", Nilable = false },
{ Name = "selectedIcon", Type = "string", Nilable = false },
{ Name = "options", Type = "table", InnerType = "CharCustomizationOption", Nilable = false },
},
},
{
Name = "CharCustomizationChoice",
Type = "Structure",
Fields =
{
{ Name = "id", Type = "number", Nilable = false },
{ Name = "name", Type = "string", Nilable = false },
},
},
{
Name = "CharCustomizationOption",
Type = "Structure",
Fields =
{
{ Name = "id", Type = "number", Nilable = false },
{ Name = "name", Type = "string", Nilable = false },
{ Name = "orderIndex", Type = "number", Nilable = false },
{ Name = "choices", Type = "table", InnerType = "CharCustomizationChoice", Nilable = false },
},
},
},
};
APIDocumentation:AddDocumentationTable(CharacterCustomization);
\ No newline at end of file
local CharacterCustomizationShared =
{
Tables =
{
{
Name = "ChrCustomizationCategoryFlag",
Type = "Enumeration",
NumValues = 1,
MinValue = 1,
MaxValue = 1,
Fields =
{
{ Name = "UndressModel", Type = "ChrCustomizationCategoryFlag", EnumValue = 1 },
},
},
{
Name = "ChrCustomizationOptionType",
Type = "Enumeration",
NumValues = 2,
MinValue = 0,
MaxValue = 1,
Fields =
{
{ Name = "Slider", Type = "ChrCustomizationOptionType", EnumValue = 0 },
{ Name = "Checkbox", Type = "ChrCustomizationOptionType", EnumValue = 1 },
},
},
{
Name = "CharCustomizationChoice",
Type = "Structure",
Fields =
{
{ Name = "id", Type = "number", Nilable = false },
{ Name = "name", Type = "string", Nilable = false },
},
},
{
Name = "CharCustomizationOption",
Type = "Structure",
Fields =
{
{ Name = "id", Type = "number", Nilable = false },
{ Name = "name", Type = "string", Nilable = false },
{ Name = "orderIndex", Type = "number", Nilable = false },
{ Name = "optionType", Type = "ChrCustomizationOptionType", Nilable = false },
{ Name = "choices", Type = "table", InnerType = "CharCustomizationChoice", Nilable = false },
{ Name = "currentChoiceIndex", Type = "number", Nilable = false },
},
},
},
};
APIDocumentation:AddDocumentationTable(CharacterCustomizationShared);
\ No newline at end of file
......@@ -98,11 +98,6 @@ local LFGInfo =
{ Name = "winner", Type = "number", Nilable = false },
},
},
{
Name = "LfgBonusFactionIdUpdated",
Type = "Event",
LiteralName = "LFG_BONUS_FACTION_ID_UPDATED",
},
{
Name = "LfgBootProposalUpdate",
Type = "Event",
......
......@@ -103,6 +103,7 @@ local PlayerChoice =
Type = "Structure",
Fields =
{
{ Name = "id", Type = "number", Nilable = false },
{ Name = "responseIdentifier", Type = "number", Nilable = false },
{ Name = "buttonText", Type = "string", Nilable = false },
{ Name = "description", Type = "string", Nilable = false },
......@@ -121,6 +122,7 @@ local PlayerChoice =
{ Name = "hasRewards", Type = "bool", Nilable = false },
{ Name = "rarity", Type = "PlayerChoiceRarity", Nilable = false },
{ Name = "typeArtID", Type = "number", Nilable = true },
{ Name = "uiTextureKit", Type = "string", Nilable = true },
},
},
{
......
......@@ -5,9 +5,9 @@ local QuestConstants =
{
Name = "QuestTagType",
Type = "Enumeration",
NumValues = 15,
NumValues = 16,
MinValue = 0,
MaxValue = 14,
MaxValue = 15,
Fields =
{
{ Name = "Tag", Type = "QuestTagType", EnumValue = 0 },
......@@ -25,6 +25,7 @@ local QuestConstants =
{ Name = "FactionAssault", Type = "QuestTagType", EnumValue = 12 },
{ Name = "Islands", Type = "QuestTagType", EnumValue = 13 },
{ Name = "Threat", Type = "QuestTagType", EnumValue = 14 },
{ Name = "CovenantCalling", Type = "QuestTagType", EnumValue = 15 },
},
},
{
......
local ScriptedAnimations =
{
Name = "ScriptedAnimations",
Type = "System",
Namespace = "C_ScriptedAnimations",
Functions =
{
{
Name = "GetAllScriptedAnimationEffects",
Type = "Function",
Returns =
{
{ Name = "scriptedAnimationEffects", Type = "table", InnerType = "ScriptedAnimationEffect", Nilable = false },
},
},
},
Events =
{
},
Tables =
{
{
Name = "ScriptedAnimationBehavior",
Type = "Enumeration",
NumValues = 5,
MinValue = 0,
MaxValue = 4,
Fields =
{
{ Name = "None", Type = "ScriptedAnimationBehavior", EnumValue = 0 },
{ Name = "TargetShake", Type = "ScriptedAnimationBehavior", EnumValue = 1 },
{ Name = "TargetKnockBack", Type = "ScriptedAnimationBehavior", EnumValue = 2 },
{ Name = "SourceRecoil", Type = "ScriptedAnimationBehavior", EnumValue = 3 },
{ Name = "SourceCollideWithTarget", Type = "ScriptedAnimationBehavior", EnumValue = 4 },
},
},
{
Name = "ScriptedAnimationTrajectory",
Type = "Enumeration",
NumValues = 6,
MinValue = 0,
MaxValue = 5,
Fields =
{
{ Name = "AtSource", Type = "ScriptedAnimationTrajectory", EnumValue = 0 },
{ Name = "AtTarget", Type = "ScriptedAnimationTrajectory", EnumValue = 1 },
{ Name = "Straight", Type = "ScriptedAnimationTrajectory", EnumValue = 2 },
{ Name = "CurveLeft", Type = "ScriptedAnimationTrajectory", EnumValue = 3 },
{ Name = "CurveRight", Type = "ScriptedAnimationTrajectory", EnumValue = 4 },
{ Name = "CurveRandom", Type = "ScriptedAnimationTrajectory", EnumValue = 5 },
},
},
{
Name = "ScriptedAnimationEffect",
Type = "Structure",
Fields =
{
{ Name = "id", Type = "number", Nilable = false },
{ Name = "visual", Type = "number", Nilable = false },
{ Name = "visualScale", Type = "number", Nilable = false },
{ Name = "duration", Type = "number", Nilable = false },
{ Name = "trajectory", Type = "ScriptedAnimationTrajectory", Nilable = false },
{ Name = "startBehavior", Type = "ScriptedAnimationBehavior", Nilable = true },
{ Name = "startSoundKitID", Type = "number", Nilable = true },
{ Name = "finishEffectID", Type = "number", Nilable = true },
{ Name = "finishBehavior", Type = "ScriptedAnimationBehavior", Nilable = true },
{ Name = "finishSoundKitID", Type = "number", Nilable = true },
},
},
},
};
APIDocumentation:AddDocumentationTable(ScriptedAnimations);
\ No newline at end of file
......@@ -13,6 +13,7 @@ local UserFeedback =
Arguments =
{
{ Name = "bugInfo", Type = "string", Nilable = false },
{ Name = "suppressNotification", Type = "bool", Nilable = false, Default = false },
},
Returns =
......
......@@ -842,10 +842,6 @@ function AchievementFrameAchievements_OnEvent (self, event, ...)
AchievementFrame.searchBox.fullSearchFinished = true;
AchievementFrame_UpdateSearch(self);
end
if ( not AchievementMicroButton:IsShown() ) then
AchievementMicroButton_Update();
end
end
function AchievementFrameAchievementsBackdrop_OnLoad (self)
......
## Title: Blizzard_CharacterCreate
## Author: achurchill
## Notes: This file is just here to update the manifest
## Author: Blizzard Entertainment
## AllowLoad: Glue
## RequiredDep: Blizzard_CharacterCustomize
## LoadOnDemand: 1
Blizzard_CharacterCreate.lua
Blizzard_CharacterCreate.xml
## Title: Blizzard_CharacterCustomize
## Author: achurchill
## Notes: This file is just here to update the manifest
## Author: Blizzard Entertainment
## AllowLoad: Both
## LoadOnDemand: 1
Blizzard_CharacterCustomize.lua
Blizzard_CharacterCustomize.xml
......@@ -8,15 +8,31 @@ local titleTextureKitRegions = {
["Left"] = "UI-Frame-%s-TitleLeft",
["Right"] = "UI-Frame-%s-TitleRight",
["Middle"] = "_UI-Frame-%s-TitleMiddle",
}
};
local abilityButtonTextureKitRegions = {
["Background"] = "CovenantChoice-Offering-Ability-Frame-%s",
["IconBorder"] = "CovenantChoice-Offering-Ability-Ring-%s",
};
local infoPanelTextureKitRegions = {
["Parchment"] = "CovenantChoice-Offering-Parchment-%s",
["Crest"] = "CovenantChoice-Offering-Sigil-%s",
};
local modelSceneContainerTextureKitRegions = {
["ModelSceneBorder"] = "CovenantChoice-Offering-Preview-Frame-%s",
["Background"] = "CovenantChoice-Offering-Preview-Frame-Background-%s",
};
local abilityTypeText = {
[Enum.CovenantAbilityType.Class] = COVENANT_PREVIEW_CLASS_ABILITY,
[Enum.CovenantAbilityType.Racial] = COVENANT_PREVIEW_RACIAL_ABILITY,
}
--Aubrie TODO fix this up when the artwork for the frames are in.
local covenantNineSlice = {
["Oribos"] = "Oribos",
["Kyrian"] = "Oribos",
}
CovenantPreviewFrameMixin = { };
......@@ -46,8 +62,12 @@ function CovenantPreviewFrameMixin:Reset()
self.uiTextureKit = nil;
end
function CovenantPreviewFrameMixin:SetupTextureKits(frame, regions)
SetupTextureKitOnRegions(self.uiTextureKit, frame, regions, TextureKitConstants.SetVisibility, TextureKitConstants.UseAtlasSize);
function CovenantPreviewFrameMixin:SetupTextureKits(frame, regions, overrideTextureKit)
if(overrideTextureKit) then
SetupTextureKitOnRegions(overrideTextureKit, frame, regions, TextureKitConstants.SetVisibility, TextureKitConstants.UseAtlasSize);
else
SetupTextureKitOnRegions(self.uiTextureKit, frame, regions, TextureKitConstants.SetVisibility, TextureKitConstants.UseAtlasSize);
end
end
function CovenantPreviewFrameMixin:SetupFramesWithTextureKit()
......@@ -57,8 +77,9 @@ function CovenantPreviewFrameMixin:SetupFramesWithTextureKit()
NineSliceUtil.ApplyLayoutByName(self.BorderFrame, nineSliceLayout);
end
self:SetupTextureKits(self.Title, titleTextureKitRegions);
self:SetupTextureKits(self.Background, backgroundTextureKitRegions);
self:SetupTextureKits(self.Title, titleTextureKitRegions, nineSliceLayout);
self:SetupTextureKits(self.Background, backgroundTextureKitRegions, nineSliceLayout);
self:SetupTextureKits(self.InfoPanel, infoPanelTextureKitRegions);
end
function CovenantPreviewFrameMixin:TryShow(covenantInfo)
......@@ -89,21 +110,23 @@ function CovenantPreviewFrameMixin:SetupAndGetAbilityButton(index, abilityInfo)
local abilityButton = self.AbilityButtonsPool:Acquire();
if(not self.lastAbility) then
abilityButton:SetPoint("TOP", self.InfoPanel.Description, "BOTTOMLEFT", 0, -20);
abilityButton:SetPoint("TOPLEFT", self.InfoPanel.AbilitiesLabel, "BOTTOMLEFT", -5, -15);
self.previousRowOption = abilityButton;
elseif (mod(index - 1, MAX_ABILITIES_IN_ROW) == 0) then
abilityButton:SetPoint("TOP", self.previousRowOption, "BOTTOM", 0, -20);
self.previousRowOption = abilityButton;
else
abilityButton:SetPoint("LEFT", self.lastAbility, "RIGHT", 50, 0);
abilityButton:SetPoint("LEFT", self.lastAbility, "RIGHT", 30, 0);
end
self:SetupTextureKits(abilityButton, abilityButtonTextureKitRegions);
abilityButton:SetupButton(abilityInfo);
return abilityButton;
end
function CovenantPreviewFrameMixin:SetupModelSceneFrame(transmogSetID, mountID)
SetUpTransmogAndMountDressupFrame(self.ModelSceneContainer, transmogSetID, mountID, 400, 500, "CENTER", "CENTER", 0 , 0);
self:SetupTextureKits(self.ModelSceneContainer, modelSceneContainerTextureKitRegions);
SetUpTransmogAndMountDressupFrame(self.ModelSceneContainer, transmogSetID, mountID, 414, 432, "CENTER", "CENTER", 0 , 0);
local sources = C_TransmogSets.GetAllSourceIDs(transmogSetID);
DressUpTransmogSet(sources);
end
......
......@@ -3,26 +3,36 @@
<Script file="Blizzard_CovenantPreviewUI.lua"/>
<Button name="CovenantAbilityButtonTemplate" mixin="CovenantAbilityButtonMixin" motionScriptsWhileDisabled="true" virtual="true">
<Size x="208" y="46"/>
<Size x="228" y="77"/>
<Layers>
<Layer level="BACKGROUND">
<Texture atlas="PetList-ButtonBackground" parentKey="background"/>
<Texture parentKey="Background"/>
</Layer>
<Layer level="BORDER" textureSubLevel="2">
<Texture parentKey="IconBorder">
<Anchors>
<Anchor point="LEFT"/>
</Anchors>
</Texture>
</Layer>
<Layer level="BORDER">
<Texture parentKey="Icon">
<Size x="38" y="38"/>
<Anchors>
<Anchor point="LEFT" x="5" y="0"/>
<Anchor point="TOPLEFT" relativeKey="$parent.IconBorder" x="6" y="-6"/>
<Anchor point="BOTTOMRIGHT" relativeKey="$parent.IconBorder" x="-6" y="6"/>
</Anchors>
</Texture>
</Layer>
<Layer level="ARTWORK" textureSubLevel="-1">
<Texture parentKey="IconBorder" file="Interface\Common\WhiteIconFrame" hidden="true">
<Layer level="ARTWORK" textureSubLevel="8">
<MaskTexture parentKey="CircleMask" file="Interface\CharacterFrame\TempPortraitAlphaMask" hWrapMode="CLAMPTOBLACKADDITIVE" vWrapMode="CLAMPTOBLACKADDITIVE">
<Anchors>
<Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeKey="$parent.Icon"/>
<Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" relativeKey="$parent.Icon"/>
<Anchor point="TOPLEFT" relativeKey="$parent.Icon"/>
<Anchor point="BOTTOMRIGHT" relativeKey="$parent.Icon"/>
</Anchors>
</Texture>
<MaskedTextures>
<MaskedTexture childKey="Icon"/>
</MaskedTextures>
</MaskTexture>
</Layer>
<Layer level="OVERLAY">
<FontString parentKey="Name" inherits="GameFontNormal" justifyH="LEFT" JustifyV="BOTTOM">
......@@ -79,12 +89,12 @@
<Layer level="BACKGROUND">
<Texture parentKey="Left" atlas="UI-Frame-Neutral-TitleLeft" useAtlasSize="true">
<Anchors>
<Anchor point="LEFT"/>
<Anchor point="LEFT" x="40"/>
</Anchors>
</Texture>
<Texture parentKey="Right" atlas="UI-Frame-Neutral-TitleRight" useAtlasSize="true">
<Anchors>
<Anchor point="RIGHT"/>
<Anchor point="RIGHT" x="-40"/>
</Anchors>
</Texture>
</Layer>
......@@ -102,32 +112,57 @@
<Anchors>
<Anchor point="CENTER" relativeKey="$parent.Middle"/>
</Anchors>
<Color r="1.0" g="0.82" b="0"/>
<Color r="1.0" g="1.0" b="1.0"/>
</FontString>
</Layer>
</Layers>
</Frame>
<Frame parentKey="ModelSceneContainer">
<Size x="400" y="450"/>
<Size x="414" y="432"/>
<Anchors>
<Anchor point="LEFT" x="0" y="-30"/>
<Anchor point="LEFT" x="85" y="-40"/>
</Anchors>
<Layers>
<Layer level="BORDER">
<Texture parentKey="ModelSceneBorder">
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</Texture >
</Layer>
<Layer level="BACKGROUND">
<Texture parentKey="Background">
<Anchors>
<Anchor point="TOPLEFT" x="2" y="-2"/>
<Anchor point="BOTTOMRIGHT" x="-2" y="2"/>
</Anchors>
</Texture >
</Layer>
</Layers>
</Frame>
<Frame parentKey="InfoPanel">
<Size x="500" y="450"/>
<Size x="557" y="435"/>
<Anchors>
<Anchor point="LEFT" relativeKey="$parent.ModelSceneContainer" relativePoint="RIGHT" x="50"/>
<Anchor point="LEFT" relativeKey="$parent.ModelSceneContainer" relativePoint="RIGHT" x="15"/>
</Anchors>
<Layers>
<Layer level="BACKGROUND">
<Texture parentKey="Parchment">
<Size x="557" y="435"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</Texture>
</Layer>
<Layer level="ARTWORK">
<Texture parentKey="Crest" atlas="AlliedRace-Crest-Nightborne" useAtlasSize="true">
<Texture parentKey="Crest">
<Anchors>
<Anchor point="TOPLEFT"/>
<Anchor point="TOPLEFT" x="10" y="-10"/>
</Anchors>
</Texture>
</Layer>
<Layer level="BORDER">
<FontString parentKey="Name" JustifyH="LEFT" JustifyV="BOTTOM" inherits="QuestFont_Super_Huge">
<FontString parentKey="Name" JustifyH="LEFT" JustifyV="BOTTOM" inherits="QuestFont_Shadow_Enormous">
<Size x="300" y="0"/>
<Anchors>
<Anchor point="LEFT" relativeKey="$parent.Crest" relativePoint="RIGHT" x="28"/>
......@@ -145,6 +180,19 @@
<Anchor point="TOP" relativeKey="$parent.Location" relativePoint="BOTTOM" x="0" y="-40"/>
</Anchors>
</FontString>
<FontString parentKey="Description" JustifyH="LEFT" JustifyV="TOP" inherits="GameFontBlack">
<Size x="450" y="0"/>
<Anchors>
<Anchor point="TOP" relativeKey="$parent.Location" relativePoint="BOTTOM" x="20" y="-40"/>
</Anchors>
</FontString>
<FontString parentKey="AbilitiesLabel" JustifyH="LEFT" JustifyV="TOP" inherits="QuestFont_Super_Huge" text="COVENANT_PREVIEW_ABILITIE_LABEL">
<Size x="450" y="0"/>
<Anchors>
<Anchor point="LEFT" relativePoint="LEFT" x="30" y="-20"/>
</Anchors>
<Color r="0" g="0" b="0"/>
</FontString>
</Layer>
</Layers>
</Frame>
......@@ -153,7 +201,7 @@
<Anchor point="TOPRIGHT" x="3" y="2" />
</Anchors>
</Button>
<Button parentKey="SelectButton" inherits="UIPanelButtonTemplate" text="OK">
<Button parentKey="SelectButton" inherits="UIPanelButtonTemplate" hidden="true" text="OK">
<Size x="150" y="25"/>
<Anchors>
<Anchor point="BOTTOM" x="180" y="30" />
......
......@@ -161,49 +161,42 @@ function AdventuresCompleteScreenMixin:StartReplayEvent(roundIndex, eventIndex)
self:PlayReplayEffect(event);
end
local function GetEffectForEvent(combatLogEvent)
local function GetEffectForEvent(combatLogEvent)
-- TODO:: Replace this function.