LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-29 10:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into issue/51-phase-1-portable-win32-cleanup

Browse Source 
# Conflicts:
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Rendering/Tesselator.cpp
This commit is contained in:
notmatthewbeshay
2026-03-13 15:16:43 +11:00
parent e3d910c6a1 807af92321
commit bcc765f3e7
117 changed files with 588 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Minecraft.Client/Platform/Common/UI/UIComponent_TutorialPopup.cpp
View File

@@ -23,6 +23,9 @@ UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void *initData, U
m_bSplitscreenGamertagVisible = false;
m_labelDescription.init(L"");
// 4jcraft added
m_tutorial = NULL;
}
std::wstring UIComponent_TutorialPopup::getMoviePath()
@@ -69,6 +72,9 @@ void UIComponent_TutorialPopup::SetTutorialDescription(TutorialPopupInfo *info)
{
m_interactScene = info->interactScene;
// 4jcraft added
m_tutorial = info->tutorial;
std::wstring parsed = _SetIcon(info->icon, info->iAuxVal, info->isFoil, info->desc);
parsed = _SetImage( parsed );
parsed = ParseDescription(m_iPad, parsed);