Skip to content

Commit

Permalink
3.4.0 (45435)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gethe committed Sep 2, 2022
1 parent 55c26c4 commit 2d9e615
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 220 deletions.

This file was deleted.

This file was deleted.

22 changes: 6 additions & 16 deletions Interface/AddOns/Blizzard_Calendar/Blizzard_Calendar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2136,23 +2136,13 @@ function CalendarDayContextMenu_Initialize(self, flags, dayButton, eventButton)
if ( showDay ) then
UIMenu_AddButton(self, CALENDAR_CREATE_EVENT, nil, CalendarDayContextMenu_CreateEvent);

-- add guild selections if the player has a guild
if ( IsInGuild() ) then
UIMenu_AddButton(self, CALENDAR_CREATE_GUILD_EVENT, nil, CalendarDayContextMenu_CreateGuildEvent);

if ( CanEditGuildEvent() ) then
UIMenu_AddButton(self, CALENDAR_CREATE_GUILD_ANNOUNCEMENT, nil, CalendarDayContextMenu_CreateGuildAnnouncement);
end
end

-- add community selections if the player is in a character community
local clubs = C_Club.GetSubscribedClubs();
for i, clubInfo in ipairs(clubs) do
if clubInfo.clubType == Enum.ClubType.Character then
UIMenu_AddButton(self, CALENDAR_CREATE_COMMUNITY_EVENT, nil, CalendarDayContextMenu_CreateCommunityEvent);
break;
end
end
--DISABLING THIS FOR NOW UNTIL WE FIX CLASS-17077
-- add guild selections if the player has a guild
--if ( CanEditGuildEvent() ) then
--UIMenu_AddButton(self, CALENDAR_CREATE_GUILD_EVENT, nil, CalendarDayContextMenu_CreateGuildEvent);
--UIMenu_AddButton(self, CALENDAR_CREATE_GUILD_ANNOUNCEMENT, nil, CalendarDayContextMenu_CreateGuildAnnouncement);
--end

needSpacer = true;
end
Expand Down
6 changes: 3 additions & 3 deletions Interface/FrameXML/ClassTrainerFrameTemplates.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
</Anchor>
</Anchors>
</ButtonText>
<NormalFont style="GameFontNormal"/>
<HighlightFont style="GameFontHighlight"/>
<DisabledFont style="GameFontDisable"/>
<NormalFont style="GameFontNormalLeft"/>
<HighlightFont style="GameFontHighlightLeft"/>
<DisabledFont style="GameFontDisableLeft"/>
</Button>
<ScrollFrame name="ClassTrainerDetailScrollFrameTemplate" inherits="UIPanelScrollFrameTemplate" virtual="true">
<Layers>
Expand Down
7 changes: 6 additions & 1 deletion Interface/FrameXML/FriendsFrame_Shared.lua
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ local INVITE_RESTRICTION_WOW_PROJECT_ID = 6;
local INVITE_RESTRICTION_WOW_PROJECT_MAINLINE = 7;
local INVITE_RESTRICTION_WOW_PROJECT_CLASSIC = 8;
local INVITE_RESTRICTION_WOW_PROJECT_BCC = 9;
local INVITE_RESTRICTION_NONE = 10;
local INVITE_RESTRICTION_WOW_PROJECT_WRATH = 10;
local INVITE_RESTRICTION_NONE = 11;

local FriendListEntries = { };
local playerRealmID;
Expand Down Expand Up @@ -2143,6 +2144,8 @@ function FriendsFrame_GetInviteRestriction(index)
restriction = max(INVITE_RESTRICTION_WOW_PROJECT_CLASSIC, restriction);
elseif(wowProjectID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC) then
restriction = max(INVITE_RESTRICTION_WOW_PROJECT_BCC, restriction);
elseif(wowProjectID == WOW_PROJECT_WRATH_CLASSIC) then
restriction = max(INVITE_RESTRICTION_WOW_PROJECT_WRATH, restriction);
elseif(wowProjectID == WOW_PROJECT_MAINLINE) then
restriction = max(INVITE_RESTRICTION_WOW_PROJECT_MAINLINE, restriction);
else
Expand Down Expand Up @@ -2185,6 +2188,8 @@ function FriendsFrame_GetInviteRestrictionText(restriction)
return ERR_TRAVEL_PASS_WRONG_PROJECT_CLASSIC_OVERRIDE;
elseif ( restriction == INVITE_RESTRICTION_WOW_PROJECT_BCC ) then
return ERR_TRAVEL_PASS_WRONG_PROJECT; -- ERR_TRAVEL_PASS_WRONG_PROJECT_BCC_OVERRIDE
elseif ( restriction == INVITE_RESTRICTION_WOW_PROJECT_WRATH ) then
return ERR_TRAVEL_PASS_WRONG_PROJECT; -- ERR_TRAVEL_PASS_WRONG_PROJECT_WRATH_OVERRIDE
else
return "";
end
Expand Down
6 changes: 4 additions & 2 deletions Interface/FrameXML/UnitFrame.lua
Original file line number Diff line number Diff line change
Expand Up @@ -556,14 +556,16 @@ function UnitFrameHealthBar_Update(statusbar, unit)
if ( unit == statusbar.unit ) then
local maxValue = UnitHealthMax(unit);

statusbar.showPercentage = false;
if (GetClassicExpansionLevel() <= LE_EXPANSION_BURNING_CRUSADE) then
statusbar.showPercentage = false;
end

-- Safety check to make sure we never get an empty bar.
statusbar.forceHideText = false;
if ( maxValue == 0 ) then
maxValue = 1;
statusbar.forceHideText = true;
elseif ( GetClassicExpansionLevel() >= LE_EXPANSION_BURNING_CRUSADE and (maxValue == 100 or not ShouldKnowUnitHealth(unit)) ) then
elseif ( GetClassicExpansionLevel() <= LE_EXPANSION_BURNING_CRUSADE and (maxValue == 100 or not ShouldKnowUnitHealth(unit)) ) then
--This should be displayed as percentage.
statusbar.showPercentage = true;
end
Expand Down
1 change: 1 addition & 0 deletions Interface_TBC/FrameXML/Constants.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1048,4 +1048,5 @@ KEY_ABBR_PADSOCIAL_SHP = "Sh";
WOW_PROJECT_MAINLINE = 1;
WOW_PROJECT_CLASSIC = 2;
WOW_PROJECT_BURNING_CRUSADE_CLASSIC = 5;
WOW_PROJECT_WRATH_CLASSIC = 11;
WOW_PROJECT_ID = WOW_PROJECT_BURNING_CRUSADE_CLASSIC;
1 change: 1 addition & 0 deletions Interface_Vanilla/FrameXML/Constants.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1045,4 +1045,5 @@ KEY_ABBR_PADSOCIAL_SHP = "Sh";
WOW_PROJECT_MAINLINE = 1;
WOW_PROJECT_CLASSIC = 2;
WOW_PROJECT_BURNING_CRUSADE_CLASSIC = 5;
WOW_PROJECT_WRATH_CLASSIC = 11;
WOW_PROJECT_ID = WOW_PROJECT_CLASSIC;
7 changes: 5 additions & 2 deletions Interface_Wrath/FrameXML/AlternatePowerBar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,11 @@ function AlternatePowerBar_OnEvent(self, event, arg1)
AlternatePowerBar_UpdateMaxValues(self);
AlternatePowerBar_UpdateValue(self);
AlternatePowerBar_UpdatePowerType(self);
elseif( (event == "UNIT_MAXMANA") and (arg1 == parent.unit) ) then
AlternatePowerBar_UpdateMaxValues(self);
elseif( (event == "UNIT_MAXPOWER") ) then
local parent = self:GetParent();
if arg1 == parent.unit then
AlternatePowerBar_UpdateMaxValues(self);
end
elseif ( self:IsShown() ) then
if ( (event == "UNIT_MANA") and (arg1 == parent.unit) ) then
AlternatePowerBar_UpdateValue(self);
Expand Down
3 changes: 2 additions & 1 deletion Interface_Wrath/FrameXML/Constants.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1102,4 +1102,5 @@ KEY_ABBR_PADSOCIAL_SHP = "Sh";
WOW_PROJECT_MAINLINE = 1;
WOW_PROJECT_CLASSIC = 2;
WOW_PROJECT_BURNING_CRUSADE_CLASSIC = 5;
WOW_PROJECT_ID = WOW_PROJECT_BURNING_CRUSADE_CLASSIC;
WOW_PROJECT_WRATH_CLASSIC = 11;
WOW_PROJECT_ID = WOW_PROJECT_WRATH_CLASSIC;
9 changes: 8 additions & 1 deletion Interface_Wrath/FrameXML/Minimap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,16 @@
GameTooltip:SetText(self.tooltip);
end
</OnEnter>
<OnUpdate>
if ( GameTooltip:IsOwned(self) ) then
BattlefieldFrame_UpdateStatus(1);
if (self.tooltip) then
GameTooltip:SetText(self.tooltip);
end
end
</OnUpdate>
<OnLeave>
GameTooltip:Hide();
self:SetScript("OnUpdate", nil);
</OnLeave>
<OnClick>
-- Hide tooltip
Expand Down

0 comments on commit 2d9e615

Please sign in to comment.