alex/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into dec-2014

Browse Source 
# Conflicts:
#	Minecraft.Client/ClientConnection.cpp
#	Minecraft.Client/Common/UI/UIController.cpp
This commit is contained in:
Loki Rautio
2026-03-01 11:01:24 -06:00
parent 8fd3ac6e37 b5111232aa
commit f85674da9b
33 changed files with 1614 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.Client/Common/Consoles_App.cpp
View File

@@ -6567,7 +6567,7 @@ wstring CMinecraftApp::GetActionReplacement(int iPad, unsigned char ucAction)
int size = 30;
#elif defined _WIN64
int size = 45;
if(ui.getScreenWidth() < 1920) size = 30;
if(ui.getScreenHeight() < 1080) size = 30;
#else
int size = 45;
#endif
@@ -6696,7 +6696,7 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
int size = 30;
#elif defined _WIN64
int size = 45;
if(ui.getScreenWidth() < 1920) size = 30;
if(ui.getScreenHeight() < 1080) size = 30;
#else
int size = 45;
#endif
@@ -6727,7 +6727,7 @@ wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon)
int size = 22;
#elif defined _WIN64
int size = 33;
if(ui.getScreenWidth() < 1920) size = 22;
if(ui.getScreenHeight() < 1080) size = 22;
#else
int size = 33;
#endif
@@ -9481,7 +9481,11 @@ bool CMinecraftApp::IsLocalMultiplayerAvailable()
if( InputManager.IsPadConnected(i) || ProfileManager.IsSignedIn(i) ) ++connectedControllers;
}
#ifdef _WINDOWS64
bool available = connectedControllers > 1;
#else
bool available = RenderManager.IsHiDef() && connectedControllers > 1;
#endif
#ifdef __ORBIS__
// Check for remote play