diff options
Diffstat (limited to 'Minecraft.Client/Common')
11 files changed, 44 insertions, 563 deletions
diff --git a/Minecraft.Client/Common/BuildVer.h b/Minecraft.Client/Common/BuildVer.h deleted file mode 100644 index eaa77d26..00000000 --- a/Minecraft.Client/Common/BuildVer.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#define VER_PRODUCTBUILD 560 -#define VER_PRODUCTVERSION_STR_W L"DEV (unknown version)" -#define VER_FILEVERSION_STR_W VER_PRODUCTVERSION_STR_W -#define VER_BRANCHVERSION_STR_W L"UNKNOWN BRANCH" -#define VER_NETWORK VER_PRODUCTBUILD diff --git a/Minecraft.Client/Common/CommonMedia.sln b/Minecraft.Client/Common/CommonMedia.sln deleted file mode 100644 index 9f83988e..00000000 --- a/Minecraft.Client/Common/CommonMedia.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonMedia", "CommonMedia.vcxproj", "{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}" -EndProject -Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 2 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark - SccProjectUniqueName0 = CommonMedia.vcxproj - SccLocalPath0 = . - SccLocalPath1 = . - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Debug|Win32.ActiveCfg = Debug|Win32 - {21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Debug|Win32.Build.0 = Debug|Win32 - {21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Release|Win32.ActiveCfg = Release|Win32 - {21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Minecraft.Client/Common/CommonMedia.vcxproj b/Minecraft.Client/Common/CommonMedia.vcxproj deleted file mode 100644 index 5a472e0b..00000000 --- a/Minecraft.Client/Common/CommonMedia.vcxproj +++ /dev/null @@ -1,115 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <None Include="Media\ChestMenu720.swf" /> - <None Include="Media\CreateWorldMenu720.swf" /> - <None Include="Media\CreativeMenu720.swf" /> - <None Include="Media\DebugMenu720.swf" /> - <None Include="Media\FullscreenProgress720.swf" /> - <None Include="Media\HUD720.swf" /> - <None Include="Media\InventoryMenu720.swf" /> - <None Include="Media\languages.loc" /> - <None Include="Media\LaunchMoreOptionsMenu720.swf" /> - <None Include="Media\LoadMenu720.swf" /> - <None Include="Media\LoadOrJoinMenu720.swf" /> - <None Include="Media\MainMenu720.swf" /> - <None Include="Media\media.arc" /> - <None Include="Media\Panorama720.swf" /> - <None Include="Media\PauseMenu720.swf" /> - <None Include="Media\skin.swf" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Media\strings.resx" /> - </ItemGroup> - <ItemGroup> - <Text Include="Media\media.txt" /> - <Text Include="Media\strings_begin.txt" /> - <Text Include="Media\strings_Controls.txt" /> - <Text Include="Media\strings_Credits.txt" /> - <Text Include="Media\strings_Descriptions.txt" /> - <Text Include="Media\strings_end.txt" /> - <Text Include="Media\strings_HowToPlay.txt" /> - <Text Include="Media\strings_ItemsAndTiles.txt" /> - <Text Include="Media\strings_Misc.txt" /> - <Text Include="Media\strings_PotionsAndEnchantments.txt" /> - <Text Include="Media\strings_Tips.txt" /> - <Text Include="Media\strings_Tooltips.txt" /> - <Text Include="Media\strings_Tutorial.txt" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\Durango\strings.h" /> - <ClInclude Include="..\Orbis\strings.h" /> - <ClInclude Include="..\PS3\strings.h" /> - <ClInclude Include="..\Windows64\strings.h" /> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}</ProjectGuid> - <Keyword>MakeFileProj</Keyword> - <SccProjectName>SAK</SccProjectName> - <SccAuxPath>SAK</SccAuxPath> - <SccLocalPath>SAK</SccLocalPath> - <SccProvider>SAK</SccProvider> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Makefile</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Makefile</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> - <NMakeBuildCommandLine>echo Creating languages.loc -copy .\Media\strings.resx .\Media\en-EN.lang -copy .\Media\fr-FR\strings.resx .\Media\fr-FR\fr-FR.lang -copy .\Media\ja-JP\strings.resx .\Media\ja-JP\ja-JP.lang -..\..\..\Tools\NewLocalisationPacker.exe --static .\Media .\Media\languages.loc - -echo Making archive -..\..\..\Tools\ArchiveFilePacker.exe -cd $(ProjectDir)\Media media.arc media.txt - -echo Copying Durango strings.h -copy .\Media\strings.h ..\Durango\strings.h - -echo Copying PS3 strings.h -copy .\Media\strings.h ..\PS3\strings.h - -echo Copying PS4 strings.h -copy .\Media\strings.h ..\Orbis\strings.h - -echo Copying Win strings.h -copy .\Media\strings.h ..\Windows64\strings.h</NMakeBuildCommandLine> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> - </PropertyGroup> - <ItemDefinitionGroup> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/Minecraft.Client/Common/CommonMedia.vcxproj.filters b/Minecraft.Client/Common/CommonMedia.vcxproj.filters deleted file mode 100644 index 9fb0927d..00000000 --- a/Minecraft.Client/Common/CommonMedia.vcxproj.filters +++ /dev/null @@ -1,136 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="IggyMedia"> - <UniqueIdentifier>{55c7ab2e-b3e5-4aed-9ffe-3308591d9c34}</UniqueIdentifier> - </Filter> - <Filter Include="Strings"> - <UniqueIdentifier>{eaa0eb72-0b27-4080-ad53-f68e42f37ba8}</UniqueIdentifier> - </Filter> - <Filter Include="Archive"> - <UniqueIdentifier>{711ad95b-eb56-4e18-b001-34ad7b8075a3}</UniqueIdentifier> - </Filter> - <Filter Include="Archive\Win64"> - <UniqueIdentifier>{1432ec3d-c5d0-46da-91b6-e7737095a97e}</UniqueIdentifier> - </Filter> - <Filter Include="Archive\PS4"> - <UniqueIdentifier>{4b2aeaf1-04d7-454d-b2d9-08364799831c}</UniqueIdentifier> - </Filter> - <Filter Include="Archive\PS3"> - <UniqueIdentifier>{4b0eaef6-fa2f-4605-b0da-a81ffb5659bc}</UniqueIdentifier> - </Filter> - <Filter Include="Archive\Durango"> - <UniqueIdentifier>{bf1c74da-21f1-4bdd-98ed-83457946e4cc}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <None Include="Media\ChestMenu720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\CreateWorldMenu720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\CreativeMenu720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\DebugMenu720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\FullscreenProgress720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\HUD720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\InventoryMenu720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\media.arc"> - <Filter>Archive</Filter> - </None> - <None Include="Media\languages.loc"> - <Filter>Archive</Filter> - </None> - <None Include="Media\skin.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\MainMenu720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\Panorama720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\LoadOrJoinMenu720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\LaunchMoreOptionsMenu720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\LoadMenu720.swf"> - <Filter>IggyMedia</Filter> - </None> - <None Include="Media\PauseMenu720.swf"> - <Filter>IggyMedia</Filter> - </None> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Media\strings.resx"> - <Filter>Strings</Filter> - </EmbeddedResource> - </ItemGroup> - <ItemGroup> - <Text Include="Media\strings_begin.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\strings_Controls.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\strings_Credits.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\strings_Descriptions.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\strings_end.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\strings_HowToPlay.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\strings_ItemsAndTiles.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\strings_Misc.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\strings_PotionsAndEnchantments.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\strings_Tips.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\strings_Tooltips.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\strings_Tutorial.txt"> - <Filter>Strings</Filter> - </Text> - <Text Include="Media\media.txt"> - <Filter>Archive</Filter> - </Text> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\Durango\strings.h"> - <Filter>Archive\Durango</Filter> - </ClInclude> - <ClInclude Include="..\PS3\strings.h"> - <Filter>Archive\PS3</Filter> - </ClInclude> - <ClInclude Include="..\Orbis\strings.h"> - <Filter>Archive\PS4</Filter> - </ClInclude> - <ClInclude Include="..\Windows64\strings.h"> - <Filter>Archive\Win64</Filter> - </ClInclude> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/Minecraft.Client/Common/UI/UIScene_Credits.cpp b/Minecraft.Client/Common/UI/UIScene_Credits.cpp index 9900169c..02dc6620 100644 --- a/Minecraft.Client/Common/UI/UIScene_Credits.cpp +++ b/Minecraft.Client/Common/UI/UIScene_Credits.cpp @@ -481,14 +481,6 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = #else { L"Copyright (C) 2009-2014 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING,eSmallText }, // extra blank line #endif - { L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING,eSmallText }, // extra blank line - { L"", CREDIT_ICON, eCreditIcon_Miles,eSmallText }, // extra blank line - { L"Uses Miles Sound System.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING,eSmallText }, // extra blank line -#ifdef __PS3__ - { L"Copyright (C) 1991-2013 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING,eSmallText }, // extra blank line -#else - { L"Copyright (C) 1991-2014 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING,eSmallText }, // extra blank line -#endif #ifdef __PS3__ { L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING,eSmallText }, // extra blank line { L"", CREDIT_ICON, eCreditIcon_Dolby,eSmallText }, // extra blank line @@ -496,6 +488,24 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { L"are trademarks of Dolby Laboratories.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING,eSmallText }, // extra blank line #endif #endif + {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"MinecraftConsoles", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eExtraLargeText}, + {L"Project Maintainers", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eLargeText}, + {L"smartcmd", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"codeHusky", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"Patoke", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"rtm516", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"mattsumi", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"dxf", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"la", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"Thank you to our 100+ contributors on GitHub!", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eLargeText}, + {L"github.com/smartcmd/MinecraftConsoles", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {L"Additional Thanks", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eLargeText}, + {L"notpies - Security Fixes", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText} }; UIScene_Credits::UIScene_Credits(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp index d73148f5..d7ad789a 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp @@ -206,6 +206,8 @@ int UIScene_LoadOrJoinMenu::LoadSaveCallback(LPVOID lpParam,bool bRes) UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { + constexpr uint64_t MAXIMUM_SAVE_STORAGE = 4LL * 1024LL * 1024LL * 1024LL; + // Setup all the Iggy references we need for this scene initialiseMovie(); app.SetLiveLinkRequired( true ); @@ -230,8 +232,8 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer m_controlJoinTimer.setVisible( true ); -#if defined(_XBOX_ONE) || defined(__ORBIS__) - m_spaceIndicatorSaves.init(L"",eControl_SpaceIndicator,0, (4LL *1024LL * 1024LL * 1024LL) ); +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) + m_spaceIndicatorSaves.init(L"",eControl_SpaceIndicator,0, MAXIMUM_SAVE_STORAGE); #endif m_bUpdateSaveSize = false; @@ -695,7 +697,7 @@ void UIScene_LoadOrJoinMenu::tick() if(m_eSaveTransferState == eSaveTransfer_Idle) m_bSaveTransferRunning = false; #endif -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) if(m_bUpdateSaveSize) { if((m_iDefaultButtonsC > 0) && (m_iSaveListIndex >= m_iDefaultButtonsC)) @@ -716,7 +718,7 @@ void UIScene_LoadOrJoinMenu::tick() if(m_pSaveDetails!=nullptr) { //CD - Fix - Adding define for ORBIS/XBOXONE -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) m_spaceIndicatorSaves.reset(); #endif @@ -758,6 +760,22 @@ void UIScene_LoadOrJoinMenu::tick() { #if defined(_XBOX_ONE) m_spaceIndicatorSaves.addSave(m_pSaveDetails->SaveInfoA[i].totalSize); +#elif defined(_WINDOWS64) + int origIdx = sortedIdx[i]; + wchar_t wFilename[MAX_SAVEFILENAME_LENGTH]; + ZeroMemory(wFilename, sizeof(wFilename)); + mbstowcs(wFilename, m_pSaveDetails->SaveInfoA[origIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1); + wstring filePath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + wstring(L"\\saveData.ms"); + + HANDLE hFile = CreateFileW(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr); + DWORD fileSize = 0; + + if (hFile != INVALID_HANDLE_VALUE) { + fileSize = GetFileSize(hFile, nullptr); + if (fileSize < 12 || fileSize == INVALID_FILE_SIZE) fileSize = 0; + CloseHandle(hFile); + } + m_spaceIndicatorSaves.addSave(fileSize); #elif defined(__ORBIS__) m_spaceIndicatorSaves.addSave(m_pSaveDetails->SaveInfoA[i].blocksUsed * (32 * 1024) ); #endif @@ -770,12 +788,8 @@ void UIScene_LoadOrJoinMenu::tick() #else #ifdef _WINDOWS64 { - int origIdx = sortedIdx[i]; - wchar_t wFilename[MAX_SAVEFILENAME_LENGTH]; - ZeroMemory(wFilename, sizeof(wFilename)); - mbstowcs(wFilename, m_pSaveDetails->SaveInfoA[origIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1); - wstring filePath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + wstring(L"\\saveData.ms"); wstring levelName = ReadLevelNameFromSaveFile(filePath); + if (!levelName.empty()) { m_buttonListSaves.addItem(levelName, wstring(L"")); diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h index 9f5fe17f..76a7ed43 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h @@ -20,7 +20,7 @@ private: { eControl_SavesList, eControl_GamesList, -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) eControl_SpaceIndicator, #endif }; @@ -52,7 +52,7 @@ protected: UIControl_SaveList m_buttonListGames; UIControl_Label m_labelSavesListTitle, m_labelJoinListTitle, m_labelNoGames; UIControl m_controlSavesTimer, m_controlJoinTimer; -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) UIControl_SpaceIndicatorBar m_spaceIndicatorSaves; #endif @@ -68,7 +68,7 @@ private: UI_MAP_ELEMENT( m_controlSavesTimer, "SavesTimer") UI_MAP_ELEMENT( m_controlJoinTimer, "JoinTimer") -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) UI_MAP_ELEMENT( m_spaceIndicatorSaves, "SaveSizeBar") #endif UI_END_MAP_ELEMENTS_AND_NAMES() diff --git a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln b/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln deleted file mode 100644 index 31c1bd39..00000000 --- a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln +++ /dev/null @@ -1,30 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameRules", "GameRules.vcxproj", "{0DD2FD59-36AC-476F-9201-D687A4CE9E98}" -EndProject -Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 2 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark - SccProjectUniqueName0 = GameRules.vcxproj - SccLocalPath0 = . - SccLocalPath1 = . - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Xbox 360 = Debug|Xbox 360 - Release|Xbox 360 = Release|Xbox 360 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj b/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj deleted file mode 100644 index 0bcb4e30..00000000 --- a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Xbox 360"> - <Configuration>Debug</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Xbox 360"> - <Configuration>Release</Configuration> - <Platform>Xbox 360</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{0DD2FD59-36AC-476F-9201-D687A4CE9E98}</ProjectGuid> - <Keyword>MakeFileProj</Keyword> - <SccProjectName>SAK</SccProjectName> - <SccAuxPath>SAK</SccAuxPath> - <SccLocalPath>SAK</SccLocalPath> - <SccProvider>SAK</SccProvider> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> - <ConfigurationType>Makefile</ConfigurationType> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> - <ConfigurationType>Makefile</ConfigurationType> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> - <NMakeOutput> - </NMakeOutput> - <NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> - <NMakeBuildCommandLine>BuildGameRule.cmd Tutorial</NMakeBuildCommandLine> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> - <NMakeOutput>GameRules.xex</NMakeOutput> - <NMakePreprocessorDefinitions>NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> - <CustomBuild> - <Command> - </Command> - </CustomBuild> - <Deploy> - <DeploymentType>CopyToHardDrive</DeploymentType> - </Deploy> - </ItemDefinitionGroup> - <ItemGroup> - <None Include="..\Tutorial.pck" /> - <None Include="Tutorial\GameRules.xml"> - <SubType>Designer</SubType> - </None> - <None Include="Tutorial\schematics\Boat.sch" /> - <None Include="Tutorial\schematics\CasTes1.sch" /> - <None Include="Tutorial\schematics\CasTes2.sch" /> - <None Include="Tutorial\schematics\CastleBottom.sch" /> - <None Include="Tutorial\schematics\CastleFront.sch" /> - <None Include="Tutorial\schematics\CastleLeft.sch" /> - <None Include="Tutorial\schematics\CastleMain.sch" /> - <None Include="Tutorial\schematics\CastleRight.sch" /> - <None Include="Tutorial\schematics\CastleTop.sch" /> - <None Include="Tutorial\schematics\JungleTemp.sch" /> - <None Include="Tutorial\schematics\Lava.sch" /> - <None Include="Tutorial\schematics\MinecraftSign.sch" /> - <None Include="Tutorial\schematics\Mushroom.sch" /> - <None Include="Tutorial\schematics\Pyramid.sch" /> - <None Include="Tutorial\schematics\Ship.sch" /> - <None Include="Tutorial\schematics\SnowHouse.sch" /> - <None Include="Tutorial\schematics\Spider.sch" /> - <None Include="Tutorial\schematics\Stairs.sch" /> - <None Include="Tutorial\schematics\StoneCircle.sch" /> - <None Include="Tutorial\schematics\Tower.sch" /> - <None Include="Tutorial\schematics\Tutorial.sch" /> - <None Include="Tutorial\Strings\en-EN.lang" /> - <None Include="Tutorial\Strings\Microsoft\de-DE.lang" /> - <None Include="Tutorial\Strings\Microsoft\es-ES.lang" /> - <None Include="Tutorial\Strings\Microsoft\fr-FR.lang" /> - <None Include="Tutorial\Strings\Microsoft\it-IT.lang" /> - <None Include="Tutorial\Strings\Microsoft\ja-JP.lang" /> - <None Include="Tutorial\Strings\Microsoft\ko-KR.lang" /> - <None Include="Tutorial\Strings\Microsoft\pt-BR.lang" /> - <None Include="Tutorial\Strings\Microsoft\pt-PT.lang" /> - <None Include="Tutorial\Strings\Microsoft\zh-CHT.lang" /> - </ItemGroup> - <ItemGroup> - <Xsd Include="GameRulesDefinition.xsd"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild> - </Xsd> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.filters b/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.filters deleted file mode 100644 index 9c46ad82..00000000 --- a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.filters +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - <Filter Include="Shared"> - <UniqueIdentifier>{ab02d5da-7fb3-494b-a636-03764d9a8acd}</UniqueIdentifier> - </Filter> - <Filter Include="Tutorial"> - <UniqueIdentifier>{e1a87048-bca2-46e6-a234-91d7d64eb983}</UniqueIdentifier> - </Filter> - <Filter Include="Tutorial\schematics"> - <UniqueIdentifier>{da425f4a-cf76-48e8-87cb-d9fda0f42365}</UniqueIdentifier> - </Filter> - <Filter Include="Tutorial\Loc"> - <UniqueIdentifier>{c0ba5f53-4881-495e-8158-5d87f379426d}</UniqueIdentifier> - </Filter> - <Filter Include="Tutorial\Loc\Microsoft"> - <UniqueIdentifier>{61651432-41a1-42f0-a853-c7795d813418}</UniqueIdentifier> - </Filter> - <Filter Include="Packs"> - <UniqueIdentifier>{e194e42b-1c9b-4e35-9a4b-dabd68eab3e0}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <None Include="Tutorial\GameRules.xml"> - <Filter>Tutorial</Filter> - </None> - <None Include="Tutorial\Strings\en-EN.lang"> - <Filter>Tutorial\Loc</Filter> - </None> - <None Include="Tutorial\Strings\Microsoft\de-DE.lang"> - <Filter>Tutorial\Loc\Microsoft</Filter> - </None> - <None Include="Tutorial\Strings\Microsoft\es-ES.lang"> - <Filter>Tutorial\Loc\Microsoft</Filter> - </None> - <None Include="Tutorial\Strings\Microsoft\fr-FR.lang"> - <Filter>Tutorial\Loc\Microsoft</Filter> - </None> - <None Include="Tutorial\Strings\Microsoft\it-IT.lang"> - <Filter>Tutorial\Loc\Microsoft</Filter> - </None> - <None Include="Tutorial\Strings\Microsoft\ja-JP.lang"> - <Filter>Tutorial\Loc\Microsoft</Filter> - </None> - <None Include="Tutorial\Strings\Microsoft\ko-KR.lang"> - <Filter>Tutorial\Loc\Microsoft</Filter> - </None> - <None Include="Tutorial\Strings\Microsoft\pt-BR.lang"> - <Filter>Tutorial\Loc\Microsoft</Filter> - </None> - <None Include="Tutorial\Strings\Microsoft\pt-PT.lang"> - <Filter>Tutorial\Loc\Microsoft</Filter> - </None> - <None Include="Tutorial\Strings\Microsoft\zh-CHT.lang"> - <Filter>Tutorial\Loc\Microsoft</Filter> - </None> - <None Include="..\Tutorial.pck"> - <Filter>Packs</Filter> - </None> - <None Include="Tutorial\schematics\JungleTemp.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\Lava.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\MinecraftSign.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\Mushroom.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\Ship.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\Spider.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\Stairs.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\StoneCircle.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\Tower.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\Pyramid.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\CasTes1.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\CasTes2.sch"> - <Filter>Tutorial\schematics</Filter> - </None> - <None Include="Tutorial\schematics\Boat.sch" /> - <None Include="Tutorial\schematics\CastleBottom.sch" /> - <None Include="Tutorial\schematics\CastleFront.sch" /> - <None Include="Tutorial\schematics\CastleLeft.sch" /> - <None Include="Tutorial\schematics\CastleMain.sch" /> - <None Include="Tutorial\schematics\CastleRight.sch" /> - <None Include="Tutorial\schematics\CastleTop.sch" /> - <None Include="Tutorial\schematics\Tutorial.sch" /> - </ItemGroup> - <ItemGroup> - <Xsd Include="GameRulesDefinition.xsd"> - <Filter>Shared</Filter> - </Xsd> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.vspscc b/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.vspscc deleted file mode 100644 index b6d32892..00000000 --- a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} |