phaneron/smartcmd-MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-05-27 15:43:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into dec-2014

Browse source 
# Conflicts:
#	Minecraft.Client/LocalPlayer.cpp
This commit is contained in:
Loki Rautio 2026-03-01 12:05:30 -06:00
commit e4ed56eae8
7 changed files with 57 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
View file

@ -359,7 +359,6 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
m_eAction=eAction_RunUnlockOrDLC;
signInReturnedFunc = &UIScene_MainMenu::UnlockFullGame_SignInReturned;
break;
#if defined _XBOX
case eControl_Exit:
if( ProfileManager.IsFullVersion() )
{
@ -370,13 +369,14 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
}
else
{
#ifdef _XBOX
#ifdef _XBOX_ONE
ui.ShowPlayerDisplayname(true);
#endif
ui.NavigateToScene(primaryPad,eUIScene_TrialExitUpsell);
#endif
}
break;
#endif
#ifdef _DURANGO
case eControl_XboxHelp: