4.4.0 (54851)

Interface/AddOns/Blizzard_APIDocumentationGenerated/CurrencyConstantsDocumentation.lua

@@ -150,12 +150,17 @@ local CurrencyConstants =
 				{ Name = "HONOR_CURRENCY_ID", Type = "number", Value = 1792 },
 				{ Name = "CLASSIC_ARENA_POINTS_CURRENCY_ID", Type = "number", Value = 1900 },
 				{ Name = "CLASSIC_HONOR_CURRENCY_ID", Type = "number", Value = 1901 },
+				{ Name = "CLASSIC_CONQUEST_CURRENCY_ID", Type = "number", Value = 390 },
 				{ Name = "HONOR_PER_CURRENCY", Type = "number", Value = 10 },
 				{ Name = "ARTIFACT_KNOWLEDGE_CURRENCY_ID", Type = "number", Value = 1171 },
 				{ Name = "WAR_RESOURCES_CURRENCY_ID", Type = "number", Value = 1560 },
 				{ Name = "ECHOES_OF_NYALOTHA_CURRENCY_ID", Type = "number", Value = 1803 },
 				{ Name = "DRAGON_ISLES_SUPPLIES_CURRENCY_ID", Type = "number", Value = 2003 },
 				{ Name = "QUESTIONMARK_INV_ICON", Type = "number", Value = 134400 },
+				{ Name = "PVP_CURRENCY_CONQUEST_ALLIANCE_INV_ICON", Type = "number", Value = 463448 },
+				{ Name = "PVP_CURRENCY_CONQUEST_HORDE_INV_ICON", Type = "number", Value = 463449 },
+				{ Name = "PVP_CURRENCY_HONOR_ALLIANCE_INV_ICON", Type = "number", Value = 463450 },
+				{ Name = "PVP_CURRENCY_HONOR_HORDE_INV_ICON", Type = "number", Value = 463451 },
 				{ Name = "CURRENCY_ID_RENOWN", Type = "number", Value = 1822 },
 				{ Name = "CURRENCY_ID_RENOWN_KYRIAN", Type = "number", Value = 1829 },
 				{ Name = "CURRENCY_ID_RENOWN_VENTHYR", Type = "number", Value = 1830 },

Interface/AddOns/Blizzard_APIDocumentationGenerated/EncounterJournalConstantsDocumentation.lua

@@ -5,9 +5,9 @@ local EncounterJournalConstants =
 		{
 			Name = "JournalEncounterFlags",
 			Type = "Enumeration",
-			NumValues = 6,
+			NumValues = 7,
 			MinValue = 1,
-			MaxValue = 32,
+			MaxValue = 64,
 			Fields =
 			{
 				{ Name = "Obsolete", Type = "JournalEncounterFlags", EnumValue = 1 },
@@ -16,6 +16,7 @@ local EncounterJournalConstants =
 				{ Name = "HordeOnly", Type = "JournalEncounterFlags", EnumValue = 8 },
 				{ Name = "NoMap", Type = "JournalEncounterFlags", EnumValue = 16 },
 				{ Name = "InternalOnly", Type = "JournalEncounterFlags", EnumValue = 32 },
+				{ Name = "DoNotDisplayEncounter", Type = "JournalEncounterFlags", EnumValue = 64 },
 			},
 		},
 		{

Interface/AddOns/Blizzard_APIDocumentationGenerated/UnitDocumentation.lua

@@ -465,6 +465,11 @@ local Unit =
 			Type = "Event",
 			LiteralName = "CANCEL_SUMMON",
 		},
