Merge branch 'main' into main

.github/pull_request_template.md

@@ -1,4 +1,4 @@
-# Pull Request Template
+# Pull Request
 
 ## Description
 Briefly describe the changes this PR introduces.

.gitignore

@@ -416,10 +416,14 @@ Minecraft.Client/Windows64/GameHDD/
 # Intermediate build files (per-project)
 Minecraft.Client/x64/
 Minecraft.Client/Debug/
+Minecraft.Client/x64_Debug/
 Minecraft.Client/Release/
+Minecraft.Client/x64_Release/
+
 Minecraft.World/x64/
-Minecraft.World/x64_Debug/
 Minecraft.World/Debug/
+Minecraft.World/x64_Debug/
+Minecraft.World/x64_Release/
 Minecraft.World/Release/
 Minecraft.World/x64_Release/Minecraft.World.vcxproj.FileListAbsolute.txt
 Minecraft.World/x64_Release/Minecraft.World.lib

Minecraft.Client/Common/Audio/SoundEngine.cpp

@@ -56,7 +56,7 @@ void SoundEngine::playMusicTick() {};
 #else
 
 #ifdef _WINDOWS64
-char SoundEngine::m_szSoundPath[]={"Durango\\Sound\\"};
+char SoundEngine::m_szSoundPath[]={"Windows64Media\\Sound\\"};
 char SoundEngine::m_szMusicPath[]={"music\\"};
 char SoundEngine::m_szRedistName[]={"redist64"};
 #elif defined _DURANGO

Minecraft.Client/Common/UI/UIController.cpp

@@ -935,6 +935,8 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 			case ACTION_MENU_CANCEL:    kbDown = KMInput.IsKeyDown(VK_ESCAPE); kbPressed = KMInput.IsKeyPressed(VK_ESCAPE); kbReleased = KMInput.IsKeyReleased(VK_ESCAPE); break;
 			case ACTION_MENU_B:         kbDown = KMInput.IsKeyDown(VK_ESCAPE); kbPressed = KMInput.IsKeyPressed(VK_ESCAPE); kbReleased = KMInput.IsKeyReleased(VK_ESCAPE); break;
 			case ACTION_MENU_PAUSEMENU: kbDown = KMInput.IsKeyDown(VK_ESCAPE); kbPressed = KMInput.IsKeyPressed(VK_ESCAPE); kbReleased = KMInput.IsKeyReleased(VK_ESCAPE); break;
+			case ACTION_MENU_LEFT_SCROLL: kbDown = KMInput.IsKeyDown('Q'); kbPressed = KMInput.IsKeyPressed('Q'); kbReleased = KMInput.IsKeyReleased('Q'); break;
+			case ACTION_MENU_RIGHT_SCROLL: kbDown = KMInput.IsKeyDown('E'); kbPressed = KMInput.IsKeyPressed('E'); kbReleased = KMInput.IsKeyReleased('E'); break;
 		}
 		pressed = pressed || kbPressed;
 		released = released || kbReleased;

Minecraft.Client/Minecraft.Client.vcxproj

@@ -1473,14 +1473,25 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <SuppressStartupBanner>false</SuppressStartupBanner>
     </Link>
     <PostBuildEvent>
