diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc
index eeacb7b6..9876c575 100644
Binary files a/Minecraft.Client/Common/Media/MediaWindows64.arc and b/Minecraft.Client/Common/Media/MediaWindows64.arc differ
diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp
index 8671a530..197d178a 100644
--- a/Minecraft.Client/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Common/UI/UIController.cpp
@@ -512,28 +512,32 @@ void UIController::loadSkins()
{
platformSkinPath = L"skinHDWin.swf";
}
+ else if (m_fScreenWidth >= 960.0f && m_fScreenWidth < 1280.0f) //str1k3r - we need to check this to make sure we dont load the vita skin on 720p
+ {
+ platformSkinPath = L"skinWinVita.swf";
+ }
else
{
platformSkinPath = L"skinWin.swf";
}
#elif defined _DURANGO
- if(m_fScreenHeight==1080.0f)
- {
+ //if(m_fScreenHeight==1080.0f)
+ //{
platformSkinPath = L"skinHDDurango.swf";
- }
- else
- {
- platformSkinPath = L"skinDurango.swf";
- }
+ //}
+ //else
+ //{
+ // platformSkinPath = L"skinDurango.swf";
+ //}
#elif defined __ORBIS__
- if(m_fScreenHeight==1080.0f)
- {
+ //if(m_fScreenHeight==1080.0f)
+ //{
platformSkinPath = L"skinHDOrbis.swf";
- }
- else
- {
- platformSkinPath = L"skinOrbis.swf";
- }
+ //}
+ //else
+ //{
+ // platformSkinPath = L"skinOrbis.swf";
+ //}
#endif
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj
index cc5ab0c5..85d1718c 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj
+++ b/Minecraft.Client/Minecraft.Client.vcxproj
@@ -3523,6 +3523,44 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue
true
+
+ false
+ false
+ false
+ false
+ false
+ false
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
true
true
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.filters b/Minecraft.Client/Minecraft.Client.vcxproj.filters
index ef3b0a83..e664091a 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj.filters
+++ b/Minecraft.Client/Minecraft.Client.vcxproj.filters
@@ -911,6 +911,9 @@
Buildsteps
+
+ Windows
+
diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
index a5a1b858..679ba533 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
@@ -300,6 +300,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch (message)
{
+ case WM_SETCURSOR:
+ if (LOWORD(lParam) == HTCLIENT || LOWORD(lParam) == HTCAPTION)
+ {
+ SetCursor((HCURSOR)GetClassLongPtr(hWnd, GCLP_HCURSOR));
+ return TRUE;
+ }
+ break;
case WM_ENTERMENULOOP:
case WM_ENTERSIZEMOVE:
SetTimer(hWnd, 1, USER_TIMER_MINIMUM, NULL);
@@ -360,7 +367,7 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
wcex.cbWndExtra = 0;
wcex.hInstance = hInstance;
wcex.hIcon = LoadIcon(hInstance, "Minecraft");
- wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
+ wcex.hCursor = (HCURSOR)LoadImage(hInstance, MAKEINTRESOURCE(IDC_POINTER), IMAGE_CURSOR, 0, 0, LR_SHARED);
wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
wcex.lpszMenuName = "Minecraft";
wcex.lpszClassName = "MinecraftClass";
@@ -518,8 +525,8 @@ HRESULT InitDevice()
sd.BufferDesc.Width = width;
sd.BufferDesc.Height = height;
sd.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
- sd.BufferDesc.RefreshRate.Numerator = 60;
- sd.BufferDesc.RefreshRate.Denominator = 1;
+ sd.BufferDesc.RefreshRate.Numerator = 0;
+ sd.BufferDesc.RefreshRate.Denominator = 0;
sd.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
sd.OutputWindow = g_hWnd;
sd.SampleDesc.Count = 1;
diff --git a/Minecraft.Client/Xbox/MinecraftWindows.rc b/Minecraft.Client/Xbox/MinecraftWindows.rc
index 69ce5334..532a6ff4 100644
Binary files a/Minecraft.Client/Xbox/MinecraftWindows.rc and b/Minecraft.Client/Xbox/MinecraftWindows.rc differ
diff --git a/Minecraft.Client/Xbox/Resource.h b/Minecraft.Client/Xbox/Resource.h
index 55435726..99401193 100644
Binary files a/Minecraft.Client/Xbox/Resource.h and b/Minecraft.Client/Xbox/Resource.h differ
diff --git a/Minecraft.Client/Xbox/pointer.cur b/Minecraft.Client/Xbox/pointer.cur
new file mode 100644
index 00000000..a60a2a37
Binary files /dev/null and b/Minecraft.Client/Xbox/pointer.cur differ