Build 10623

AddOns/Blizzard_AchievementUI/Blizzard_AchievementUI.lua

@@ -979,10 +979,7 @@ function AchievementButton_ToggleTracking (id)
 
 	local count = GetNumTrackedAchievements();
 
-	if ( WatchFrame_GetRemainingSpace() < WatchFrame_GetHeightNeededForAchievement(id) ) then
-		UIErrorsFrame:AddMessage(OBJECTIVES_WATCH_TOO_MANY, 1.0, 0.1, 0.1, 1.0);
-		return
-	elseif ( count >= WATCHFRAME_MAXACHIEVEMENTS ) then
+	if ( count >= WATCHFRAME_MAXACHIEVEMENTS ) then
 		UIErrorsFrame:AddMessage(format(ACHIEVEMENT_WATCH_TOO_MANY, WATCHFRAME_MAXACHIEVEMENTS), 1.0, 0.1, 0.1, 1.0);
 		return;
 	end

AddOns/Blizzard_ItemSocketingUI/Blizzard_ItemSocketingUI.xml

@@ -407,10 +407,7 @@
                   dialog.data = 2;
                  end
             elseif ( ItemSocketingFrame.itemIsBoundTradeable ) then
-                local dialog = StaticPopup_Show("END_BOUND_TRADEABLE");
-                if(dialog) then
-                  dialog.data = 2;
-                 end
+                local dialog = StaticPopup_Show("END_BOUND_TRADEABLE", nil, nil, "gem");
             elseif ( ItemSocketingFrame.destroyingGem ) then
                 StaticPopup_Show("CONFIRM_ACCEPT_SOCKETS");
             else

FrameXML/Bindings.xml

@@ -690,7 +690,7 @@
 		ToggleFriendsFrame(5);
 	</Binding>
 	<Binding name="TOGGLELFGPARENT">
-		--ToggleLFDParentFrame();
+		ToggleLFDParentFrame();
 	</Binding>
 	<Binding name="TOGGLELFGTAB">
 		ToggleLFGParentFrame(1);

FrameXML/ChatFrame.lua

@@ -2113,6 +2113,8 @@ SlashCmdList["SET_TITLE"] = function(msg)
 		if(not SetTitleByName(name)) then
 			UIErrorsFrame:AddMessage(TITLE_DOESNT_EXIST, 1.0, 0.1, 0.1, 1.0);
 		end
+	else
+		SetCurrentTitle(-1)
 	end
 end
 

FrameXML/FontStyles.xml

@@ -113,6 +113,9 @@
 	<Font name="GameFontNormalHuge" inherits="SystemFont_Shadow_Huge1" virtual="true">
 		<Color r="1.0" g="0.82" b="0"/>
 	</Font>
+	<Font name="GameFontNormalHugeBlack" inherits="SystemFont_Huge1" virtual="true">
+		<Color r="0" g="0" b="0"/>
+	</Font>
 
 	<Font name="BossEmoteNormalHuge" inherits="SystemFont_Shadow_Huge3" virtual="true">
 		<Color r="1.0" g="0.82" b="0"/>

FrameXML/Fonts.xml

@@ -114,6 +114,11 @@
 			<AbsValue val="16"/>
 		</FontHeight>
 	</Font>
+	<Font name="SystemFont_Huge1" font="Fonts\FRIZQT__.TTF" virtual="true">
+		<FontHeight>
+			<AbsValue val="20"/>
+		</FontHeight>
+	</Font>
 	<Font name="SystemFont_Shadow_Huge1" font="Fonts\FRIZQT__.TTF" virtual="true">
 		<Shadow>
 			<Offset>

FrameXML/FrameXML.toc

@@ -124,6 +124,7 @@ PVPBattlegroundFrame.xml
 ArenaFrame.xml
 ArenaRegistrarFrame.xml
 ##LFGFrame.xml
+LFDFrame.xml
 MovieRecordingProgress.xml
 MacOptionsFrame.xml
 RatingMenuFrame.xml

FrameXML/GlobalStrings.lua

@@ -1081,6 +1081,24 @@ BUILDING_DAMAGE = "Siege";
 BUILDING_DAMAGE_COMBATLOG_TOOLTIP = "Show messages when a spell or ability deals damage to a destructible building.";
 BUILDING_HEAL = "Repairs";
 BUILDING_HEAL_COMBATLOG_TOOLTIP = "Show messages when a spell or ability repairs a building.";
+BUTTON_LAG_AUCTIONHOUSE = "Auction House";
+BUTTON_LAG_AUCTIONHOUSE_NEWBIE = "There is a long delay when posting, buying, searching or paging through auctions.";
+BUTTON_LAG_AUCTIONHOUSE_TOOLTIP = "Auction House Lag";
+BUTTON_LAG_CHAT = "Chat";
+BUTTON_LAG_CHAT_NEWBIE = "It takes a long time for your friends to see messages you send them or for you to see messages they send you.";
+BUTTON_LAG_CHAT_TOOLTIP = "Chat Message Lag";
+BUTTON_LAG_LOOT = "Loot";
+BUTTON_LAG_LOOT_NEWBIE = "It takes a long time for loot that you click on or that someone assigns to you to show up in your inventory. It may also take a long time to trade items with another player.";
+BUTTON_LAG_LOOT_TOOLTIP = "Loot Lag";
+BUTTON_LAG_MAIL = "";
+BUTTON_LAG_MAIL_NEWBIE = "It takes a long time to open mail or retrieve items from mail.";
+BUTTON_LAG_MAIL_TOOLTIP = "In Game Mail Lag";
+BUTTON_LAG_MOVEMENT = "Movement";
+BUTTON_LAG_MOVEMENT_NEWBIE = "Creatures and players may pop or teleport from place to place. They may also run in place. You may notice that you try to attack creatures that aren't really where you think they are.";
+BUTTON_LAG_MOVEMENT_TOOLTIP = "Movement Lag";
+BUTTON_LAG_SPELL = "Spells and Abilities";
+BUTTON_LAG_SPELL_NEWBIE = "It takes a long time after you try and use a spell or ability before the spell or ability actually occurs. Abilities may behave as if they are on cooldown even though they are not.";
+BUTTON_LAG_SPELL_TOOLTIP = "Spell and Ability Lag";
 BUYBACK = "Buyback";
 BUYBACK_THIS_ITEM = "Buy Back This Item";
 BUYOUT = "Buyout";
@@ -1889,6 +1907,14 @@ DUNGEON_FLOOR_GUNDRAK1 = "Gundrak";
 DUNGEON_FLOOR_HALLSOFLIGHTNING1 = "Unyielding Garrison";
 DUNGEON_FLOOR_HALLSOFLIGHTNING2 = "Walk of the Makers";
 DUNGEON_FLOOR_HALLSOFREFLECTION1 = "Halls of Reflection";
+DUNGEON_FLOOR_ICECROWNCITADEL1 = "The Lower Citadel";
+DUNGEON_FLOOR_ICECROWNCITADEL2 = "The Rampart of Skulls";
+DUNGEON_FLOOR_ICECROWNCITADEL3 = "Deathbringer's Rise";
+DUNGEON_FLOOR_ICECROWNCITADEL4 = "The Frost Queen's Lair";
+DUNGEON_FLOOR_ICECROWNCITADEL5 = "The Upper Reaches";
+DUNGEON_FLOOR_ICECROWNCITADEL6 = "Royal Quarters";
+DUNGEON_FLOOR_ICECROWNCITADEL7 = "The Frozen Throne";
+DUNGEON_FLOOR_ICECROWNCITADEL8 = "Frostmourne";
 DUNGEON_FLOOR_NAXXRAMAS1 = "The Construct Quarter";
 DUNGEON_FLOOR_NAXXRAMAS2 = "The Arachnid Quarter";
 DUNGEON_FLOOR_NAXXRAMAS3 = "The Military Quarter";
@@ -2996,6 +3022,8 @@ ERR_LFG_NO_SLOTS_PLAYER = "You do not meet the requirements for the chosen dunge
 ERR_LFG_PARTY_PLAYERS_FROM_DIFFERENT_REALMS = "The dungeon you chose does not support players from multiple realms.";
 ERR_LFG_PENDING = "You already have a pending match.";
 ERR_LFG_PROPOSAL_FAILED = "Someone has declined the dungeon invite. You have been added to the front of the dungeon queue.";
+ERR_LFG_RANDOM_COOLDOWN_PARTY = "One or more party members are on random dungeon cooldown.";
+ERR_LFG_RANDOM_COOLDOWN_PLAYER = "You can not queue for random dungeons while on random dungeon cooldown.";
 ERR_LFG_ROLE_CHECK_FAILED = "The Role Check has failed.";
 ERR_LFG_ROLE_CHECK_FAILED_NOT_VIABLE = "Role Check failed because your group is not viable.";
 ERR_LFG_ROLE_CHECK_FAILED_TIMEOUT = "Role Check failed because group member did not respond.";
