Commit 6c229499 authored by TOM_RUS's avatar TOM_RUS
Browse files

WOW-27075patch8.0.1_Beta

parent 29a79907
......@@ -3680,6 +3680,7 @@ function CalendarCreateEventFrame_Update()
C_Calendar.EventSetType(CalendarCreateEventFrame.selectedEventType);
-- reset event texture (must come after event type)
CalendarCreateEventFrame.selectedTextureIndex = nil;
CalendarCreateEventFrame.calendarType = nil;
CalendarCreateEventTexture_Update();
-- reset the community selected
UIDropDownMenu_SetSelectedValue(CalendarCreateEventCommunityDropDown, nil);
......@@ -3688,13 +3689,6 @@ function CalendarCreateEventFrame_Update()
CalendarCreateEventCreatorName:Hide();
CalendarCreateEventCommunityName:Hide();
if(CalendarCreateEventTextureName:IsShown()) then
CalendarCreateEventTextureName:SetPoint("TOPLEFT", CalendarCreateEventIcon, "TOPRIGHT", 5, 0)
CalendarCreateEventDateLabel:SetPoint("TOPLEFT", CalendarCreateEventTextureName, "BOTTOMLEFT")
else
CalendarCreateEventDateLabel:SetPoint("TOPLEFT", CalendarCreateEventIcon, "TOPRIGHT", 5, 0)
end
local calendarType = C_Calendar.EventGetCalendarType();
CalendarCreateEventCommunityDropDown:SetShown(calendarType == "COMMUNITY_EVENT");
......@@ -3774,6 +3768,7 @@ function CalendarCreateEventFrame_Update()
CalendarCreateEvent_UpdateEventType();
-- reset event texture (must come after event type)
CalendarCreateEventFrame.selectedTextureIndex = eventInfo.textureIndex;
CalendarCreateEventFrame.calendarType = eventInfo.calendarType;
CalendarCreateEventTexture_Update();
-- update the creator (must come after event texture)
CalendarCreateEventCreatorName:SetFormattedText(CALENDAR_EVENT_CREATORNAME, _CalendarFrame_SafeGetName(eventInfo.creator));
......@@ -3782,24 +3777,15 @@ function CalendarCreateEventFrame_Update()
--Hide the communitySelector
CalendarCreateEventCommunityDropDown:SetShown(false);
if(CalendarCreateEventTextureName:IsShown()) then
CalendarCreateEventCreatorName:SetPoint("TOPLEFT", CalendarCreateEventTextureName, "BOTTOMLEFT")
else
CalendarCreateEventCreatorName:SetPoint("TOPLEFT", CalendarCreateEventCommunityName, "BOTTOMLEFT")
end
CalendarCreateEventDateLabel:SetPoint("TOPLEFT", CalendarCreateEventCreatorName, "BOTTOMLEFT")
if(eventInfo.calendarType == "COMMUNITY_EVENT" or eventInfo.calendarType == "GUILD_EVENT") then
if eventInfo.calendarType == "COMMUNITY_EVENT" or eventInfo.calendarType == "GUILD_EVENT" then
CalendarCreateEventCommunityName:Show();
CalendarCreateEventCommunityName:SetText(eventInfo.communityName)
CalendarCreateEventTextureName:SetPoint("TOPLEFT", CalendarCreateEventCommunityName, "BOTTOMLEFT")
if(eventInfo.calendarType == "GUILD_EVENT") then
CalendarCreateEventCommunityName:SetTextColor(GREEN_FONT_COLOR:GetRGB())
else
CalendarCreateEventCommunityName:SetTextColor(NORMAL_FONT_COLOR:GetRGB())
end
else
CalendarCreateEventTextureName:SetPoint("TOPLEFT", CalendarCreateEventIcon, "TOPRIGHT", 5, 0)
CalendarCreateEventCommunityName:Hide();
end
......@@ -3871,6 +3857,8 @@ function CalendarCreateEventTexture_Update()
local eventType = CalendarCreateEventFrame.selectedEventType;
local textureIndex = CalendarCreateEventFrame.selectedTextureIndex;
local isGuildOrCommunityEvent = CalendarCreateEventFrame.calendarType == "COMMUNITY_EVENT" or CalendarCreateEventFrame.calendarType == "GUILD_EVENT";
CalendarCreateEventIcon:SetTexture();
local tcoords = CALENDAR_EVENTTYPE_TCOORDS[eventType];
CalendarCreateEventIcon:SetTexCoord(tcoords.left, tcoords.right, tcoords.top, tcoords.bottom);
......@@ -3881,8 +3869,19 @@ function CalendarCreateEventTexture_Update()
CalendarCreateEventTextureName:SetText(GetDungeonNameWithDifficulty(name, difficultyInfo and difficultyInfo.difficultyName or eventTex.difficultyName));
CalendarCreateEventTextureName:Show();
CalendarCreateEventTextureName:SetPoint("TOPLEFT", CalendarCreateEventIcon, "TOPRIGHT", 5, 0)
CalendarCreateEventDateLabel:SetPoint("TOPLEFT", CalendarCreateEventTextureName, "BOTTOMLEFT")
if isGuildOrCommunityEvent then
CalendarCreateEventTextureName:SetPoint("TOPLEFT", CalendarCreateEventCommunityName, "BOTTOMLEFT");
else
CalendarCreateEventTextureName:SetPoint("TOPLEFT", CalendarCreateEventIcon, "TOPRIGHT", 5, 0);
end
if CalendarCreateEventFrame.mode == "edit" then
CalendarCreateEventCreatorName:SetPoint("TOPLEFT", CalendarCreateEventTextureName, "BOTTOMLEFT");
CalendarCreateEventDateLabel:SetPoint("TOPLEFT", CalendarCreateEventCreatorName, "BOTTOMLEFT");
else
CalendarCreateEventDateLabel:SetPoint("TOPLEFT", CalendarCreateEventTextureName, "BOTTOMLEFT");
end
-- set the eventTex texture
if ( eventTex.texture ) then
......@@ -3893,7 +3892,12 @@ function CalendarCreateEventTexture_Update()
else
CalendarCreateEventTextureName:Hide();
CalendarCreateEventDateLabel:SetPoint("TOPLEFT", CalendarCreateEventIcon, "TOPRIGHT", 5, 0)
if CalendarCreateEventFrame.mode == "edit" then
CalendarCreateEventCreatorName:SetPoint("TOPLEFT", CalendarCreateEventIcon, "TOPRIGHT", 5, 0);
CalendarCreateEventDateLabel:SetPoint("TOPLEFT", CalendarCreateEventCreatorName, "BOTTOMLEFT");
else
CalendarCreateEventDateLabel:SetPoint("TOPLEFT", CalendarCreateEventIcon, "TOPRIGHT", 5, 0);
end
CalendarCreateEventIcon:SetTexture(CALENDAR_EVENTTYPE_TEXTURES[eventType]);
end
......
......@@ -277,8 +277,10 @@ function ChannelFrameMixin:QueueVoiceChannelCommand(cmd)
self.queuedVoiceChannelCommands = {};
end
table.insert(self.queuedVoiceChannelCommands, cmd);
C_VoiceChat.Login(); -- May already be in-flight, doesn't matter.
local statusCode = C_VoiceChat.Login();
if statusCode == Enum.VoiceChatStatusCode.OperationPending then
table.insert(self.queuedVoiceChannelCommands, cmd);
end
end
function ChannelFrameMixin:TryExecuteCommand(cmd)
......
......@@ -167,8 +167,8 @@ function WardrobeTransmogFrame_Update()
for i = 1, #WardrobeTransmogFrame.Model.SlotButtons do
WardrobeTransmogFrame_UpdateSlotButton(WardrobeTransmogFrame.Model.SlotButtons[i]);
end
WardrobeTransmogFrame_UpdateWeaponModel("SECONDARYHANDSLOT"); -- WOW8-56808: Should be updated before the main hand slot
WardrobeTransmogFrame_UpdateWeaponModel("MAINHANDSLOT");
WardrobeTransmogFrame_UpdateWeaponModel("SECONDARYHANDSLOT");
WardrobeTransmogFrame_UpdateApplyButton();
WardrobeTransmogFrame.OutfitDropDown:UpdateSaveButton();
......
......@@ -506,7 +506,7 @@ function CommunitiesMemberListMixin:RefreshLayout()
end
function CommunitiesMemberListMixin:OnEvent(event, ...)
if event == "CLUB_MEMBER_ADDED" or event == "CLUB_MEMBER_REMOVED" or event == "CLUB_MEMBER_UPDATED" or event == "VOICE_CHAT_CHANNEL_JOINED" or event == "VOICE_CHAT_CHANNEL_REMOVED" then
if event == "CLUB_MEMBER_ADDED" or event == "CLUB_MEMBER_REMOVED" or event == "CLUB_MEMBER_UPDATED" then
local clubId, memberId = ...;
if clubId == self:GetSelectedClubId() then
self:MarkMemberListDirty();
......@@ -515,6 +515,16 @@ function CommunitiesMemberListMixin:OnEvent(event, ...)
self:RemoveInvitation(memberId);
end
end
elseif event == "VOICE_CHAT_CHANNEL_JOINED" then
local _, _, channelType, clubId, streamId = ...;
if channelType == Enum.ChatChannelType.Communities and clubId == self:GetSelectedClubId() and streamId == self:GetSelectedStreamId() then
self:MarkMemberListDirty();
end
elseif event == "VOICE_CHAT_CHANNEL_REMOVED" then
local _, voiceChannelID = ...;
if voiceChannelID == self:GetVoiceChannelID() then
self:MarkMemberListDirty();
end
elseif event == "VOICE_CHAT_CHANNEL_ACTIVATED" or event == "VOICE_CHAT_CHANNEL_DEACTIVATED" then
local voiceChannelID = ...;
if voiceChannelID == self:GetVoiceChannelID() then
......
......@@ -30,23 +30,23 @@ Import("PlaySound");
Import("GetCVar");
Import("LoadURLIndex");
Import("LOCALE_enGB");
Import("TOKEN_REDEEM_LABEL");
Import("TOKEN_REDEEM_GAME_TIME_TITLE");
Import("TOKEN_REDEEM_GAME_TIME_DESCRIPTION");
Import("TOKEN_REDEEM_GAME_TIME_EXPIRATION_FORMAT");
Import("TOKEN_REDEEM_GAME_TIME_RENEWAL_FORMAT");
Import("TOKEN_REDEEM_GAME_TIME_BUTTON_LABEL");
Import("TOKEN_CONFIRMATION_TITLE");
Import("TOKEN_COMPLETE_TITLE");
Import("TOKEN_CREATE_AUCTION_TITLE");
Import("TOKEN_BUYOUT_AUCTION_TITLE");
Import("TOKEN_REDEEM_LABEL");
Import("TOKEN_REDEEM_GAME_TIME_TITLE");
Import("TOKEN_REDEEM_GAME_TIME_DESCRIPTION");
Import("TOKEN_REDEEM_GAME_TIME_EXPIRATION_FORMAT");
Import("TOKEN_REDEEM_GAME_TIME_RENEWAL_FORMAT");
Import("TOKEN_REDEEM_GAME_TIME_BUTTON_LABEL");
Import("TOKEN_CONFIRMATION_TITLE");
Import("TOKEN_COMPLETE_TITLE");
Import("TOKEN_CREATE_AUCTION_TITLE");
Import("TOKEN_BUYOUT_AUCTION_TITLE");
Import("TOKEN_CONFIRM_CREATE_AUCTION");
Import("TOKEN_CONFIRM_CREATE_AUCTION_LINE_2");
Import("TOKEN_CONFIRM_CREATE_AUCTION_LINE_2");
Import("TOKEN_CONFIRM_GAME_TIME_DESCRIPTION");
Import("TOKEN_CONFIRM_GAME_TIME_DESCRIPTION_MINUTES");
Import("TOKEN_CONFIRM_GAME_TIME_EXPIRATION_CONFIRMATION_DESCRIPTION");
Import("TOKEN_CONFIRM_GAME_TIME_RENEWAL_CONFIRMATION_DESCRIPTION");
Import("TOKEN_COMPLETE_GAME_TIME_DESCRIPTION");
Import("TOKEN_CONFIRM_GAME_TIME_EXPIRATION_CONFIRMATION_DESCRIPTION");
Import("TOKEN_CONFIRM_GAME_TIME_RENEWAL_CONFIRMATION_DESCRIPTION");
Import("TOKEN_COMPLETE_GAME_TIME_DESCRIPTION");
Import("TOKEN_BUYOUT_AUCTION_CONFIRMATION_DESCRIPTION");
Import("TOKEN_PRICE_LOCK_EXPIRE");
Import("TOKEN_REDEEM_GAME_TIME_EXPIRATION_FORMAT_MINUTES");
......@@ -237,43 +237,43 @@ local function currencyFormatNZD(dollars, cents)
end
local currencySpecific = {
[CURRENCY_USD] = {
[CURRENCY_USD] = {
["currencyFormat"] = currencyFormatUSD,
},
[CURRENCY_GBP] = {
},
[CURRENCY_GBP] = {
["currencyFormat"] = currencyFormatGBP,
},
[CURRENCY_KRW] = {
[CURRENCY_KRW] = {
["currencyFormat"] = currencyFormatKRWLong,
},
[CURRENCY_EUR] = {
[CURRENCY_EUR] = {
["currencyFormat"] = currencyFormatEuro,
},
[CURRENCY_RUB] = {
[CURRENCY_RUB] = {
["currencyFormat"] = currencyFormatRUB,
},
[CURRENCY_ARS] = {
[CURRENCY_ARS] = {
["currencyFormat"] = currencyFormatARS,
},
[CURRENCY_CLP] = {
[CURRENCY_CLP] = {
["currencyFormat"] = currencyFormatCLP,
},
[CURRENCY_MXN] = {
[CURRENCY_MXN] = {
["currencyFormat"] = currencyFormatMXN,
},
[CURRENCY_BRL] = {
[CURRENCY_BRL] = {
["currencyFormat"] = currencyFormatBRL,
},
[CURRENCY_AUD] = {
[CURRENCY_AUD] = {
["currencyFormat"] = currencyFormatAUD,
},
[CURRENCY_CPT] = {
[CURRENCY_CPT] = {
["currencyFormat"] = currencyFormatCPTLong,
},
[CURRENCY_TPT] = {
[CURRENCY_TPT] = {
["currencyFormat"] = currencyFormatTPT,
},
[CURRENCY_BETA] ={
[CURRENCY_BETA] ={
["currencyFormat"] = currencyFormatBeta,
},
[CURRENCY_JPY] = {
......@@ -309,8 +309,8 @@ function WowTokenRedemptionFrame_OnLoad(self)
self.portrait:Hide();
self.PortraitFrame:Hide();
self.TopLeftCorner:Show();
self.TopBorder:SetPoint("TOPLEFT", self.topLeftCorner, "TOPRIGHT", 0, 0);
self.LeftBorder:SetPoint("TOPLEFT", self.topLeftCorner, "BOTTOMLEFT", 0, 0);
self.TopBorder:SetPoint("TOPLEFT", self.TopLeftCorner, "TOPRIGHT", 0, 0);
self.LeftBorder:SetPoint("TOPLEFT", self.TopLeftCorner, "BOTTOMLEFT", 0, 0);
self:RegisterEvent("TOKEN_REDEEM_FRAME_SHOW");
self:RegisterEvent("TOKEN_REDEEM_GAME_TIME_UPDATED");
......@@ -564,7 +564,7 @@ function GetSecureMoneyString(money, separateThousands)
silverString = string.format(SILVER_AMOUNT_TEXTURE, silver, 0, 0);
copperString = string.format(COPPER_AMOUNT_TEXTURE, copper, 0, 0);
end
local moneyString = "";
local separator = "";
if ( gold > 0 ) then
......@@ -578,7 +578,7 @@ function GetSecureMoneyString(money, separateThousands)
if ( copper > 0 or moneyString == "" ) then
moneyString = moneyString..separator..copperString;
end
return moneyString;
end
......@@ -652,15 +652,15 @@ dialogs = {
end,
confDescIsFunction = true,
button1 = ACCEPT,
button1OnClick = function(self)
self:Hide();
if (C_WowTokenSecure.GetTokenCount() > 0) then
C_WowTokenSecure.RedeemTokenConfirm(LE_TOKEN_REDEEM_TYPE_GAME_TIME);
WowTokenDialog_SetDialog(WowTokenDialog, "WOW_TOKEN_REDEEM_IN_PROGRESS");
button1OnClick = function(self)
self:Hide();
if (C_WowTokenSecure.GetTokenCount() > 0) then
C_WowTokenSecure.RedeemTokenConfirm(LE_TOKEN_REDEEM_TYPE_GAME_TIME);
WowTokenDialog_SetDialog(WowTokenDialog, "WOW_TOKEN_REDEEM_IN_PROGRESS");
else
Outbound.RedeemFailed(LE_TOKEN_RESULT_ERROR_OTHER);
end
PlaySound(SOUNDKIT.IG_MAINMENU_CLOSE);
PlaySound(SOUNDKIT.IG_MAINMENU_CLOSE);
end,
button2 = CANCEL,
button2OnClick = function(self) self:Hide(); C_WowTokenSecure.CancelRedeem(); PlaySound(SOUNDKIT.IG_MAINMENU_CLOSE); end,
......@@ -700,15 +700,15 @@ dialogs = {
confDescIsFunction = true,
button1 = ACCEPT,
validate = function() return C_WowTokenSecure.IsRedemptionStillValid(); end,
button1OnClick = function(self)
self:Hide();
if (C_WowTokenSecure.GetTokenCount() > 0) then
C_WowTokenSecure.RedeemTokenConfirm(LE_TOKEN_REDEEM_TYPE_BALANCE);
WowTokenDialog_SetDialog(WowTokenDialog, "WOW_TOKEN_REDEEM_IN_PROGRESS");
button1OnClick = function(self)
self:Hide();
if (C_WowTokenSecure.GetTokenCount() > 0) then
C_WowTokenSecure.RedeemTokenConfirm(LE_TOKEN_REDEEM_TYPE_BALANCE);
WowTokenDialog_SetDialog(WowTokenDialog, "WOW_TOKEN_REDEEM_IN_PROGRESS");
else
Outbound.RedeemFailed(LE_TOKEN_RESULT_ERROR_OTHER);
end
PlaySound(SOUNDKIT.IG_MAINMENU_CLOSE);
PlaySound(SOUNDKIT.IG_MAINMENU_CLOSE);
end,
button2 = CANCEL,
button2OnClick = function(self) self:Hide(); C_WowTokenSecure.CancelRedeem(); PlaySound(SOUNDKIT.IG_MAINMENU_CLOSE); end,
......@@ -875,7 +875,7 @@ function WowTokenDialog_SetDialog(self, dialogName)
end
if (dialog.additionalDescription) then
description = description .. dialog.additionalDescription();
end
end
self.Description:SetText(description);
self.Description:SetWidth(min(maxStringWidth, self.Description:GetWidth()));
height = height + spacing + self.Description:GetHeight();
......@@ -896,7 +896,7 @@ function WowTokenDialog_SetDialog(self, dialogName)
end
if (dialog.additionalConfirmationDescription) then
confirmationDesc = confirmationDesc .. dialog.additionalConfirmationDescription();
end
end
self.ConfirmationDesc:SetText(confirmationDesc);
self.ConfirmationDesc:SetWidth(min(maxStringWidth, self.ConfirmationDesc:GetWidth()));
self.ConfirmationDesc:Show();
......@@ -1101,7 +1101,7 @@ function WowTokenDialog_OnEvent(self, event, ...)
dialogKey = "WOW_TOKEN_REDEEM_CONFIRMATION_BALANCE";
confirmationDescFunc = GetBalanceRedemptionString;
end
if (not dialogKey or currentDialogName ~= dialogKey) then
return;
end
......
......@@ -3472,11 +3472,14 @@ function ChatFrame_MessageEventHandler(self, event, ...)
if ( isCommunityType ) then
local isBattleNetCommunity = bnetIDAccount ~= nil and bnetIDAccount ~= 0;
local messageInfo, clubId, streamId, clubType = C_Club.GetInfoFromLastCommunityChatLine();
if ( isBattleNetCommunity ) then
playerLink = GetBNPlayerCommunityLink(playerName, playerLinkDisplayText, bnetIDAccount, clubId, streamId, messageInfo.messageId.epoch, messageInfo.messageId.position);
if (messageInfo ~= nil) then
if ( isBattleNetCommunity ) then
playerLink = GetBNPlayerCommunityLink(playerName, playerLinkDisplayText, bnetIDAccount, clubId, streamId, messageInfo.messageId.epoch, messageInfo.messageId.position);
else
playerLink = GetPlayerCommunityLink(playerName, playerLinkDisplayText, clubId, streamId, messageInfo.messageId.epoch, messageInfo.messageId.position);
end
else
playerLink = GetPlayerCommunityLink(playerName, playerLinkDisplayText, clubId, streamId, messageInfo.messageId.epoch, messageInfo.messageId.position);
playerLink = playerLinkDisplayText;
end
else
if ( type == "BN_WHISPER" or type == "BN_WHISPER_INFORM" ) then
......
......@@ -105,11 +105,10 @@ function GameTooltip_UnitColor(unit)
return r, g, b;
end
function GameTooltip_SetDefaultAnchor(tooltip, parent, updateTooltipFunc)
function GameTooltip_SetDefaultAnchor(tooltip, parent)
tooltip:SetOwner(parent, "ANCHOR_NONE");
tooltip:SetPoint("BOTTOMRIGHT", "UIParent", "BOTTOMRIGHT", -CONTAINER_OFFSET_X - 13, CONTAINER_OFFSET_Y);
tooltip.default = 1;
tooltip.UpdateTooltip = updateTooltipFunc;
end
function GameTooltip_SetBasicTooltip(tooltip, text, x, y, wrap)
......@@ -452,7 +451,6 @@ function GameTooltip_OnHide(self)
self.needsReset = true;
GameTooltip_SetBackdropStyle(self, self.IsEmbedded and GAME_TOOLTIP_BACKDROP_STYLE_EMBEDDED or GAME_TOOLTIP_BACKDROP_STYLE_DEFAULT);
self.default = nil;
self.UpdateTooltip = nil;
self.overrideComparisonAnchorFrame = nil;
self.overrideComparisonAnchorSide = nil;
GameTooltip_ClearMoney(self);
......
......@@ -1292,14 +1292,14 @@ function PaperDollFrame_SetItemLevel(statFrame, unit)
local avgItemLevel, avgItemLevelEquipped = GetAverageItemLevel();
local minItemLevel = C_PaperDollInfo.GetMinItemLevel();
local displayItemLevel = math.max(minItemLevel or 0, avgItemLevel);
local displayItemLevel = math.max(minItemLevel or 0, avgItemLevelEquipped);
displayItemLevel = floor(displayItemLevel);
avgItemLevelEquipped = floor(avgItemLevelEquipped);
avgItemLevel = floor(avgItemLevel);
PaperDollFrame_SetLabelAndText(statFrame, STAT_AVERAGE_ITEM_LEVEL, displayItemLevel, false, displayItemLevel);
statFrame.tooltip = HIGHLIGHT_FONT_COLOR_CODE..format(PAPERDOLLFRAME_TOOLTIP_FORMAT, STAT_AVERAGE_ITEM_LEVEL).." "..displayItemLevel;
if ( displayItemLevel ~= avgItemLevelEquipped ) then
statFrame.tooltip = HIGHLIGHT_FONT_COLOR_CODE..format(PAPERDOLLFRAME_TOOLTIP_FORMAT, STAT_AVERAGE_ITEM_LEVEL).." "..avgItemLevel;
if ( displayItemLevel ~= avgItemLevel ) then
statFrame.tooltip = statFrame.tooltip .. " " .. format(STAT_AVERAGE_ITEM_LEVEL_EQUIPPED, avgItemLevelEquipped);
end
statFrame.tooltip = statFrame.tooltip .. FONT_COLOR_CODE_CLOSE;
......
......@@ -384,13 +384,15 @@ end
function ReputationParagonWatchBar_OnEnter(self)
if C_Reputation.IsFactionParagon(self.factionID) then
GameTooltip_SetDefaultAnchor(EmbeddedItemTooltip, UIParent, ReputationParagonFrame_SetupParagonTooltip);
self.UpdateTooltip = ReputationParagonFrame_SetupParagonTooltip;
GameTooltip_SetDefaultAnchor(EmbeddedItemTooltip, self);
ReputationParagonFrame_SetupParagonTooltip(self);
end
end
function ReputationParagonWatchBar_OnLeave(self)
EmbeddedItemTooltip:Hide();
self.UpdateTooltip = nil;
end
function ReputationParagonFrame_OnEnter(self)
......
......@@ -1490,12 +1490,6 @@ StaticPopupDialogs["RESURRECT_NO_TIMER"] = {
end
SetupLockOnDeclineButtonAndEscape(self, declineTimeLeft);
end,
OnHide = function(self)
if (self.ticker) then
self.ticker:Cancel();
end
self.ticker = nil;
end,
OnAccept = function(self)
AcceptResurrect();
end,
......
......@@ -1232,11 +1232,6 @@ VideoData["Advanced_StereoEnabled"]={
tooltip = OPTION_TOOLTIP_ENABLE_STEREO_VIDEO,
}
VideoData["Advanced_ShowHDModels"]={
name = SHOW_HD_MODELS_TEXT;
tooltip = OPTION_TOOLTIP_SHOW_HD_MODELS,
}
VideoData["Advanced_MultisampleAlphaTest"]={
name = MULTISAMPLE_ALPHA_TEST,
description = OPTION_TOOLTIP_MULTISAMPLE_ALPHA_TEST,
......
......@@ -917,7 +917,6 @@ function Graphics_OnLoad (self)
end
AdvancedPanelOptions = {
hdPlayerModels = { text = "SHOW_HD_MODELS_TEXT" },
ClipCursor = { text = "LOCK_CURSOR_TEXT" },
}
......
......@@ -1714,20 +1714,6 @@
</OnValueChanged>
</Scripts>
</Slider>
<CheckButton name="$parentShowHDModels" inherits="VideoOptionsSmallCheckButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentGammaSlider" relativePoint="BOTTOMLEFT" x="-25" y="-20"/>
</Anchors>
<Scripts>
<OnLoad>
self.type = CONTROLTYPE_CHECKBOX;
self.cvar = "hdPlayerModels";
self.name = SHOW_HD_MODELS_TEXT;
self.tooltip = OPTION_TOOLTIP_SHOW_HD_MODELS;
BlizzardOptionsPanel_RegisterControl(self, self:GetParent());
</OnLoad>
</Scripts>
</CheckButton>
</Frames>
<!-- stereo -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment