1.14.4 (51056)

Gethe · Aug 23, 2023 · c2c505c · c2c505c
1 parent 843bd23
commit c2c505c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/Interface/FrameXML/SettingDefinitions/CombatOverrides.lua b/Interface/FrameXML/SettingDefinitions/CombatOverrides.lua
@@ -105,9 +105,11 @@ function CombatOverrides.AdjustCombatSettings(category)
 	Settings.SetupCVarCheckBox(category, "floatingCombatTextCombatHealing", SHOW_COMBAT_HEALING_TEXT, OPTION_TOOLTIP_SHOW_COMBAT_HEALING);
 	Settings.SetOnValueChangedCallback("floatingCombatTextCombatHealing", UpdateFloatingCombatTextSafe);
 
-	-- Auto Attack/Auto Shot
-	Settings.SetupCVarCheckBox(category, "autoRangedCombat", AUTO_RANGED_COMBAT_TEXT, OPTION_TOOLTIP_AUTO_RANGED_COMBAT);
-	Settings.SetOnValueChangedCallback("autoRangedCombat", UpdateFloatingCombatTextSafe);
+	if ClassicExpansionAtLeast(LE_EXPANSION_BURNING_CRUSADE) then
+		-- Auto Attack/Auto Shot
+		Settings.SetupCVarCheckBox(category, "autoRangedCombat", AUTO_RANGED_COMBAT_TEXT, OPTION_TOOLTIP_AUTO_RANGED_COMBAT);
+		Settings.SetOnValueChangedCallback("autoRangedCombat", UpdateFloatingCombatTextSafe);
+	end
 
 end
 

diff --git a/Interface/FrameXML/UnitPopupUtils.lua b/Interface/FrameXML/UnitPopupUtils.lua
@@ -58,7 +58,11 @@ end
 
 function UnitPopupSharedUtil:GetFullPlayerName()
 	local dropdownFrame = UnitPopupSharedUtil.GetCurrentDropdownMenu();
-	return dropdownFrame.name;
+	local fullName = dropdownFrame.name;
+	if ( dropdownFrame.server and ((not dropdownFrame.unit and GetNormalizedRealmName() ~= dropdownFrame.server) or (dropdownFrame.unit and UnitRealmRelationship(dropdownFrame.unit) ~= LE_REALM_RELATION_SAME)) ) then
+		fullName = dropdownFrame.name.."-"..dropdownFrame.server;
+	end
+	return fullName; 
 end		
 
 function UnitPopupSharedUtil:HasLFGRestrictions()

diff --git a/Interface_Vanilla/FrameXML/UnitPopupButtons.lua b/Interface_Vanilla/FrameXML/UnitPopupButtons.lua
@@ -62,10 +62,7 @@ function UnitPopupInviteButtonMixin:CanShow()
 end
 
 function UnitPopupDungeonDifficultyButtonMixin:CanShow()
-	if ( UnitLevel("player") < 65 and GetDungeonDifficultyID() == 1 ) then
-		return false; 
-	end
-	return true; 
+	return false;
 end
 
 function UnitPopupAchievementButtonMixin:CanShow()

diff --git a/Interface_Vanilla/GlueXML/CharacterSelect.xml b/Interface_Vanilla/GlueXML/CharacterSelect.xml
@@ -96,9 +96,9 @@
 					</Layer>
 					<Layer level="OVERLAY">
 						<Texture parentKey="graveIcon" atlas="poi-graveyard-neutral" hidden="true">
-							<Size x="24" y="32"/>
+							<Size x="12" y="16"/>
 							<Anchors>
-								<Anchor point="LEFT" x="-46" y="-12" relativeTo="$parentName"/>
+								<Anchor point="LEFT" relativePoint="RIGHT" relativeTo="$parentName"/>
 							</Anchors>
 						</Texture>
 					</Layer>