@@ -3841,6 +3869,8 @@ HELPFRAME_ITEM_BULLET_TITLE2 = "The following are NOT considered item issues:";
 HELPFRAME_ITEM_BUTTON_TEXT = "Report Item Issue";
 HELPFRAME_ITEM_TEXT = "Issues regarding any problem dealing with item functionality or possession";
 HELPFRAME_ITEM_TITLE = "Item";
+HELPFRAME_LAG_TEXT1 = "The primary cause of lag is high population. You will usually notice lag by mail boxes in major cities...\n\n What type of lag are you experiencing? Click on a button below to submit a report.";
+HELPFRAME_LAG_TITLE = "Report Lag";
 HELPFRAME_NONQUEST_BULLET1 = "Creeps permanently evading";
 HELPFRAME_NONQUEST_BULLET2 = "NPC is not pathing correctly";
 HELPFRAME_NONQUEST_BULLET3 = "Creeps over-spawning or under-spawning";
@@ -3874,6 +3904,7 @@ HELPFRAME_REPORTISSUE_BULLET_TITLE1 = "Topics can include but are not limited to
 HELPFRAME_REPORTISSUE_TEXT1 = "Unlike the \"Talk to a GM\" feature, this feature is for players to give the Game Master Department a heads up on issues that may be occurring in-game. There can be times when players come across something in-game they feel requires our attention but does not necessarily require a Game Master response. We encourage the use of this category for those occasions.";
 HELPFRAME_REPORTISSUE_TEXT2 = "In addition there may be times when a Game Master will still need to contact players in order to gather further information. We apologize in advance for any interruption to game play that may ensue.";
 HELPFRAME_REPORTISSUE_TITLE = "Report an Issue";
+HELPFRAME_REPORTLAG_TEXT1 = "Your lag report has been successfully submitted.";
 HELPFRAME_STUCK_BUTTON_DESCRIPTION = "Physically stuck in an area of the map";
 HELPFRAME_STUCK_BUTTON_TEXT = "Stuck:";
 HELPFRAME_STUCK_TEXT1 = "If you find yourself stuck and unable to move, please try the auto-unstuck feature prior to petitioning a GM. In most cases, this should solve the problem. Activating the auto-unstuck command will first attempt to use your hearthstone to port you back to your inn. If this is not possible, it will attempt to nudge your character out of position.\n\nPlease note this option can only be used every 5 minutes. Using the auto-unstuck option will log your character and location so that we can verify and fix the location in the future.";
@@ -4012,19 +4043,19 @@ INSTANCE_RESET_FAILED_ZONING = "Cannot reset %s.  There are players in your part
 INSTANCE_RESET_SUCCESS = "%s has been reset.";
 INSTANCE_SAVED = "You are now saved to this instance";
 INSTANCE_SHUTDOWN_MESSAGE = "Not enough players. The game will end in %s";
-INSTANCE_UNAVAILABLE_OTHER_EXPANSION_TOO_LOW = "%s does not have a recent enough expansion.";
+INSTANCE_UNAVAILABLE_OTHER_EXPANSION_TOO_LOW = "%s does not have the correct World of Warcraft expansion.";
 INSTANCE_UNAVAILABLE_OTHER_GEAR_TOO_HIGH = "%s's gear is too good.";
 INSTANCE_UNAVAILABLE_OTHER_GEAR_TOO_LOW = "%s must obtain better gear.";
 INSTANCE_UNAVAILABLE_OTHER_LEVEL_TOO_HIGH = "%s's level is too high.";
 INSTANCE_UNAVAILABLE_OTHER_LEVEL_TOO_LOW = "%s must advance to a higher level.";
-INSTANCE_UNAVAILABLE_OTHER_OTHER = "%s does not meet the requirements for this instance.";
+INSTANCE_UNAVAILABLE_OTHER_OTHER = "%s does not meet the requirements for this dungeon.";
 INSTANCE_UNAVAILABLE_OTHER_RAID_LOCKED = "%s is already locked to this instance.";
-INSTANCE_UNAVAILABLE_SELF_EXPANSION_TOO_LOW = "You do not have a recent enough expansion.";
+INSTANCE_UNAVAILABLE_SELF_EXPANSION_TOO_LOW = "You do not have the World of Warcraft expansion.";
 INSTANCE_UNAVAILABLE_SELF_GEAR_TOO_HIGH = "Your gear is too good.";
 INSTANCE_UNAVAILABLE_SELF_GEAR_TOO_LOW = "You must obtain better gear.";
 INSTANCE_UNAVAILABLE_SELF_LEVEL_TOO_HIGH = "Your level is too high.";
 INSTANCE_UNAVAILABLE_SELF_LEVEL_TOO_LOW = "You must advance to a higher level.";
