chore: fix settings ui focus, w64 compile & update xzp
This commit is contained in:
str1k3r committed
1 parent
be14897736
commit
7c6ed9dbcb
10 files changed
+223
-350
No files matched your search
@@ -0,0 +1,144 @@
|
||||
# MinecraftConsoles - TU0 Progress
|
||||
|
||||
## C++ Rendering
|
||||
- [x] Hotbar Rendering
|
||||
- [x] Java Crosshair Inversion
|
||||
|
||||
## b1.6.6 Features
|
||||
- [ ] Beta Lighting
|
||||
- [ ] World Generation
|
||||
|
||||
## Removed Features
|
||||
- [ ] Creative Mode
|
||||
- [x] Bonus Chests
|
||||
- [x] Map Position
|
||||
- [x] Experience
|
||||
- [ ] Enchanting
|
||||
- [x] Sprinting
|
||||
- [ ] Superflat
|
||||
- [ ] Brewing
|
||||
- [ ] Trading
|
||||
|
||||
## Added Features
|
||||
- [x] Eat to Heal
|
||||
- [x] Punching Sheep for wool
|
||||
|
||||
## Removed Structures
|
||||
- [ ] Abandoned Mineshafts
|
||||
- [ ] Desert Temples
|
||||
- [ ] Jungle Temples
|
||||
- [ ] Strongholds
|
||||
- [ ] Villages
|
||||
- [ ] Ravines
|
||||
- [ ] Desert Wells
|
||||
|
||||
## Removed Dimensions
|
||||
- [ ] The End
|
||||
|
||||
## Removed Biomes
|
||||
- [ ] Mushroom Island
|
||||
- [ ] Jungle
|
||||
- [ ] Swamp
|
||||
|
||||
## Removed Items
|
||||
- [x] Experience Bottle
|
||||
- [x] Shears
|
||||
- [ ] Piston
|
||||
- [ ] Sticky Piston
|
||||
- [ ] Redstone Lamp
|
||||
- [ ] Tripwire Hook
|
||||
- [ ] Wooden Button
|
||||
- [ ] Mob/Player Heads
|
||||
- [ ] Melons
|
||||
- [ ] Melon Seeds
|
||||
- [ ] Pumpkin Seeds
|
||||
- [ ] Fern
|
||||
- [ ] Item Frame
|
||||
- [ ] Lily Pad
|
||||
- [ ] Vines
|
||||
- [ ] Smooth Sandstone
|
||||
- [ ] Chiseled Sandstone
|
||||
- [ ] Sandstone Stairs
|
||||
- [ ] Cobblestone Wall
|
||||
- [ ] Mossy Cobblestone Wall
|
||||
- [ ] Emerald Ore
|
||||
- [ ] Emerald
|
||||
- [ ] Emerald Block
|
||||
- [ ] Jungle Tree Sapling
|
||||
- [ ] Jungle Log
|
||||
- [ ] Jungle Leaves
|
||||
- [ ] Jungle Wood Planks
|
||||
- [ ] Jungle Wood Slab
|
||||
- [ ] Jungle Wood Stairs
|
||||
- [ ] Nether Quartz Ore
|
||||
- [ ] Block of Quartz
|
||||
- [ ] Chiseled Quartz Block
|
||||
- [ ] Pillar Quartz Block
|
||||
- [ ] Quartz Slab
|
||||
- [ ] Quartz Stairs
|
||||
- [ ] Nether Brick
|
||||
- [ ] Nether Brick Block
|
||||
- [ ] Nether Brick Slabs
|
||||
- [ ] Nether Brick Stairs
|
||||
- [ ] Nether Brick Fence
|
||||
- [ ] Spruce Wood Planks
|
||||
- [ ] Spruce Wood Slab
|
||||
- [ ] Spruce Wood Stairs
|
||||
- [ ] Birch Wood Planks
|
||||
- [ ] Birch Wood Slab
|
||||
- [ ] Birch Wood Stairs
|
||||
- [ ] Carpet Varients
|
||||
- [ ] Flower Pot
|
||||
- [ ] Enchanted Golden Apple
|
||||
- [ ] Spider Eye
|
||||
- [ ] Raw Chicken
|
||||
- [ ] Raw Beef
|
||||
- [ ] Cooked Chicken
|
||||
- [ ] Steak
|
||||
- [ ] Potato
|
||||
- [ ] Baked Potato
|
||||
- [ ] Poisonous Potato
|
||||
- [ ] Carrot
|
||||
- [ ] Golden Carrot
|
||||
- [ ] Pumpkin Pie
|
||||
- [ ] Fire Charge
|
||||
- [ ] Carrot on a Stick
|
||||
- [ ] Enchanted Books
|
||||
- [ ] Blaze Rods
|
||||
- [ ] Blaze Powder
|
||||
- [ ] Brewing Stand
|
||||
- [ ] Anvil
|
||||
- [ ] Enchanting Table
|
||||
- [ ] Glistening Melon
|
||||
- [ ] Glass Bottle
|
||||
- [ ] Ghast Tear
|
||||
- [ ] Magma Cream
|
||||
- [ ] Iron Bars
|
||||
- [ ] Ender Pearl
|
||||
- [ ] Eye of Ender
|
||||
- [ ] Music Discs (excluding 13 and Cat)
|
||||
- [ ] Spawn Eggs
|
||||
- [ ] Cauldron
|
||||
- [ ] Golden Nugget
|
||||
- [ ] Nether Wart
|
||||
- [ ] End Stone
|
||||
- [ ] Stone Bricks
|
||||
- [ ] Mossy Stone Bricks
|
||||
- [ ] Cracked Stone Bricks
|
||||
- [ ] Chiseled Stone Bricks
|
||||
- [ ] Silverfish Stone
|
||||
- [ ] Silverfish Cobblestone
|
||||
- [ ] Silverfish Stone Brick
|
||||
- [ ] Stone Bricks Slab
|
||||
- [ ] Stone Brick Stairs
|
||||
- [ ] Mycelium
|
||||
- [x] Fence Gate
|
||||
|
||||
## Removed Mobs
|
||||
- [ ] Villagers
|
||||
- [ ] Blazes
|
||||
- [ ] Magma Cube
|
||||
- [ ] Enderman
|
||||
- [ ] Silverfish
|
||||
- [ ] Mooshroom
|
||||
- [ ] Ocelot
|
||||
@@ -314,7 +314,7 @@
|
||||
<Visual>XuiSliderWrapper</Visual>
|
||||
<NavUp>XuiSliderDifficulty\XuiSlider</NavUp>
|
||||
<NavDown>XuiSliderSound\XuiSlider</NavDown>
|
||||
<DefaultFocus>FocusSink</DefaultFocus>
|
||||
<DefaultFocus>XuiSlider</DefaultFocus>
|
||||
</Properties>
|
||||
<XuiSlider>
|
||||
<Properties>
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
<Visual>XuiSliderWrapper</Visual>
|
||||
<NavUp>XuiSliderGamma\XuiSlider</NavUp>
|
||||
<NavDown>XuiSplitScreen</NavDown>
|
||||
<DefaultFocus>FocusSink</DefaultFocus>
|
||||
<DefaultFocus>XuiSlider</DefaultFocus>
|
||||
</Properties>
|
||||
<XuiSlider>
|
||||
<Properties>
|
||||
@@ -311,7 +311,7 @@
|
||||
<Visual>XuiSliderWrapper</Visual>
|
||||
<NavUp>XuiSliderDifficulty\XuiSlider</NavUp>
|
||||
<NavDown>XuiSliderSound\XuiSlider</NavDown>
|
||||
<DefaultFocus>FocusSink</DefaultFocus>
|
||||
<DefaultFocus>XuiSlider</DefaultFocus>
|
||||
</Properties>
|
||||
<XuiSlider>
|
||||
<Properties>
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
<Visual>XuiSliderWrapper</Visual>
|
||||
<NavUp>XuiSliderGamma\XuiSlider</NavUp>
|
||||
<NavDown>XuiSplitScreen</NavDown>
|
||||
<DefaultFocus>FocusSink</DefaultFocus>
|
||||
<DefaultFocus>XuiSlider</DefaultFocus>
|
||||
</Properties>
|
||||
<XuiSlider>
|
||||
<Properties>
|
||||
@@ -314,7 +314,7 @@
|
||||
<Visual>XuiSliderWrapper</Visual>
|
||||
<NavUp>XuiSliderDifficulty\XuiSlider</NavUp>
|
||||
<NavDown>XuiSliderSound\XuiSlider</NavDown>
|
||||
<DefaultFocus>FocusSink</DefaultFocus>
|
||||
<DefaultFocus>XuiSlider</DefaultFocus>
|
||||
</Properties>
|
||||
<XuiSlider>
|
||||
<Properties>
|
||||
|
||||
@@ -16,148 +16,17 @@ HRESULT CScene_HelpAndOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
|
||||
|
||||
MapChildControls();
|
||||
XuiControlSetText(m_Buttons[BUTTON_HAO_CHANGESKIN],app.GetString(IDS_CHANGE_SKIN));
|
||||
XuiControlSetText(m_Buttons[BUTTON_HAO_HOWTOPLAY],app.GetString(IDS_HOW_TO_PLAY));
|
||||
XuiControlSetText(m_Buttons[BUTTON_HAO_CONTROLS],app.GetString(IDS_CONTROLS));
|
||||
XuiControlSetText(m_Buttons[BUTTON_HAO_SETTINGS],app.GetString(IDS_SETTINGS));
|
||||
XuiControlSetText(m_Buttons[BUTTON_HAO_CREDITS],app.GetString(IDS_CREDITS));
|
||||
XuiControlSetText(m_Buttons[BUTTON_HAO_RESETTODEFAULTS],app.GetString(IDS_RESET_TO_DEFAULTS));
|
||||
XuiControlSetText(m_Buttons[BUTTON_HAO_REINSTALL],app.GetString(IDS_REINSTALL_CONTENT));
|
||||
XuiControlSetText(m_Buttons[BUTTON_HAO_DEBUG],app.GetString(IDS_DEBUG_SETTINGS));
|
||||
|
||||
//if(app.GetTMSDLCInfoRead())
|
||||
{
|
||||
m_Timer.SetShow(FALSE);
|
||||
m_bIgnoreInput=false;
|
||||
|
||||
#ifndef _FINAL_BUILD
|
||||
if(!app.DebugSettingsOn())
|
||||
{
|
||||
m_Buttons[BUTTON_HAO_DEBUG].SetEnable(FALSE);
|
||||
m_Buttons[BUTTON_HAO_DEBUG].SetShow(FALSE);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Buttons[BUTTON_HAO_DEBUG].SetEnable(TRUE);
|
||||
m_Buttons[BUTTON_HAO_DEBUG].SetShow(TRUE);
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
// 4J-PB - do not need a storage device to see this menu - just need one when you choose to re-install them
|
||||
|
||||
// any content to be re-installed?
|
||||
if(m_iPad==ProfileManager.GetPrimaryPad() && bNotInGame)
|
||||
{
|
||||
// We should show the reinstall menu
|
||||
app.DebugPrintf("Reinstall Menu required...\n");
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetEnable(TRUE);
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetShow(TRUE);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetEnable(FALSE);
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetShow(FALSE);
|
||||
}
|
||||
|
||||
if(app.GetLocalPlayerCount()>1)
|
||||
{
|
||||
// no credits in splitscreen
|
||||
D3DXVECTOR3 vec;
|
||||
|
||||
m_Buttons[BUTTON_HAO_CREDITS].GetPosition(&vec);
|
||||
|
||||
m_Buttons[BUTTON_HAO_CREDITS].SetEnable(FALSE);
|
||||
m_Buttons[BUTTON_HAO_CREDITS].SetShow(FALSE);
|
||||
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetPosition(&vec);
|
||||
|
||||
app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad,false);
|
||||
CXuiSceneBase::ShowLogo( m_iPad, FALSE );
|
||||
|
||||
if(ProfileManager.GetPrimaryPad()!=m_iPad)
|
||||
{
|
||||
m_Buttons[BUTTON_HAO_DEBUG].SetEnable(FALSE);
|
||||
m_Buttons[BUTTON_HAO_DEBUG].SetShow(FALSE);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(bNotInGame)
|
||||
{
|
||||
CXuiSceneBase::ShowLogo( DEFAULT_XUI_MENU_USER, TRUE );
|
||||
}
|
||||
else
|
||||
{
|
||||
CXuiSceneBase::ShowLogo( m_iPad, TRUE );
|
||||
}
|
||||
}
|
||||
// Display the tooltips
|
||||
|
||||
// if we're not in the game, we need to use basescene 0
|
||||
if(bNotInGame)
|
||||
{
|
||||
ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK);
|
||||
}
|
||||
else
|
||||
{
|
||||
ui.SetTooltips( m_iPad, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK);
|
||||
}
|
||||
|
||||
|
||||
if(!ProfileManager.IsFullVersion() )//|| ProfileManager.IsGuest(m_iPad))
|
||||
{
|
||||
// disable save button
|
||||
m_Buttons[BUTTON_HAO_CHANGESKIN].SetEnable(FALSE);
|
||||
m_Buttons[BUTTON_HAO_CHANGESKIN].EnableInput(FALSE);
|
||||
// set the focus to the second button
|
||||
|
||||
XuiElementSetUserFocus(m_Buttons[BUTTON_HAO_HOWTOPLAY].m_hObj, m_iPad);
|
||||
}
|
||||
}
|
||||
/*else
|
||||
{
|
||||
m_bIgnoreInput=true;
|
||||
m_Timer.SetShow(TRUE);
|
||||
|
||||
// hide all the buttons
|
||||
for(int i=0;i<BUTTONS_HAO_MAX;i++)
|
||||
{
|
||||
m_Buttons[i].SetEnable(FALSE);
|
||||
m_Buttons[i].SetShow(FALSE);
|
||||
}
|
||||
|
||||
if(bNotInGame)
|
||||
{
|
||||
ui.SetTooltips( DEFAULT_XUI_MENU_USER, -1,-1);
|
||||
}
|
||||
else
|
||||
{
|
||||
ui.SetTooltips( m_iPad, -1,-1);
|
||||
}
|
||||
}*/
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
/*HRESULT CScene_HelpAndOptions::OnTMSDLCFileRetrieved( )
|
||||
{
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
|
||||
m_Timer.SetShow(FALSE);
|
||||
m_bIgnoreInput=false;
|
||||
|
||||
// show all the buttons - except the debug settings and reinstall content
|
||||
m_Buttons[BUTTON_HAO_CHANGESKIN].SetEnable(TRUE);
|
||||
m_Buttons[BUTTON_HAO_CHANGESKIN].SetShow(TRUE);
|
||||
m_Buttons[BUTTON_HAO_HOWTOPLAY].SetEnable(TRUE);
|
||||
m_Buttons[BUTTON_HAO_HOWTOPLAY].SetShow(TRUE);
|
||||
m_Buttons[BUTTON_HAO_CONTROLS].SetEnable(TRUE);
|
||||
m_Buttons[BUTTON_HAO_CONTROLS].SetShow(TRUE);
|
||||
m_Buttons[BUTTON_HAO_SETTINGS].SetEnable(TRUE);
|
||||
m_Buttons[BUTTON_HAO_SETTINGS].SetShow(TRUE);
|
||||
m_Buttons[BUTTON_HAO_CREDITS].SetEnable(TRUE);
|
||||
m_Buttons[BUTTON_HAO_CREDITS].SetShow(TRUE);
|
||||
|
||||
|
||||
|
||||
#ifndef _FINAL_BUILD
|
||||
if(!app.DebugSettingsOn())
|
||||
{
|
||||
@@ -168,14 +37,13 @@ HRESULT CScene_HelpAndOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
|
||||
{
|
||||
m_Buttons[BUTTON_HAO_DEBUG].SetEnable(TRUE);
|
||||
m_Buttons[BUTTON_HAO_DEBUG].SetShow(TRUE);
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
// 4J-PB - do not need a storage device to see this menu - just need one when you choose to re-install them
|
||||
|
||||
// any content to be re-installed?
|
||||
if(m_iPad==ProfileManager.GetPrimaryPad() && bNotInGame)
|
||||
if(app.GetTMSDLCInfoRead() && m_iPad==ProfileManager.GetPrimaryPad() && bNotInGame)
|
||||
{
|
||||
// We should show the reinstall menu
|
||||
app.DebugPrintf("Reinstall Menu required...\n");
|
||||
@@ -184,21 +52,28 @@ HRESULT CScene_HelpAndOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
|
||||
}
|
||||
else
|
||||
{
|
||||
D3DXVECTOR3 vec;
|
||||
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetEnable(FALSE);
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetShow(FALSE);
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].GetPosition(&vec);
|
||||
m_Buttons[BUTTON_HAO_DEBUG].SetPosition(&vec);
|
||||
}
|
||||
|
||||
if(app.GetLocalPlayerCount()>1)
|
||||
{
|
||||
// no credits in splitscreen
|
||||
D3DXVECTOR3 vec;
|
||||
D3DXVECTOR3 vec,vec2;
|
||||
|
||||
m_Buttons[BUTTON_HAO_CREDITS].GetPosition(&vec);
|
||||
|
||||
m_Buttons[BUTTON_HAO_CREDITS].SetEnable(FALSE);
|
||||
m_Buttons[BUTTON_HAO_CREDITS].SetShow(FALSE);
|
||||
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetPosition(&vec);
|
||||
m_Buttons[BUTTON_HAO_RESETTODEFAULTS].GetPosition(&vec2);
|
||||
m_Buttons[BUTTON_HAO_RESETTODEFAULTS].SetPosition(&vec);
|
||||
|
||||
m_Buttons[BUTTON_HAO_DEBUG].SetPosition(&vec2);
|
||||
|
||||
app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad,false);
|
||||
CXuiSceneBase::ShowLogo( m_iPad, FALSE );
|
||||
@@ -232,22 +107,10 @@ HRESULT CScene_HelpAndOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
|
||||
ui.SetTooltips( m_iPad, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK);
|
||||
}
|
||||
|
||||
XuiElementSetUserFocus(m_Buttons[BUTTON_HAO_HOWTOPLAY].m_hObj, m_iPad);
|
||||
|
||||
if(!ProfileManager.IsFullVersion() )//|| ProfileManager.IsGuest(m_iPad))
|
||||
{
|
||||
// disable save button
|
||||
m_Buttons[BUTTON_HAO_CHANGESKIN].SetEnable(FALSE);
|
||||
m_Buttons[BUTTON_HAO_CHANGESKIN].EnableInput(FALSE);
|
||||
// set the focus to the second button
|
||||
|
||||
XuiElementSetUserFocus(m_Buttons[BUTTON_HAO_HOWTOPLAY].m_hObj, m_iPad);
|
||||
}
|
||||
else
|
||||
{
|
||||
XuiElementSetUserFocus(m_Buttons[BUTTON_HAO_CHANGESKIN].m_hObj, m_iPad);
|
||||
}
|
||||
return S_OK;
|
||||
}*/
|
||||
}
|
||||
|
||||
HRESULT CScene_HelpAndOptions::OnControlNavigate(XUIMessageControlNavigate *pControlNavigateData, BOOL& bHandled)
|
||||
{
|
||||
@@ -287,21 +150,22 @@ HRESULT CScene_HelpAndOptions::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPre
|
||||
case BUTTON_HAO_SETTINGS:
|
||||
app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_SettingsMenu);
|
||||
break;
|
||||
case BUTTON_HAO_CHANGESKIN:
|
||||
app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_SkinSelectMenu);
|
||||
break;
|
||||
case BUTTON_HAO_CREDITS:
|
||||
app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_Credits);
|
||||
break;
|
||||
case BUTTON_HAO_RESETTODEFAULTS:
|
||||
{
|
||||
// check they really want to do this
|
||||
UINT uiIDA[2];
|
||||
uiIDA[0]=IDS_CONFIRM_CANCEL;
|
||||
uiIDA[1]=IDS_CONFIRM_OK;
|
||||
|
||||
case BUTTON_HAO_REINSTALL:
|
||||
app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_ReinstallMenu);
|
||||
StorageManager.RequestMessageBox(IDS_DEFAULTS_TITLE, IDS_DEFAULTS_TEXT, uiIDA, 2, pNotifyPressData->UserIndex,&CScene_HelpAndOptions::ResetDefaultsDialogReturned,this, app.GetStringTable());
|
||||
}
|
||||
break;
|
||||
|
||||
case BUTTON_HAO_DEBUG:
|
||||
app.NavigateToScene(pNotifyPressData->UserIndex,eUIScene_DebugOptions);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -350,28 +214,6 @@ HRESULT CScene_HelpAndOptions::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
|
||||
{
|
||||
ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK);
|
||||
CXuiSceneBase::ShowLogo( DEFAULT_XUI_MENU_USER, TRUE );
|
||||
|
||||
if(m_iPad==ProfileManager.GetPrimaryPad() )//&&
|
||||
// StorageManager.GetSaveDeviceSelected(m_iPad) &&
|
||||
// !StorageManager.GetSaveDisabled() &&
|
||||
// ( ProfileManager.IsAwardsFlagSet(m_iPad,eAward_mine100Blocks) ||
|
||||
// ProfileManager.IsAwardsFlagSet(m_iPad,eAward_kill10Creepers) ||
|
||||
// ProfileManager.IsAwardsFlagSet(m_iPad,eAward_eatPorkChop) ||
|
||||
// ProfileManager.IsAwardsFlagSet(m_iPad,eAward_play100Days) ||
|
||||
// ProfileManager.IsAwardsFlagSet(m_iPad,eAward_arrowKillCreeper) ||
|
||||
// ProfileManager.IsAwardsFlagSet(m_iPad,eAward_socialPost)) )
|
||||
{
|
||||
// We should show the reinstall menu
|
||||
app.DebugPrintf("Reinstall Menu required...\n");
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetEnable(TRUE);
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetShow(TRUE);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetEnable(FALSE);
|
||||
m_Buttons[BUTTON_HAO_REINSTALL].SetShow(FALSE);
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -390,20 +232,20 @@ HRESULT CScene_HelpAndOptions::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
|
||||
}
|
||||
|
||||
|
||||
// int CScene_HelpAndOptions::ResetDefaultsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
|
||||
// {
|
||||
// CScene_HelpAndOptions* pClass = (CScene_HelpAndOptions*)pParam;
|
||||
//
|
||||
// // results switched for this dialog
|
||||
// if(result==C4JStorage::EMessage_ResultDecline)
|
||||
// {
|
||||
// app.SetDefaultOptions(ProfileManager.GetDashboardProfileSettings(pClass->m_iPad),pClass->m_iPad);
|
||||
// // if the profile data has been changed, then force a profile write
|
||||
// // It seems we're allowed to break the 5 minute rule if it's the result of a user action
|
||||
// app.CheckGameSettingsChanged(true,iPad);
|
||||
// }
|
||||
// return 0;
|
||||
// }
|
||||
int CScene_HelpAndOptions::ResetDefaultsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
|
||||
{
|
||||
//CScene_SettingsAll* pClass = (CScene_SettingsAll*)pParam;
|
||||
|
||||
// results switched for this dialog
|
||||
if(result==C4JStorage::EMessage_ResultDecline)
|
||||
{
|
||||
app.SetDefaultOptions(ProfileManager.GetDashboardProfileSettings(iPad),iPad);
|
||||
// if the profile data has been changed, then force a profile write
|
||||
// It seems we're allowed to break the 5 minute rule if it's the result of a user action
|
||||
app.CheckGameSettingsChanged(true,iPad);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
HRESULT CScene_HelpAndOptions::OnTransitionStart( XUIMessageTransition *pTransition, BOOL& bHandled )
|
||||
{
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
#include "../Media/XUI/xuiscene_helpandoptions.h"
|
||||
#include "XUI_CustomMessages.h"
|
||||
|
||||
#define BUTTON_HAO_CHANGESKIN 0
|
||||
#define BUTTON_HAO_HOWTOPLAY 1
|
||||
#define BUTTON_HAO_CONTROLS 2
|
||||
#define BUTTON_HAO_SETTINGS 3
|
||||
#define BUTTON_HAO_CREDITS 4
|
||||
#define BUTTON_HAO_HOWTOPLAY 0
|
||||
#define BUTTON_HAO_CONTROLS 1
|
||||
#define BUTTON_HAO_SETTINGS 2
|
||||
#define BUTTON_HAO_CREDITS 3
|
||||
#define BUTTON_HAO_RESETTODEFAULTS 4
|
||||
#define BUTTON_HAO_REINSTALL 5
|
||||
#define BUTTON_HAO_DEBUG 6
|
||||
#define BUTTONS_HAO_MAX BUTTON_HAO_DEBUG + 1
|
||||
@@ -37,11 +37,11 @@ protected:
|
||||
|
||||
// Control mapping to objects
|
||||
BEGIN_CONTROL_MAP()
|
||||
MAP_CONTROL(IDC_XuiButton1, m_Buttons[BUTTON_HAO_CHANGESKIN])
|
||||
MAP_CONTROL(IDC_XuiButton2, m_Buttons[BUTTON_HAO_HOWTOPLAY ])
|
||||
MAP_CONTROL(IDC_XuiButton3, m_Buttons[BUTTON_HAO_CONTROLS ])
|
||||
MAP_CONTROL(IDC_XuiButton4, m_Buttons[BUTTON_HAO_SETTINGS ])
|
||||
MAP_CONTROL(IDC_XuiButton5, m_Buttons[BUTTON_HAO_CREDITS])
|
||||
MAP_CONTROL(IDC_XuiButton1, m_Buttons[BUTTON_HAO_HOWTOPLAY ])
|
||||
MAP_CONTROL(IDC_XuiButton2, m_Buttons[BUTTON_HAO_CONTROLS ])
|
||||
MAP_CONTROL(IDC_XuiButton3, m_Buttons[BUTTON_HAO_SETTINGS ])
|
||||
MAP_CONTROL(IDC_XuiButton4, m_Buttons[BUTTON_HAO_CREDITS])
|
||||
MAP_CONTROL(IDC_XuiButton5, m_Buttons[BUTTON_HAO_RESETTODEFAULTS])
|
||||
MAP_CONTROL(IDC_XuiButton6, m_Buttons[BUTTON_HAO_REINSTALL])
|
||||
MAP_CONTROL(IDC_XuiButton7, m_Buttons[BUTTON_HAO_DEBUG])
|
||||
MAP_CONTROL(IDC_Timer, m_Timer)
|
||||
@@ -55,7 +55,8 @@ protected:
|
||||
HRESULT OnCustomMessage_Splitscreenplayer(bool bJoining, BOOL& bHandled);
|
||||
HRESULT OnTransitionStart( XUIMessageTransition *pTransition, BOOL& bHandled );
|
||||
HRESULT OnControlNavigate(XUIMessageControlNavigate *pControlNavigateData, BOOL& bHandled);
|
||||
//HRESULT OnTMSDLCFileRetrieved( );
|
||||
static int ResetDefaultsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result);
|
||||
|
||||
public:
|
||||
|
||||
// Define the class. The class name must match the ClassOverride property
|
||||
|
||||
@@ -185,6 +185,15 @@ HRESULT CScene_SettingsAll::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
|
||||
CXuiSceneBase::ShowBackground( m_iPad, FALSE );
|
||||
}
|
||||
|
||||
if(bPrimaryPlayer)
|
||||
{
|
||||
XuiElementSetUserFocus(m_SliderA[SLIDER_SETTINGS_MUSIC].m_hObj, m_iPad);
|
||||
}
|
||||
else
|
||||
{
|
||||
XuiElementSetUserFocus(m_SliderA[SLIDER_SETTINGS_SENSITIVITY].m_hObj, m_iPad);
|
||||
}
|
||||
|
||||
if(app.GetLocalPlayerCount()>1)
|
||||
{
|
||||
app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad);
|
||||
|
||||
@@ -34811,7 +34811,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
|
||||
@@ -34896,7 +34896,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
|
||||
|
||||
Binary file not shown.
@@ -2,145 +2,22 @@
|
||||
|
||||
Bringing the October 10th 2014 Source Leak back down to TU0
|
||||
|
||||
## C++ Rendering
|
||||
- [x] Hotbar Rendering
|
||||
- [x] Java Crosshair Inversion
|
||||
## Progress
|
||||
To check progress, see [PROGRESS.md](./.gitea/PROGRESS.md).
|
||||
|
||||
## b1.6.6 Features
|
||||
- [ ] Beta Lighting
|
||||
- [ ] World Generation
|
||||
## Platforms
|
||||
- **MacOS / Linux**: Works if you use Wine 7 - Latest.
|
||||
- **Windows64**: Fully working and *playable*.
|
||||
- **Xbox 360**: Buildable, boots and playable.
|
||||
- **Orbis**: Buildable, boots but crashes.
|
||||
- **PS3**: Buildable, boots and playable.
|
||||
|
||||
## Removed Features
|
||||
- [ ] Creative Mode
|
||||
- [x] Bonus Chests
|
||||
- [x] Map Position
|
||||
- [x] Experience
|
||||
- [ ] Enchanting
|
||||
- [x] Sprinting
|
||||
- [ ] Superflat
|
||||
- [ ] Brewing
|
||||
- [ ] Trading
|
||||
## Launch Arguments
|
||||
| Argument | Description |
|
||||
|--------------------|-----------------------------------------------------------------------------------------------------|
|
||||
| `-resolution` | Launches the game using the set resolution 1 = 4k, 2 = 1440p, 3= 1080p, 4 = 720p 5 = 480p |
|
||||
|
||||
## Added Features
|
||||
- [x] Eat to Heal
|
||||
- [x] Punching Sheep for wool
|
||||
|
||||
## Removed Structures
|
||||
- [ ] Abandoned Mineshafts
|
||||
- [ ] Desert Temples
|
||||
- [ ] Jungle Temples
|
||||
- [ ] Strongholds
|
||||
- [ ] Villages
|
||||
- [ ] Ravines
|
||||
- [ ] Desert Wells
|
||||
|
||||
## Removed Dimensions
|
||||
- [ ] The End
|
||||
|
||||
## Removed Biomes
|
||||
- [ ] Mushroom Island
|
||||
- [ ] Jungle
|
||||
- [ ] Swamp
|
||||
|
||||
## Removed Items
|
||||
- [x] Experience Bottle
|
||||
- [x] Shears
|
||||
- [ ] Piston
|
||||
- [ ] Sticky Piston
|
||||
- [ ] Redstone Lamp
|
||||
- [ ] Tripwire Hook
|
||||
- [ ] Wooden Button
|
||||
- [ ] Mob/Player Heads
|
||||
- [ ] Melons
|
||||
- [ ] Melon Seeds
|
||||
- [ ] Pumpkin Seeds
|
||||
- [ ] Fern
|
||||
- [ ] Item Frame
|
||||
- [ ] Lily Pad
|
||||
- [ ] Vines
|
||||
- [ ] Smooth Sandstone
|
||||
- [ ] Chiseled Sandstone
|
||||
- [ ] Sandstone Stairs
|
||||
- [ ] Cobblestone Wall
|
||||
- [ ] Mossy Cobblestone Wall
|
||||
- [ ] Emerald Ore
|
||||
- [ ] Emerald
|
||||
- [ ] Emerald Block
|
||||
- [ ] Jungle Tree Sapling
|
||||
- [ ] Jungle Log
|
||||
- [ ] Jungle Leaves
|
||||
- [ ] Jungle Wood Planks
|
||||
- [ ] Jungle Wood Slab
|
||||
- [ ] Jungle Wood Stairs
|
||||
- [ ] Nether Quartz Ore
|
||||
- [ ] Block of Quartz
|
||||
- [ ] Chiseled Quartz Block
|
||||
- [ ] Pillar Quartz Block
|
||||
- [ ] Quartz Slab
|
||||
- [ ] Quartz Stairs
|
||||
- [ ] Nether Brick
|
||||
- [ ] Nether Brick Block
|
||||
- [ ] Nether Brick Slabs
|
||||
- [ ] Nether Brick Stairs
|
||||
- [ ] Nether Brick Fence
|
||||
- [ ] Spruce Wood Planks
|
||||
- [ ] Spruce Wood Slab
|
||||
- [ ] Spruce Wood Stairs
|
||||
- [ ] Birch Wood Planks
|
||||
- [ ] Birch Wood Slab
|
||||
- [ ] Birch Wood Stairs
|
||||
- [ ] Carpet Varients
|
||||
- [ ] Flower Pot
|
||||
- [ ] Enchanted Golden Apple
|
||||
- [ ] Spider Eye
|
||||
- [ ] Raw Chicken
|
||||
- [ ] Raw Beef
|
||||
- [ ] Cooked Chicken
|
||||
- [ ] Steak
|
||||
- [ ] Potato
|
||||
- [ ] Baked Potato
|
||||
- [ ] Poisonous Potato
|
||||
- [ ] Carrot
|
||||
- [ ] Golden Carrot
|
||||
- [ ] Pumpkin Pie
|
||||
- [ ] Fire Charge
|
||||
- [ ] Carrot on a Stick
|
||||
- [ ] Enchanted Books
|
||||
- [ ] Blaze Rods
|
||||
- [ ] Blaze Powder
|
||||
- [ ] Brewing Stand
|
||||
- [ ] Anvil
|
||||
- [ ] Enchanting Table
|
||||
- [ ] Glistening Melon
|
||||
- [ ] Glass Bottle
|
||||
- [ ] Ghast Tear
|
||||
- [ ] Magma Cream
|
||||
- [ ] Iron Bars
|
||||
- [ ] Ender Pearl
|
||||
- [ ] Eye of Ender
|
||||
- [ ] Music Discs (excluding 13 and Cat)
|
||||
- [ ] Spawn Eggs
|
||||
- [ ] Cauldron
|
||||
- [ ] Golden Nugget
|
||||
- [ ] Nether Wart
|
||||
- [ ] End Stone
|
||||
- [ ] Stone Bricks
|
||||
- [ ] Mossy Stone Bricks
|
||||
- [ ] Cracked Stone Bricks
|
||||
- [ ] Chiseled Stone Bricks
|
||||
- [ ] Silverfish Stone
|
||||
- [ ] Silverfish Cobblestone
|
||||
- [ ] Silverfish Stone Brick
|
||||
- [ ] Stone Bricks Slab
|
||||
- [ ] Stone Brick Stairs
|
||||
- [ ] Mycelium
|
||||
- [x] Fence Gate
|
||||
|
||||
## Removed Mobs
|
||||
- [ ] Villagers
|
||||
- [ ] Blazes
|
||||
- [ ] Magma Cube
|
||||
- [ ] Enderman
|
||||
- [ ] Silverfish
|
||||
- [ ] Mooshroom
|
||||
- [ ] Ocelot
|
||||
Example:
|
||||
```
|
||||
Minecraft.Client.exe -resolution 5
|
||||
```
|
||||
Reference in new issue
Block a user