4jcraft/Minecraft.Client
MatthewBeshay 6000900285 Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2
# Conflicts:
#	Minecraft.Client/Level/ServerLevel.cpp
#	Minecraft.Client/Minecraft.cpp
#	Minecraft.Client/MinecraftServer.cpp
#	Minecraft.Client/Network/ClientConnection.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Death.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_PauseMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp
#	Minecraft.Client/Platform/Durango/Durango_Minecraft.cpp
#	Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp
#	Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/lex/lexer/lexertl/lexer.hpp
#	Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
#	Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp
#	Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/stdafx.h
#	Minecraft.Client/Player/LocalPlayer.cpp
#	Minecraft.Client/Rendering/Chunk.cpp
#	Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp
#	Minecraft.Client/Rendering/GameRenderer.cpp
#	Minecraft.Client/Rendering/LevelRenderer.cpp
#	Minecraft.Client/Textures/BufferedImage.cpp
#	Minecraft.Client/UI/Screens/AchievementScreen.cpp
#	Minecraft.Client/UI/Screens/ContainerScreen.cpp
#	Minecraft.Client/UI/Screens/TrapScreen.cpp
#	Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
#	Minecraft.World/IO/Files/File.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/Util/C4JThread.cpp
2026-03-30 15:21:08 +11:00
..
Commands chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
GameState Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Input chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Level Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Network Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Platform Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Player Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Rendering Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Textures Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
UI Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Utils Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
ClientConstants.cpp Merge branch 'dev' into feat/restore-java-gui 2026-03-16 16:04:30 +03:00
ClientConstants.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
meson.build Fixed broken LevelRenderer.cpp and removed merge garbage 2026-03-29 20:55:59 -05:00
Minecraft.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Minecraft.h cleanup: flatten dead branches in common app and ui code 2026-03-26 20:18:29 +11:00
MinecraftServer.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
MinecraftServer.h cleanup: flatten dead branches in common app and ui code 2026-03-26 20:18:29 +11:00
Network Implementation Notes.md Added Doxygen + GitHub Pages 2026-03-13 23:00:35 -04:00
ReadMe.txt

========================================================================
    Xbox 360 APPLICATION : Minecraft.Client Project Overview
========================================================================

AppWizard has created this Minecraft.Client application for you.  

This file contains a summary of what you will find in each of the files that
make up your Minecraft.Client application.

Minecraft.Client.vcxproj
    This is the main project file for VC++ projects generated using an Application Wizard. 
    It contains information about the version of Visual C++ that generated the file, and 
    information about the platforms, configurations, and project features selected with the
    Application Wizard.

Minecraft.Client.cpp
    This is the main application source file.



/////////////////////////////////////////////////////////////////////////////
Other notes:

AppWizard uses "TODO:" comments to indicate parts of the source code you
should add to or customize.

/////////////////////////////////////////////////////////////////////////////