Commit 3fab6356 authored by TOM_RUS's avatar TOM_RUS
Browse files

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
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
..\FrameXML\UI.xsd">
<Button name="CharacterCreateNavButtonTemplate" inherits="GlueButtonTemplate" mixin="CharacterCreateNavButtonMixin" frameLevel="10" virtual="true">
<Size x="170" y="40"/>
<Scripts>
<OnClick method="OnClick"/>
</Scripts>
</Button>
<Frame name="CharacterCreateFrameRacialAbilityTemplate" mixin="CharacterCreateFrameRacialAbilityMixin" inherits="ResizeLayoutFrame" virtual="true">
<Layers>
<Layer level="ARTWORK">
<Texture parentKey="Icon">
<Size x ="42" y="42" />
<Anchors>
<Anchor point="LEFT"/>
</Anchors>
</Texture>
<FontString parentKey="Text" inherits="GameFontNormalMed3" justifyH="LEFT">
<Size x ="180" />
<Anchors>
<Anchor point="LEFT" relativeKey="$parent.Icon" relativePoint="RIGHT" x="10" />
</Anchors>
</FontString>
</Layer>
<Layer level="OVERLAY">
<Texture parentKey="IconOverlay" atlas="charactercreate-ring-racialtrait" useAtlasSize="true">
<Anchors>
<Anchor point="CENTER" relativeKey="$parent.Icon"/>
</Anchors>
</Texture>
<MaskTexture parentKey="CircleMask" file="Interface\CharacterFrame\TempPortraitAlphaMask" hWrapMode="CLAMPTOBLACKADDITIVE" vWrapMode="CLAMPTOBLACKADDITIVE">
<Size x ="38" y="38" />
<Anchors>
<Anchor point="CENTER" relativeKey="$parent.Icon"/>
</Anchors>
<MaskedTextures>
<MaskedTexture childKey="Icon"/>
</MaskedTextures>
</MaskTexture>
</Layer>
</Layers>
</Frame>
<CheckButton name="CharacterCreateSexButtonTemplate" inherits="CharCustomizeMaskedButtonTemplate" mixin="CharacterCreateSexButtonMixin" virtual="true">
<Size x="46" y="46"/>
<KeyValues>
<KeyValue key="ringAtlas" value="charactercreate-ring-metaldark" type="string"/>
<KeyValue key="ringWidth" value="99" type="number"/>
<KeyValue key="ringHeight" value="100" type="number"/>
<KeyValue key="disabledOverlayAlpha" value="0" type="number"/>
<KeyValue key="circleMaskSizeOffset" value="-5" type="number"/>
<KeyValue key="tooltipAnchor" value="ANCHOR_BOTTOMRIGHT" type="string"/>
<KeyValue key="tooltipMinWidth" value="nil" type="number"/>
</KeyValues>
<CheckedTexture parentKey="CheckedTexture" atlas="charactercreate-ring-select">
<Size x="84" y="84"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</CheckedTexture>
<Layers>
<Layer level="BACKGROUND">
<Texture parentKey="BlackBG">
<Size x="56" y="56"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
<Color r="0.0" g="0.0" b="0.0"/>
</Texture>
</Layer>
</Layers>
</CheckButton>
<CheckButton name="CharacterCreateClassButtonTemplate" inherits="CharCustomizeMaskedButtonTemplate" mixin="CharacterCreateClassButtonMixin" virtual="true">
<Size x="67" y="67"/>
<KeyValues>
<KeyValue key="ringAtlas" value="charactercreate-ring-metaldark" type="string"/>
<KeyValue key="ringWidth" value="116" type="number"/>
<KeyValue key="ringHeight" value="117" type="number"/>
<KeyValue key="disabledOverlayAlpha" value="0.75" type="number"/>
<KeyValue key="circleMaskSizeOffset" value="2" type="number"/>
<KeyValue key="tooltipAnchor" value="ANCHOR_RIGHT" type="string"/>
<KeyValue key="tooltipXOffset" value="0" type="number"/>
<KeyValue key="tooltipYOffset" value="10" type="number"/>
</KeyValues>
<CheckedTexture parentKey="CheckedTexture" atlas="charactercreate-ring-select">
<Size x="99" y="99"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</CheckedTexture>
<Layers>
<Layer level="ARTWORK">
<FontString parentKey="ClassName" inherits="GameFontNormalMed3" justifyH="CENTER" justifyV="MIDDLE">
<Size x="67" y="30"/>
<Anchors>
<Anchor point="TOP" relativePoint="BOTTOM" x="2" y="-10"/>
</Anchors>
</FontString>
</Layer>
</Layers>
</CheckButton>
<CheckButton name="CharacterCreateRaceButtonTemplate" inherits="CharCustomizeMaskedButtonTemplate" mixin="CharacterCreateRaceButtonMixin" virtual="true">
<Size x="79" y="79"/>
<KeyValues>
<KeyValue key="ringWidth" value="139" type="number"/>
<KeyValue key="ringHeight" value="140" type="number"/>
<KeyValue key="disabledOverlayAlpha" value="0.5" type="number"/>
<KeyValue key="circleMaskSizeOffset" value="2" type="number"/>
</KeyValues>
<CheckedTexture parentKey="CheckedTexture" atlas="charactercreate-ring-select">
<Size x="118" y="118"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</CheckedTexture>
</CheckButton>
<CheckButton name="CharacterCreateAllianceButtonTemplate" inherits="CharacterCreateRaceButtonTemplate" virtual="true">
<KeyValues>
<KeyValue key="ringAtlas" value="charactercreate-ring-alliance" type="string"/>
<KeyValue key="faction" value="Alliance" type="string"/>
<KeyValue key="tooltipAnchor" value="ANCHOR_TOPRIGHT" type="string"/>
<KeyValue key="tooltipXOffset" value="99" type="number"/>
</KeyValues>
</CheckButton>
<CheckButton name="CharacterCreateAllianceAlliedRaceButtonTemplate" inherits="CharacterCreateAllianceButtonTemplate" virtual="true">
<KeyValues>
<KeyValue key="tooltipXOffset" value="10" type="number"/>
</KeyValues>
</CheckButton>
<CheckButton name="CharacterCreateHordeButtonTemplate" inherits="CharacterCreateRaceButtonTemplate" virtual="true">
<KeyValues>
<KeyValue key="ringAtlas" value="charactercreate-ring-horde" type="string"/>
<KeyValue key="faction" value="Horde" type="string"/>
<KeyValue key="tooltipAnchor" value="ANCHOR_TOPLEFT" type="string"/>
<KeyValue key="tooltipXOffset" value="99" type="number"/>
<KeyValue key="flipTextures" value="true" type="boolean"/>
</KeyValues>
</CheckButton>
<CheckButton name="CharacterCreateHordeAlliedRaceButtonTemplate" inherits="CharacterCreateHordeButtonTemplate" virtual="true">
<KeyValues>
<KeyValue key="tooltipXOffset" value="10" type="number"/>
</KeyValues>
</CheckButton>
<CheckButton name="CharacterCreateSpecButtonTemplate" inherits="CharCustomizeMaskedButtonTemplate" mixin="CharacterCreateSpecButtonMixin" virtual="true">
<Size x="54" y="54"/>
<KeyValues>
<KeyValue key="ringAtlas" value="charactercreate-ring-metaldark" type="string"/>
<KeyValue key="ringWidth" value="90" type="number"/>
<KeyValue key="ringHeight" value="91" type="number"/>
<KeyValue key="disabledOverlayAlpha" value="0.5" type="number"/>
<KeyValue key="circleMaskSizeOffset" value="2" type="number"/>
<KeyValue key="tooltipAnchor" value="ANCHOR_RIGHT" type="string"/>
<KeyValue key="tooltipXOffset" value="0" type="number"/>
<KeyValue key="tooltipYOffset" value="10" type="number"/>
</KeyValues>
<CheckedTexture parentKey="CheckedTexture" atlas="charactercreate-ring-select">
<Size x="78" y="78"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</CheckedTexture>
<Layers>
<Layer level="ARTWORK">
<FontString parentKey="SpecName" inherits="GameFontNormalMed3">
<Anchors>
<Anchor point="TOPLEFT" relativePoint="TOPRIGHT" x="20" y="-10"/>
</Anchors>
</FontString>
<FontString parentKey="RoleName" inherits="GameFontHighlight">
<Anchors>
<Anchor point="TOPLEFT" relativeKey="$parent.SpecName" relativePoint="BOTTOMLEFT" y="-5"/>
</Anchors>
</FontString>
</Layer>
</Layers>
</CheckButton>
<Frame name="CharacterCreateVerticalLayoutFrame" inherits="VerticalLayoutFrame" virtual="true">
<KeyValues>
<KeyValue key="spacing" value="15" type="number"/>
</KeyValues>
</Frame>
<Texture name="CharacterCreateBackgroundOverlayTexture" parentArray="BGTex" virtual="true"/>
<ModelFFX name="CharacterCreateFrame" mixin="CharacterCreateMixin" toplevel="true" parent="UIParent" setAllPoints="true" enableKeyboard="true" hidden="true">
<Layers>
<Layer level="OVERLAY">
<Texture parentKey="TopBackgroundOverlay" inherits="CharacterCreateBackgroundOverlayTexture" atlas="charactercreate-vignette-top">
<Anchors>
<Anchor point="TOPLEFT"/>
<Anchor point="BOTTOMRIGHT" relativePoint="RIGHT"/>
</Anchors>
</Texture>
<Texture parentKey="LeftBackgroundOverlay" inherits="CharacterCreateBackgroundOverlayTexture" atlas="charactercreate-vignette-sides">
<Anchors>
<Anchor point="TOPLEFT"/>
<Anchor point="BOTTOMRIGHT" relativePoint="BOTTOM"/>
</Anchors>
</Texture>
<Texture parentKey="RightBackgroundOverlay" inherits="CharacterCreateBackgroundOverlayTexture" atlas="charactercreate-vignette-sides">
<TexCoords left="1" right="0" top="0" bottom="1"/>
<Anchors>
<Anchor point="TOPRIGHT"/>
<Anchor point="BOTTOMLEFT" relativePoint="BOTTOM"/>
</Anchors>
</Texture>
<Texture parentKey="BottomBackgroundOverlay" inherits="CharacterCreateBackgroundOverlayTexture" atlas="charactercreate-vignette-bottom">
<Anchors>
<Anchor point="BOTTOMLEFT"/>
<Anchor point="TOPRIGHT" relativePoint="RIGHT"/>
</Anchors>
<Animations>
<AnimationGroup parentKey="FadeOut" setToFinalAlpha="true">
<Alpha parentKey="AlphaAnim" duration="0.25" fromAlpha="1" toAlpha="0"/>
</AnimationGroup>
<AnimationGroup parentKey="FadeIn" setToFinalAlpha="true">
<Alpha parentKey="AlphaAnim" duration="0.25" fromAlpha="0" toAlpha="1"/>
</AnimationGroup>
</Animations>
</Texture>
</Layer>
</Layers>
<Frames>
<Button parentKey="BackButton" inherits="CharacterCreateNavButtonTemplate">
<Anchors>
<Anchor point="BOTTOMLEFT" x="30" y="15"/>
</Anchors>
<KeyValues>
<KeyValue key="charCreateOnClickMethod" value="NavBack" type="string"/>
</KeyValues>
</Button>
<Button parentKey="ForwardButton" inherits="CharacterCreateNavButtonTemplate">
<Anchors>
<Anchor point="BOTTOMRIGHT" x="-30" y="15"/>
</Anchors>
<KeyValues>
<KeyValue key="charCreateOnClickMethod" value="NavForward" type="string"/>
</KeyValues>
</Button>
<Frame parentKey="RaceAndClassFrame" mixin="CharacterCreateRaceAndClassMixin" setAllPoints="true" hidden="true" scale="0.7111">
<Frames>
<Frame parentKey="AllianceHeader" inherits="ResizeLayoutFrame, CharCustomizeFrameWithTooltipTemplate" mixin="CharacterCreateFactionHeaderMixin">
<KeyValues>
<KeyValue key="tooltipAnchor" value="ANCHOR_TOPLEFT" type="string"/>
<KeyValue key="tooltipXOffset" value="228" type="number"/>
</KeyValues>
<Anchors>
<Anchor point="TOPLEFT"/>
</Anchors>
<Layers>
<Layer level="ARTWORK">
<Texture parentKey="Logo" atlas="charactercreate-icon-alliance" useAtlasSize="true">