-      <Message>Copying sound assets to output directory</Message>
+      <Message>Copying game assets to output directory</Message>
-      <Command>xcopy /q /y /i /s /e "$(ProjectDir)Durango\Sound" "$(OutDir)Durango\Sound"
+      <Command>mkdir "$(OutDir)music" 2&gt;nul
-xcopy /q /y /i /s /e "$(ProjectDir)music" "$(OutDir)music"
+mkdir "$(OutDir)Windows64\GameHDD" 2&gt;nul
-xcopy /q /y /i /s /e "$(ProjectDir)Windows64\GameHDD" "$(OutDir)Windows64\GameHDD"
+mkdir "$(OutDir)Common\Media" 2&gt;nul
-xcopy /q /y /i /s /e "$(ProjectDir)Common\Media" "$(OutDir)Common\Media"
+mkdir "$(OutDir)Common\res" 2&gt;nul
-xcopy /q /y /i /s /e "$(ProjectDir)Common\res" "$(OutDir)Common\res"
+mkdir "$(OutDir)Common\Trial" 2&gt;nul
-xcopy /q /y /i /s /e "$(ProjectDir)Common\Trial" "$(OutDir)Common\Trial"
+mkdir "$(OutDir)Common\Tutorial" 2&gt;nul
-xcopy /q /y /i /s /e "$(ProjectDir)Common\Tutorial" "$(OutDir)Common\Tutorial"</Command>
+mkdir "$(OutDir)Windows64Media" 2&gt;nul
+
+xcopy /q /y /i /s /e "$(ProjectDir)music" "$(OutDir)music" || exit /b 0
+xcopy /q /y /i /s /e "$(ProjectDir)Windows64\GameHDD" "$(OutDir)Windows64\GameHDD" || exit /b 0
+xcopy /q /y /i /s /e "$(ProjectDir)Common\Media" "$(OutDir)Common\Media" || exit /b 0
+xcopy /q /y /i /s /e "$(ProjectDir)Common\res" "$(OutDir)Common\res" || exit /b 0
+xcopy /q /y /i /s /e "$(ProjectDir)Common\Trial" "$(OutDir)Common\Trial" || exit /b 0
+xcopy /q /y /i /s /e "$(ProjectDir)Common\Tutorial" "$(OutDir)Common\Tutorial" || exit /b 0
+xcopy /q /y /i /s /e "$(ProjectDir)DurangoMedia" "$(OutDir)Windows64Media" || exit /b 0
+xcopy /q /y /i /s /e "$(ProjectDir)Windows64Media" "$(OutDir)Windows64Media" || exit /b 0
+
+exit /b 0</Command>
     </PostBuildEvent>
     <ImageXex>
       <ConfigurationFile>$(ProjectDir)xbox\xex-dev.xml</ConfigurationFile>

Minecraft.Client/Minecraft.Client.vcxproj.filters

@@ -6014,9 +6014,6 @@
       <Filter>PS3\SPUObjFiles\ContentPackage</Filter>
     </Object>
   </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Durango\Autogenerated.appxmanifest" />
-  </ItemGroup>
   <ItemGroup>
     <Xml Include="Durango\manifest.xml" />
   </ItemGroup>

Minecraft.Client/Windows64/Windows64_UIController.cpp

@@ -50,7 +50,7 @@ void ConsoleUIController::init(ID3D11Device *dev, ID3D11DeviceContext *ctx, ID3D
 	really big so if you substitute a different file it should work. */
 	gdraw_D3D11_SetResourceLimits(GDRAW_D3D11_RESOURCE_vertexbuffer, 5000,  16 * 1024 * 1024);
 	gdraw_D3D11_SetResourceLimits(GDRAW_D3D11_RESOURCE_texture     , 5000, 128 * 1024 * 1024);
-	gdraw_D3D11_SetResourceLimits(GDRAW_D3D11_RESOURCE_rendertarget,   10,  32 * 1024 * 1024);
+	gdraw_D3D11_SetResourceLimits(GDRAW_D3D11_RESOURCE_rendertarget,   10,  64 * 1024 * 1024);
 
 	/* GDraw is all set, so we'll point Iggy at it. */
 	IggySetGDraw(gdraw_funcs);

README.md

@@ -22,13 +22,14 @@ This project contains the source code of Minecraft Legacy Console Edition v1.3.0
 - **Movement**: `W` `A` `S` `D`
 - **Jump / Fly (Up)**: `Space`
 - **Sneak / Fly (Down)**: `Shift` (Hold)
-- **Sprint**: `Ctrl` (Hold)
+- **Sprint**: `Ctrl` (Hold) or Double-tap `W`
 - **Inventory**: `E`
 - **Drop Item**: `Q`
 - **Crafting**: `C`
 - **Toggle View (FPS/TPS)**: `F5`
 - **Fullscreen**: `F11`
 - **Pause Menu**: `Esc`
+- **Toggle Mouse Capture**: `Left Alt` (for debugging)
 - **Attack / Destroy**: `Left Click`
 - **Use / Place**: `Right Click`
 - **Select Item**: `Mouse Wheel` or keys `1` to `9`