-INSTANCE_UNAVAILABLE_SELF_OTHER = "You do not meet the requirements for this instance.";
+INSTANCE_UNAVAILABLE_SELF_OTHER = "You do not meet the requirements for this dungeon.";
 INSTANCE_UNAVAILABLE_SELF_RAID_LOCKED = "You are already locked to this instance.";
 INT = "Int";
 INTELLECT_COLON = "Intellect:";
@@ -4302,6 +4333,7 @@ KBASE_ERROR_LOAD_FAILURE = "The Knowledge Base is currently unavailable.  Please
 KBASE_ERROR_NO_RESULTS = "There were no articles matching your search criteria.";
 KBASE_GMTALK = "Talk to a GM";
 KBASE_HOT_ISSUE = "Hot Issue";
+KBASE_LAG = "Report Lag";
 KBASE_RECENTLY_UPDATED = "Recently Updated";
 KBASE_REPORTISSUE = "Report Issue";
 KBASE_SEARCH_RESULTS = "Search Results";
@@ -4465,7 +4497,7 @@ LFD_LEVEL_FORMAT_RANGE = "(%d - %d)";
 LFD_LEVEL_FORMAT_SINGLE = "(%d)";
 LFD_RANDOM_EXPLANATION = "Using the Dungeons panel to do a Random Dungeon will earn you extra rewards.";
 LFD_RANDOM_REWARD_EXPLANATION1 = "The first random dungeon that you complete each day will earn you:";
-LFD_RANDOM_REWARD_PUG_EXPLANATION = "For every random player included in your group, you will get:";
+LFD_RANDOM_REWARD_PUG_EXPLANATION = "You will also receive the following rewards. They scale with the number of random players included in your group:";
 LFD_REWARDS = "Rewards";
 LFGWIZARD_TITLE = "Choose an Action";
 LFG_BUTTON = "Looking For Group/Looking For More";
@@ -5551,6 +5583,7 @@ QUESTS_SUBTEXT = "These options allow you to customize the behaviors of the game
 QUEST_ACCEPT = "%s is starting %s\nWould you like to as well?";
 QUEST_ACCEPT_LOG_FULL = "%s is starting %s\nYour quest log is full. You can join this\nquest if you make room in your quest log.";
 QUEST_COMPLETE = "Quest completed";
+QUEST_DASH = "- ";
 QUEST_DESCRIPTION = "Description";
 QUEST_DETAILS = "Quest Details";
 QUEST_FACTION_NEEDED = "%s:  %s / %s";
@@ -5954,7 +5987,7 @@ SHOW_PET_SPELL_DAMAGE = "Show pet spell damage";
 SHOW_PLAYER_NAMES = "Player Names";
 SHOW_PLAYER_TITLES = "Player Titles";
 SHOW_QUEST_FADING_TEXT = "Instant Quest Text";
-SHOW_QUEST_OBJECTIVES_ON_MAP_TEXT = "Show Quest Objectives On Map";
+SHOW_QUEST_OBJECTIVES_ON_MAP_TEXT = "Show Quest Objectives";
 SHOW_QUICK_BUTTON = "Show Quick Button";
 SHOW_RAID_RANGE_TEXT = "Range in Raid Interface";
 SHOW_TARGET = "Show Target";
@@ -6674,6 +6707,8 @@ SPELL_FAILED_CUSTOM_ERROR_83 = "You must have a Fire Totem active.";
 SPELL_FAILED_CUSTOM_ERROR_84 = "You may not bite other vampires.";
 SPELL_FAILED_CUSTOM_ERROR_85 = "Your pet is already at your level.";
 SPELL_FAILED_CUSTOM_ERROR_86 = "You do not meet the level requirements for this item.";
+SPELL_FAILED_CUSTOM_ERROR_87 = "There are too many Mutated Abominations.";
+SPELL_FAILED_CUSTOM_ERROR_88 = "The potions have all been depleted by Professor Putricide.";
 SPELL_FAILED_CUSTOM_ERROR_9 = "Requires Corpse Dust";
 SPELL_FAILED_DAMAGE_IMMUNE = "You can't do that while you are immune";
 SPELL_FAILED_EQUIPPED_ITEM = "Must have the proper item equipped";