+		{
+			Name = "ComboTargetChanged",
+			Type = "Event",
+			LiteralName = "COMBO_TARGET_CHANGED",
+		},
 		{
 			Name = "ConfirmBinder",
 			Type = "Event",

Interface/AddOns/Blizzard_ActionBar/Cata/MainMenuBarMicroButtons.lua

@@ -9,10 +9,10 @@ MICRO_BUTTONS = {
 	"AchievementMicroButton",
 	"QuestLogMicroButton",
 	"GuildMicroButton",
-	"EJMicroButton",
 	"CollectionsMicroButton",
 	"PVPMicroButton",
 	"LFGMicroButton",
+	"EJMicroButton",
 	"MainMenuMicroButton",
 	"HelpMicroButton",
 }
@@ -66,15 +66,51 @@ function UpdateMicroButtonsParent(parent)
 	end
 end
 
-function MoveMicroButtons(anchor, anchorTo, relAnchor, x, y, isStacked)
-	CharacterMicroButton:ClearAllPoints();
-	CharacterMicroButton:SetPoint(anchor, anchorTo, relAnchor, x, y);
-	PVPMicroButton:ClearAllPoints();
-	if ( isStacked ) then
-		PVPMicroButton:SetPoint("TOPLEFT", CharacterMicroButton, "BOTTOMLEFT", 0, 23);
+function UnstackMicroButtons()
+	local lastButton;
+	for i=1, #MICRO_BUTTONS do
+		local button = _G[MICRO_BUTTONS[i]];
+
+		if lastButton then
+			button:ClearAllPoints();
+			button:SetPoint("BOTTOMLEFT", lastButton, "BOTTOMRIGHT", -3, 0);
+		end
+
+		lastButton = button;
+	end
+end
+
+function MoveMicroButtons(anchor, anchorTo, relAnchor, x, y, isStacked, maxRowWidth)
+	if #MICRO_BUTTONS == 0 then
+		return;
+	end
+
+	local firstButton = _G[MICRO_BUTTONS[1]];
+	firstButton:ClearAllPoints();
+	firstButton:SetPoint(anchor, anchorTo, relAnchor, x, y);
+
+	local secondRowButton;
+	local cumulativeWidth = 0;
+	if isStacked and maxRowWidth then
+		for i=1, #MICRO_BUTTONS do
+			local nextWidth = cumulativeWidth + _G[MICRO_BUTTONS[i]]:GetWidth();
+
+			if nextWidth >= maxRowWidth then
+				secondRowButton = _G[MICRO_BUTTONS[i]];
+				break;
+			end
+
+			cumulativeWidth = nextWidth;
+		end
+	end
+
+	if ( isStacked and secondRowButton ) then
+		secondRowButton:ClearAllPoints();
+		secondRowButton:SetPoint("TOPLEFT", firstButton, "BOTTOMLEFT", 0, 24);
 	else
-		PVPMicroButton:SetPoint("BOTTOMLEFT", CollectionsMicroButton, "BOTTOMRIGHT", -2, 0);
+		UnstackMicroButtons();
 	end
+
 	UpdateMicroButtons();
 end
 
@@ -169,7 +205,7 @@ function UpdateMicroButtons()
 	end
 
 	-- Keyring microbutton
-	if (KeyRingButton) then
+	if (IsKeyRingEnabled() and KeyRingButton) then
 		if ( IsBagOpen(KEYRING_CONTAINER) ) then
 			KeyRingButton:SetButtonState("PUSHED", 1);
 		else

Interface/AddOns/Blizzard_ActionBar/Classic/MainMenuBar.lua

@@ -653,7 +653,7 @@ function HideWatchBarText(bar, unlock)
 end
 
 function MainMenuBar_UpdateKeyRing()
-	if ( GetCVarBool("showKeyring") ) then
+	if ( IsKeyRingEnabled() and GetCVarBool("showKeyring") ) then
 		MainMenuBarTexture3:SetTexture("Interface\\MainMenuBar\\UI-MainMenuBar-KeyRing");
 		MainMenuBarTexture3:SetTexCoord(0, 1, 0.1640625, 0.5);
 		MainMenuBarTexture2:SetTexture("Interface\\MainMenuBar\\UI-MainMenuBar-KeyRing");

Interface/AddOns/Blizzard_ActionBar/Classic/OverrideActionBar.lua

@@ -105,7 +105,7 @@ function OverrideActionBar_UpdateMicroButtons()
 	if ActionBarController_GetCurrentActionBarState() == LE_ACTIONBAR_STATE_OVERRIDE then
 		local anchorX, anchorY = OverrideActionBar_GetMicroButtonAnchor();
 		UpdateMicroButtonsParent(OverrideActionBar);
-		MoveMicroButtons("BOTTOMLEFT", OverrideActionBar, "BOTTOMLEFT", anchorX, anchorY, true);
+		MoveMicroButtons("BOTTOMLEFT", OverrideActionBar, "BOTTOMLEFT", anchorX, anchorY, true, OverrideActionBar.MicroBGL:GetWidth() + OverrideActionBar._MicroBGMid:GetWidth() + OverrideActionBar.MicroBGR:GetWidth());
 	end
 end
 
@@ -170,13 +170,13 @@ end
 
 
 function OverrideActionBar_GetMicroButtonAnchor()
-	local x, y = 543, 43;
+	local x, y = 542, 41;
 	if OverrideActionBar.HasExit and OverrideActionBar.HasPitch then
-		x = 626;
+		x = 628;
 	elseif OverrideActionBar.HasPitch then
-		x = 630;
+		x = 632;
 	elseif OverrideActionBar.HasExit then
-		x = 538;
+		x = 540;
 	end
 	return x,y
 end

Interface/AddOns/Blizzard_Collections/Cata/Blizzard_Wardrobe.lua

@@ -360,7 +360,7 @@ function TransmogFrameMixin:Update()
 	end
 
 	for i, slotButton in ipairs(self.SlotButtons) do
-		slotButton:RefreshItemModel();
+		slotButton:RefreshItemModel(self.selectedSlotButton);
 	end
 
 	self:UpdateApplyButton();
@@ -759,12 +759,17 @@ function TransmogSlotButtonMixin:GetEffectiveTransmogID()
 	end
 end
 
-function TransmogSlotButtonMixin:RefreshItemModel()
+function TransmogSlotButtonMixin:RefreshItemModel(selectedSlotButton)
 	-- this slot will be handled by the dependencySlot
 	if self.dependencySlot then
 		return;
 	end
 
+	-- only equip ranged weapon if ranged slot is selected
+	if(self.slot == "RANGEDSLOT" and (selectedSlotButton == nil or selectedSlotButton.slot ~= "RANGEDSLOT")) then
+		return;
+	end
+
 	local appearanceID = self:GetEffectiveTransmogID();
 	local secondaryAppearanceID = Constants.Transmog.NoTransmogID;
 	local illusionID = Constants.Transmog.NoTransmogID;

Interface/AddOns/Blizzard_FrameXML/Cata/TalentFrameBase.lua

@@ -229,6 +229,14 @@ function TalentFrame_Update(TalentFrame)
 		end
 	end
 
+	-- Hide unused inspect talent buttons
+	if ( TalentFrame.inspect ) then
+		for i=MAX_NUM_TALENTS + 1, NUM_INSPECT_TALENT_SLOTS do
+			local button = _G["InspectTalentFrameTalent"..i];
+			button:Hide();
+		end
+	end
+
 	-- Draw the prereq branches
 	local node;
 	local textureIndex = 1;
@@ -378,4 +386,3 @@ function SetTalentButtonLocation(button, tier, column, talentButtonSize, initial
 	button:SetPoint("TOPLEFT", button:GetParent(), "TOPLEFT", column, tier);
 end
 
-

Interface/AddOns/Blizzard_InspectUI/Classic/InspectPVPFrame.lua

@@ -71,7 +71,7 @@ function InspectPVPTeam_SoloUpdate()
 		buttonName = "InspectPVPTeam"..buttonIndex;
 		data = buttonName.."Data";
 
-		if (rating > 0) then
+		if (rating > 0 or played > 0) then
 			-- Populate Data
 			getglobal(data.."TypeLabel"):SetText(ARENA_THIS_SEASON);
 			getglobal(data.."Name"):SetText(_G["ARENA_" .. teamSize .. "V" .. teamSize]);

Interface/AddOns/Blizzard_InspectUI/Classic/InspectTalentFrame.lua

@@ -1,3 +1,4 @@
+NUM_INSPECT_TALENT_SLOTS = 40;
 
 local talentSpecInfoCache = {};
 

Interface/AddOns/Blizzard_LevelUpDisplay/Blizzard_LevelUpDisplay_Cata.toc

@@ -0,0 +1,8 @@
+## Title: Blizzard_LevelUpDisplay
+## Author: Blizzard Entertainment
+## DefaultState: enabled
+## AllowLoad: game
+## AllowLoadGameType: cata
+Cata\LevelUpDisplay.lua
+Cata\LevelUpDisplay.xml
+Localization.lua

Interface/AddOns/Blizzard_MainMenuBarBagButtons/Classic/MainMenuBarBagButtons.lua

@@ -184,6 +184,10 @@ function MainMenuBarBackpackButton_OnEvent(self, event, ...)
 			MainMenuBarBackpackButton_UpdateFreeSlots();
 		end
 	elseif ( event == "PLAYER_ENTERING_WORLD" ) then
+		if(not IsKeyRingEnabled()) then
+			KeyRingButton:Disable();
+			KeyRingButton:Hide();
+		end
 		if ( GetCVar("displayFreeBagSlots") == "1" ) then
 			MainMenuBarBackpackButtonCount:Show();
 		else

Interface/AddOns/Blizzard_UIPanels_Game/Cata/PVPFrame.lua

@@ -45,7 +45,7 @@ ARENABANNER_SMALLFONT = "GameFontNormalSmall"
 
 
 function PVPFrame_ExpansionSpecificOnLoad(self)
-	PanelTemplates_SetNumTabs(self, 3)
+	PanelTemplates_SetNumTabs(self, 4)
 	PVPFrame_TabClicked(PVPFrameTab1);
 	SetPortraitToTexture(PVPFramePortrait,"Interface\\BattlefieldFrame\\UI-Battlefield-Icon");
 
@@ -161,6 +161,8 @@ function PVPFrame_UpdateTabs()
 		PVPFrameTab2:Click();
 	elseif (selectedTab == 3) then
 		PVPFrameTab3:Click();
+	elseif (selectedTab == 4) then
+		PVPFrameTab4:Click();
 	end
 end
 
@@ -276,10 +278,6 @@ end
 
 ---- NEW PVP FRAME FUNCTIONS
 
-function PVPHonor_Update()
-	PVPFrame_UpdateCurrency(self);
-end
-
 function PVPFrame_UpdateCurrency(self)
 	local currencyID = PVPFrameCurrency.currencyID;
 	local currencyName, currencyAmount;
@@ -394,7 +392,7 @@ function PVPFrame_TabClicked(self)
 	PVPFrameRightButton:Hide();
 	PVPFrame.panel1:Hide();	
 	PVPFrame.panel2:Hide();	
-	--PVPFrame.panel3:Hide();
+	PVPFrame.panel3:Hide();
 	PVPFrame.panel4:Hide();
 
 	PVPFrame.lowLevelFrame:Hide();
@@ -416,7 +414,7 @@ function PVPFrame_TabClicked(self)
 		PVPFrameCurrencyLabel:SetText(HONOR);
 		PVPFrameCurrencyIcon:SetTexture("Interface\\PVPFrame\\PVPCurrency-Honor-"..factionGroup);
 		PVPFrameCurrency.currencyID = Constants.CurrencyConsts.CLASSIC_HONOR_CURRENCY_ID;
-	elseif index == 3 then -- War games
+	elseif index == 4 then -- War games
 		PVPFrame.panel4:Show();
 		PVPFrame.TankIcon:Hide();
 		PVPFrame.HealerIcon:Hide();
@@ -445,6 +443,15 @@ function PVPFrame_TabClicked(self)
 		PVPFrameCurrencyLabel:SetText(PVP_CONQUEST);
 		PVPFrameCurrencyIcon:SetTexture("Interface\\PVPFrame\\PVPCurrency-Conquest-"..factionGroup);
 		PVPFrameCurrency.currencyID = Constants.CurrencyConsts.CONQUEST_POINTS_CURRENCY_ID;
+	elseif index == 3 then -- Arena Management
+		PVPFrameLeftButton:Hide();
+		PVPFrameLeftButton:Disable();
+		PVPFrame.TankIcon:Hide();
+		PVPFrame.HealerIcon:Hide();
+		PVPFrame.DPSIcon:Hide();
+		PVPFrame.panel3:Show();	
+		PVPFrameArenaIcon:SetTexture("Interface\\PVPFrame\\PVPCurrency-Conquest-"..factionGroup);
+		PVPFrameCurrency.currencyID = none;
 	end
 
 	PlaySound(SOUNDKIT.IG_CHARACTER_INFO_OPEN);
@@ -936,8 +943,39 @@ function PVPConquestFrame_ButtonClicked(button)
 end
 
 --  PVPTeamManagementFrame
-function PVPTeam_Update()
+function PVPTeamManagementFrame_ToggleSeasonal(self)	
+	if ( PVPFrame.seasonStats ) then
+		PVPFrame.seasonStats = nil;
+		PvP_WeeklyText:SetText(ARENA_WEEKLY_STATS);
+	else
+		PVPFrame.seasonStats = 1;
+		PvP_WeeklyText:SetText(ARENA_SEASON_STATS);
+	end
+	PVPTeam_Update();
+	PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON);
+end
+
+-- PVP Honor Data
+function PVPHonor_Update()
+	local hk, cp, dk, contribution, rank, highestRank, rankName, rankNumber;
 
+	-- Yesterday's values
+	hk = GetPVPYesterdayStats();
+	PVPHonorYesterdayKills:SetText(hk);
+
+	-- Lifetime values
+	hk =  GetPVPLifetimeStats();
+	PVPHonorLifetimeKills:SetText(hk);
+
+	local honorCurrencyInfo = C_CurrencyInfo.GetCurrencyInfo(Constants.CurrencyConsts.CLASSIC_HONOR_CURRENCY_ID);
+	PVPFrameHonorPoints:SetText(honorCurrencyInfo.quantity);
+
+	local arenaCurrencyInfo = C_CurrencyInfo.GetCurrencyInfo(Constants.CurrencyConsts.CONQUEST_ARENA_META_CURRENCY_ID);
+	PVPFrameArenaPoints:SetText(arenaCurrencyInfo.quantity)	
+
+	-- Today's values
+	hk = GetPVPSessionStats();
+	PVPHonorTodayKills:SetText(hk);
 end
 
 ---- PVP PopUp Functions