FrameXML/InterfaceOptionsPanels.lua

@@ -787,8 +787,6 @@ ObjectivesPanelOptions = {
 	questFadingDisable = { text = "SHOW_QUEST_FADING_TEXT" },
 	autoQuestWatch = { text = "AUTO_QUEST_WATCH_TEXT" },
 	autoQuestProgress = { text = "AUTO_QUEST_PROGRESS_TEXT" },
-	advancedWatchFrame = { text = "ADVANCED_OBJECTIVES_TEXT" },
-	watchFrameIgnoreCursor = { text = "OBJECTIVES_IGNORE_CURSOR_TEXT" },
 }
 
 function InterfaceOptionsObjectivesPanel_OnLoad (self)
@@ -801,24 +799,6 @@ end
 
 function InterfaceOptionsObjectivesPanel_OnEvent (self, event, ...)
 	BlizzardOptionsPanel_OnEvent(self, event, ...);
-
-	if ( event == "PLAYER_ENTERING_WORLD" ) then
-		local control = InterfaceOptionsObjectivesPanelAdvancedWatchFrame;
-		control.setFunc(GetCVar(control.cvar));
-
-		control = InterfaceOptionsObjectivesPanelIgnoreCursor;
-		control.setFunc(GetCVar(control.cvar));
-	end
-end
-
-function InterfaceOptionsObjectivesPanelAdvancedWatchFrame_UncheckInterrupt(self)
-	StaticPopup_Show("ADVANCED_WATCHFRAME_OPTION_ENABLE_INTERRUPT");
-end
-
-function InterfaceOptionsObjectivesPanelAdvancedWatchFrame_ConfirmUncheck()
-	local checkButton = InterfaceOptionsObjectivesPanelAdvancedWatchFrame;
-	checkButton:SetChecked(false);
-	InterfaceOptionsPanel_CheckButton_Update(checkButton);
 end
 
 -- [[ Social Options Panel ]] --
@@ -851,6 +831,7 @@ function InterfaceOptionsSocialPanel_OnLoad (self)
 		else
 			SIMPLE_CHAT = "0";
 			FCF_Set_NormalChat();
+			UIParent_ManageFramePositions();
 		end
 	end
 

FrameXML/InterfaceOptionsPanels.xml

@@ -994,46 +994,6 @@
 					</OnLoad>
 				</Scripts>
 			</CheckButton>
-			<CheckButton name="$parentAdvancedWatchFrame" inherits="InterfaceOptionsCheckButtonTemplate">
-				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="$parentAutoQuestProgress" relativePoint="BOTTOMLEFT">
-						<Offset>
-							<AbsDimension x="0" y="-8"/>
-						</Offset>
-					</Anchor>
-				</Anchors>
-				<Scripts>
-					<OnLoad>
-						--If you change this, be sure to change the interrupt function in UIOptionsPanels.lua
-						self.type = CONTROLTYPE_CHECKBOX;
-						self.cvar = "advancedWatchFrame";
-						self.uvar = "ADVANCED_WATCH_FRAME";
-						self.interruptUncheck = InterfaceOptionsObjectivesPanelAdvancedWatchFrame_UncheckInterrupt;
-						self.setFunc = function() WatchFrame_ToggleSimpleWatch() end
-						BlizzardOptionsPanel_RegisterControl(self, self:GetParent());
-					</OnLoad>
-				</Scripts>
-			</CheckButton>	
-			<CheckButton name="$parentIgnoreCursor" inherits="InterfaceOptionsSmallCheckButtonTemplate">
-				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="$parentAdvancedWatchFrame" relativePoint="BOTTOMLEFT">
-						<Offset>
-							<AbsDimension x="8" y="-4"/>
-						</Offset>
-					</Anchor>
-				</Anchors>
-				<Scripts>
-					<OnLoad>
-
-						self.type = CONTROLTYPE_CHECKBOX;
-						self.cvar = "watchFrameIgnoreCursor";
-						self.uvar = "WATCHFRAME_IGNORECURSOR";
-						self.setFunc = function() WatchFrame_ToggleIgnoreCursor() end
-						BlizzardOptionsPanel_RegisterControl(self, self:GetParent());
-						BlizzardOptionsPanel_SetupDependentControl(InterfaceOptionsObjectivesPanelAdvancedWatchFrame, self);
-					</OnLoad>
-				</Scripts>
-			</CheckButton>		
 		</Frames>
 		<Scripts>
 			<OnLoad function="InterfaceOptionsObjectivesPanel_OnLoad"/>