str1k3r/TU0
0
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: realign hud & x360 stuff

Browse Source
This commit is contained in:
str1k3r committed 2026-10-04 01:32:30 -04:00
1 parent 8f7ad6f080
commit dc73daee70
45 files changed
+957 -2623
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+3
View File
@@ -31,6 +31,9 @@ Build/*
/Minecraft.Client/PS3/SPU_Tasks/*/Release
/Minecraft.Client/PS3/SPU_Tasks/*/ContentPackage
# Xbox 360
Minecraft.Client/XboxMedia/XZP
# Misc
*.ppu.o
*.pkg
Minecraft.Client/Common/Media/XUI/xuiscene_settings_All.h
+1
View File
@@ -1,3 +1,4 @@
#define IDC_XuiDifficultyText L"XuiDifficultyText"
#define IDC_XuiSliderMusic L"XuiSliderMusic"
#define IDC_XuiSliderSound L"XuiSliderSound"
#define IDC_XuiSliderGamma L"XuiSliderGamma"
Minecraft.Client/Common/Media/XUI/xuiscene_settings_All.xui
+309 -62
View File
@@ -6,86 +6,333 @@
<XuiScene>
<Properties>
<Id>SceneSettings</Id>
<Width>1280.000000</Width>
<Height>720.000000</Height>
<Width>330.000000</Width>
<Height>290.000000</Height>
<Position>475.000061,175.000000,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsAll</ClassOverride>
<Visual>XuiBlankScene</Visual>
<DefaultFocus>XuiButtonOptions</DefaultFocus>
<DefaultFocus>XuiSliderMusic</DefaultFocus>
</Properties>
<XuiButton>
<XuiGroup>
<Properties>
<Id>XuiButtonResetToDefaults</Id>
<Width>450.000000</Width>
<Height>40.000000</Height>
<Position>415.000031,500.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavUp>XuiButtonUI</NavUp>
<Id>graphic_groupbackground</Id>
<Width>330.000000</Width>
<Height>325.000000</Height>
<Anchor>15</Anchor>
</Properties>
</XuiButton>
<XuiButton>
<XuiImage>
<Properties>
<Id>XuiButtonUI</Id>
<Width>450.000000</Width>
<Height>40.000000</Height>
<Position>415.000031,450.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavUp>XuiButtonGraphics</NavUp>
<NavDown>XuiButtonResetToDefaults</NavDown>
<Id>Bot_R</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Position>314.344849,309.001953,0.000000</Position>
<Anchor>12</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Bot_R.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonGraphics</Id>
<Width>450.000000</Width>
<Height>40.000000</Height>
<Position>415.000031,400.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavUp>XuiButtonControl</NavUp>
<NavDown>XuiButtonUI</NavDown>
<Id>Bot_M</Id>
<Width>298.344849</Width>
<Height>16.000000</Height>
<Position>16.000000,309.001953,0.000000</Position>
<Anchor>13</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Bot_M.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonControl</Id>
<Width>450.000000</Width>
<Height>40.000000</Height>
<Position>415.000031,350.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavUp>XuiButtonAudio</NavUp>
<NavDown>XuiButtonGraphics</NavDown>
<Id>Bot_L</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Position>0.000000,309.001953,0.000000</Position>
<Anchor>9</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Bot_L.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonAudio</Id>
<Width>450.000000</Width>
<Height>40.000000</Height>
<Position>415.000031,300.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavUp>XuiButtonOptions</NavUp>
<NavDown>XuiButtonControl</NavDown>
<Id>Top_R</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Position>314.344849,0.000000,0.000000</Position>
<Anchor>6</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Top_R.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonOptions</Id>
<Width>450.000000</Width>
<Height>40.000000</Height>
<Position>415.000031,250.000015,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavDown>XuiButtonAudio</NavDown>
<Id>Top_M</Id>
<Width>298.344849</Width>
<Height>16.000000</Height>
<Position>16.000000,0.000000,0.000000</Position>
<Anchor>7</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Top_M.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
</XuiScene>
</XuiImage>
<XuiImage>
<Properties>
<Id>Top_L</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Anchor>3</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Top_L.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
<XuiImage>
<Properties>
<Id>Mid_R</Id>
<Width>16.000000</Width>
<Height>293.001953</Height>
<Position>314.344849,16.000000,0.000000</Position>
<Anchor>14</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Mid_R.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
<XuiImage>
<Properties>
<Id>Mid_M</Id>
<Width>298.344849</Width>
<Height>293.001953</Height>
<Position>16.000000,16.000000,0.000000</Position>
<Anchor>15</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Mid_M.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
<XuiImage>
<Properties>
<Id>Mid_L</Id>
<Width>16.000000</Width>
<Height>293.001953</Height>
<Position>0.000000,16.000000,0.000000</Position>
<Anchor>11</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Mid_L.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
</XuiGroup>
<XuiLabel>
<Properties>
<Id>XuiDifficultyText</Id>
<Width>700.000000</Width>
<Height>110.000000</Height>
<Position>-184.999985,342.000000,0.000000</Position>
<Anchor>16</Anchor>
<Visual>TipPanel</Visual>
</Properties>
</XuiLabel>
<XuiScene>
<Properties>
<Id>XuiSliderDifficulty</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000031,277.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiShowOnMaps</NavUp>
<NavDown>XuiSliderMusic\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<Text>Difficulty:</Text>
<RangeMax>3</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>Logo</Id>
<Width>1280.000000</Width>
<Height>138.000000</Height>
<Position>0.000000,56.000000,0.000000</Position>
<DesignTime>true</DesignTime>
<Visual>MenuTitleLogo</Visual>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderSensitivity</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000031,131.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderGamma\XuiSlider</NavUp>
<NavDown>XuiSplitScreen</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<Text>Sensitivity:</Text>
<RangeMax>200</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiShowOnMaps</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,244.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiViewBob</NavUp>
<NavDown>XuiSliderDifficulty\XuiSlider</NavDown>
<Text>Visible On Maps</Text>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiViewBob</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,209.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiSplitScreen</NavUp>
<NavDown>XuiShowOnMaps</NavDown>
<Text>View Bobbing</Text>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiSplitScreen</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,174.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiSliderSensitivity\XuiSlider</NavUp>
<NavDown>XuiViewBob</NavDown>
<Text>2 Player Split-screen Vertical</Text>
</Properties>
</XuiCheckbox>
<XuiScene>
<Properties>
<Id>XuiSliderGamma</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000000,91.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderSound\XuiSlider</NavUp>
<NavDown>XuiSliderSensitivity\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderSound</NavUp>
<NavDown>XuiSliderSensitivity</NavDown>
<Text>Gamma:</Text>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderSound</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000031,51.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderMusic\XuiSlider</NavUp>
<NavDown>XuiSliderGamma\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderMusic</NavUp>
<NavDown>XuiSliderGamma</NavDown>
<Text>Sound:</Text>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderMusic</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000031,11.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderDifficulty\XuiSlider</NavUp>
<NavDown>XuiSliderSound\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<Text>Music:</Text>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>520.000000</Width>
<Height>70.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_All_480.xui
+306 -62
View File
@@ -6,85 +6,329 @@
<XuiScene>
<Properties>
<Id>SceneSettings</Id>
<Width>640.000000</Width>
<Height>480.000000</Height>
<Width>320.000000</Width>
<Height>303.000000</Height>
<Position>160.000031,34.000000,0.000000</Position>
<ClassOverride>CScene_SettingsAll</ClassOverride>
<Visual>XuiBlankScene</Visual>
<DefaultFocus>XuiButtonOptions</DefaultFocus>
<DefaultFocus>XuiSliderMusic</DefaultFocus>
</Properties>
<XuiButton>
<XuiGroup>
<Properties>
<Id>XuiButtonResetToDefaults</Id>
<Width>300.000000</Width>
<Height>36.000000</Height>
<Position>170.000015,340.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L_Thin</Visual>
<NavUp>XuiButtonUI</NavUp>
<Id>graphic_groupbackground</Id>
<Width>320.000000</Width>
<Height>294.000000</Height>
<Position>0.000030,0.000000,0.000000</Position>
<Anchor>15</Anchor>
</Properties>
</XuiButton>
<XuiButton>
<XuiImage>
<Properties>
<Id>XuiButtonUI</Id>
<Width>300.000000</Width>
<Height>36.000000</Height>
<Position>170.000015,300.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L_Thin</Visual>
<NavUp>XuiButtonGraphics</NavUp>
<NavDown>XuiButtonResetToDefaults</NavDown>
<Id>Bot_R</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Position>304.344849,278.001953,0.000000</Position>
<Anchor>12</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Bot_R.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonGraphics</Id>
<Width>300.000000</Width>
<Height>36.000000</Height>
<Position>170.000015,260.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L_Thin</Visual>
<NavUp>XuiButtonControl</NavUp>
<NavDown>XuiButtonUI</NavDown>
<Id>Bot_M</Id>
<Width>288.344849</Width>
<Height>16.000000</Height>
<Position>16.000000,278.001953,0.000000</Position>
<Anchor>13</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Bot_M.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonControl</Id>
<Width>300.000000</Width>
<Height>36.000000</Height>
<Position>170.000015,220.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L_Thin</Visual>
<NavUp>XuiButtonAudio</NavUp>
<NavDown>XuiButtonGraphics</NavDown>
<Id>Bot_L</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Position>0.000000,278.001953,0.000000</Position>
<Anchor>9</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Bot_L.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonAudio</Id>
<Width>300.000000</Width>
<Height>36.000000</Height>
<Position>170.000015,180.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L_Thin</Visual>
<NavUp>XuiButtonOptions</NavUp>
<NavDown>XuiButtonControl</NavDown>
<Id>Top_R</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Position>304.344849,0.000000,0.000000</Position>
<Anchor>6</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Top_R.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonOptions</Id>
<Width>300.000000</Width>
<Height>36.000000</Height>
<Position>170.000015,140.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L_Thin</Visual>
<NavDown>XuiButtonAudio</NavDown>
<Id>Top_M</Id>
<Width>288.344849</Width>
<Height>16.000000</Height>
<Position>16.000000,0.000000,0.000000</Position>
<Anchor>7</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Top_M.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
</XuiScene>
</XuiImage>
<XuiImage>
<Properties>
<Id>Top_L</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Anchor>3</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Top_L.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
<XuiImage>
<Properties>
<Id>Mid_R</Id>
<Width>16.000000</Width>
<Height>262.001953</Height>
<Position>304.344849,16.000000,0.000000</Position>
<Anchor>14</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Mid_R.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
<XuiImage>
<Properties>
<Id>Mid_M</Id>
<Width>288.344849</Width>
<Height>262.001953</Height>
<Position>16.000000,16.000000,0.000000</Position>
<Anchor>15</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Mid_M.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
<XuiImage>
<Properties>
<Id>Mid_L</Id>
<Width>16.000000</Width>
<Height>262.001953</Height>
<Position>0.000000,16.000000,0.000000</Position>
<Anchor>11</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Mid_L.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
</XuiGroup>
<XuiLabel>
<Properties>
<Id>XuiDifficultyText</Id>
<Width>500.000000</Width>
<Height>90.000000</Height>
<Position>-89.999992,298.000000,0.000000</Position>
<Visual>TipPanel</Visual>
</Properties>
</XuiLabel>
<XuiScene>
<Properties>
<Id>XuiSliderDifficulty</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,246.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiShowOnMaps</NavUp>
<NavDown>XuiSliderMusic\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<Text>Difficulty:</Text>
<RangeMax>3</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>Logo</Id>
<Width>640.000000</Width>
<Height>70.000000</Height>
<Position>0.000000,48.000000,0.000000</Position>
<DesignTime>true</DesignTime>
<Visual>MenuTitleLogo</Visual>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderSensitivity</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,130.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderGamma\XuiSlider</NavUp>
<NavDown>XuiSplitScreen</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<Text>Sensitivity:</Text>
<RangeMax>200</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiShowOnMaps</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,220.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiViewBob</NavUp>
<NavDown>XuiSliderDifficulty\XuiSlider</NavDown>
<Text>Visible On Maps</Text>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiViewBob</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,194.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiSplitScreen</NavUp>
<NavDown>XuiShowOnMaps</NavDown>
<Text>View Bobbing</Text>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiSplitScreen</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,170.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiSliderSensitivity\XuiSlider</NavUp>
<NavDown>XuiViewBob</NavDown>
<Text>2 Player Split-screen Vertical</Text>
</Properties>
</XuiCheckbox>
<XuiScene>
<Properties>
<Id>XuiSliderGamma</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000000,90.000000,0.000000</Position>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderSound\XuiSlider</NavUp>
<NavDown>XuiSliderSensitivity\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderSound</NavUp>
<NavDown>XuiSliderSensitivity</NavDown>
<Text>Gamma:</Text>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderSound</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,50.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderMusic\XuiSlider</NavUp>
<NavDown>XuiSliderGamma\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderMusic</NavUp>
<NavDown>XuiSliderGamma</NavDown>
<Text>Sound:</Text>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderMusic</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,10.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderDifficulty\XuiSlider</NavUp>
<NavDown>XuiSliderSound\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<Text>Music:</Text>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>320.000000</Width>
<Height>70.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_All_small.xui
+310 -55
View File
@@ -7,76 +7,331 @@
<Properties>
<Id>SceneSettings</Id>
<Width>320.000000</Width>
<Height>263.000000</Height>
<Position>160.000000,10.000000,0.000000</Position>
<Height>247.000000</Height>
<Position>160.000000,30.000000,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsAll</ClassOverride>
<Visual>XuiBlankScene</Visual>
<DefaultFocus>XuiButtonOptions</DefaultFocus>
<DefaultFocus>XuiSliderMusic</DefaultFocus>
</Properties>
<XuiButton>
<XuiGroup>
<Properties>
<Id>XuiButtonResetToDefaults</Id>
<Width>297.000000</Width>
<Height>40.000000</Height>
<Position>11.000000,236.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavUp>XuiButtonUI</NavUp>
<Id>graphic_groupbackground</Id>
<Width>332.000000</Width>
<Height>271.000000</Height>
<Position>-6.000000,-6.000000,0.000000</Position>
<Anchor>15</Anchor>
</Properties>
</XuiButton>
<XuiButton>
<XuiImage>
<Properties>
<Id>XuiButtonUI</Id>
<Width>297.000000</Width>
<Height>40.000000</Height>
<Position>11.000000,190.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavUp>XuiButtonGraphics</NavUp>
<NavDown>XuiButtonResetToDefaults</NavDown>
<Id>Bot_R</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Position>316.344849,255.001953,0.000000</Position>
<Anchor>12</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Bot_R.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonGraphics</Id>
<Width>297.000000</Width>
<Height>40.000000</Height>
<Position>11.000000,144.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavUp>XuiButtonControl</NavUp>
<NavDown>XuiButtonUI</NavDown>
<Id>Bot_M</Id>
<Width>300.344849</Width>
<Height>16.000000</Height>
<Position>16.000000,255.001953,0.000000</Position>
<Anchor>13</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Bot_M.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonControl</Id>
<Width>297.000000</Width>
<Height>40.000000</Height>
<Position>11.000000,98.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavUp>XuiButtonAudio</NavUp>
<NavDown>XuiButtonGraphics</NavDown>
<Id>Bot_L</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Position>0.000000,255.001953,0.000000</Position>
<Anchor>9</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Bot_L.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonAudio</Id>
<Width>297.000000</Width>
<Height>40.000000</Height>
<Position>11.000000,52.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavUp>XuiButtonOptions</NavUp>
<NavDown>XuiButtonControl</NavDown>
<Id>Top_R</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Position>316.344849,0.000000,0.000000</Position>
<Anchor>6</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Top_R.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
<XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>XuiButtonOptions</Id>
<Width>297.000000</Width>
<Height>40.000000</Height>
<Position>11.000000,6.000000,0.000000</Position>
<Visual>XuiMainMenuButton_L</Visual>
<NavDown>XuiButtonAudio</NavDown>
<Id>Top_M</Id>
<Width>300.344849</Width>
<Height>16.000000</Height>
<Position>16.000000,0.000000,0.000000</Position>
<Anchor>7</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Top_M.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiButton>
</XuiImage>
<XuiImage>
<Properties>
<Id>Top_L</Id>
<Width>16.000000</Width>
<Height>16.000000</Height>
<Anchor>3</Anchor>
<ImagePath>Graphics\PanelsAndTabs\Panel_Top_L.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
<XuiImage>
<Properties>
<Id>Mid_R</Id>
<Width>16.000000</Width>
<Height>239.001953</Height>
<Position>316.344849,16.000000,0.000000</Position>
<Anchor>14</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Mid_R.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
<XuiImage>
<Properties>
<Id>Mid_M</Id>
<Width>300.344849</Width>
<Height>239.001953</Height>
<Position>16.000000,16.000000,0.000000</Position>
<Anchor>15</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Mid_M.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
<XuiImage>
<Properties>
<Id>Mid_L</Id>
<Width>16.000000</Width>
<Height>239.001953</Height>
<Position>0.000000,16.000000,0.000000</Position>
<Anchor>11</Anchor>
<SizeMode>4</SizeMode>
<ImagePath>Graphics\PanelsAndTabs\Panel_Mid_L.png</ImagePath>
<BrushFlags>48</BrushFlags>
</Properties>
</XuiImage>
</XuiGroup>
<XuiLabel>
<Properties>
<Id>XuiDifficultyText</Id>
<Width>540.000000</Width>
<Height>110.000000</Height>
<Position>-109.999969,345.000000,0.000000</Position>
<Show>false</Show>
<Visual>TipPanel</Visual>
</Properties>
</XuiLabel>
<XuiScene>
<Properties>
<Id>XuiSliderDifficulty</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,222.000000,0.000000</Position>
<Anchor>5</Anchor>
<Show>false</Show>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiViewBob</NavUp>
<NavDown>XuiSliderMusic\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<Text>Difficulty:</Text>
<RangeMax>3</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderSensitivity</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,129.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderGamma\XuiSlider</NavUp>
<NavDown>XuiSplitScreen</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<Text>Sensitivity:</Text>
<RangeMax>200</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiShowOnMaps</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,230.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiViewBob</NavUp>
<NavDown>XuiSliderMusic\XuiSlider</NavDown>
<Text>Visible On Maps</Text>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiViewBob</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,202.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiSplitScreen</NavUp>
<NavDown>XuiShowOnMaps</NavDown>
<Text>View Bobbing</Text>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiSplitScreen</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,174.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiSliderSensitivity\XuiSlider</NavUp>
<NavDown>XuiViewBob</NavDown>
<Text>2 Player Split-screen Vertical</Text>
</Properties>
</XuiCheckbox>
<XuiScene>
<Properties>
<Id>XuiSliderGamma</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000000,89.000000,0.000000</Position>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderSound\XuiSlider</NavUp>
<NavDown>XuiSliderSensitivity\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderSound</NavUp>
<NavDown>XuiSliderSensitivity</NavDown>
<Text>Gamma:</Text>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderSound</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,49.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderMusic\XuiSlider</NavUp>
<NavDown>XuiSliderGamma\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderMusic</NavUp>
<NavDown>XuiSliderGamma</NavDown>
<Text>Sound:</Text>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderMusic</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,9.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderDifficulty\XuiSlider</NavUp>
<NavDown>XuiSliderSound\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<Text>Music:</Text>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>320.000000</Width>
<Height>70.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_Audio.xui
-81
View File
@@ -1,81 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>1280.000000</Width>
<Height>720.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsAudio</Id>
<Width>330.000000</Width>
<Height>106.000000</Height>
<Position>474.000000,250.000000,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsAudio</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiSliderMusic\XuiSlider</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderSound</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000031,56.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderMusic\XuiSlider</NavUp>
<NavDown>XuiSliderGamma\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderMusic</NavUp>
<NavDown>XuiSliderGamma</NavDown>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderMusic</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000031,12.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiButtonOptions</NavUp>
<NavDown>XuiSliderSound\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>520.000000</Width>
<Height>70.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_Audio_480.xui
-76
View File
@@ -1,76 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>640.000000</Width>
<Height>480.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsAudio</Id>
<Width>320.000000</Width>
<Height>108.000000</Height>
<Position>160.000031,180.000000,0.000000</Position>
<ClassOverride>CScene_SettingsAudio</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiSliderMusic\XuiSlider</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderSound</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,57.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderMusic\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderMusic</NavUp>
<NavDown>XuiSliderGamma</NavDown>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderMusic</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,12.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavDown>XuiSliderSound\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>320.000000</Width>
<Height>70.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_Audio_small.xui
-79
View File
@@ -1,79 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>640.000000</Width>
<Height>360.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsAudio</Id>
<Width>320.000000</Width>
<Height>120.000000</Height>
<Position>160.000000,74.000000,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsAudio</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiSliderMusic\XuiSlider</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderSound</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,61.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderMusic\XuiSlider</NavUp>
<NavDown>XuiSliderGamma\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderMusic</NavUp>
<NavDown>XuiSliderGamma</NavDown>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderMusic</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,16.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiButtonOptions</NavUp>
<NavDown>XuiSliderSound\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>320.000000</Width>
<Height>70.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_Control.xui
-78
View File
@@ -1,78 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>1280.000000</Width>
<Height>720.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsControl</Id>
<Width>330.000000</Width>
<Height>106.000000</Height>
<Position>474.000000,307.000000,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsControl</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiSliderSensitivityInGame\XuiSlider</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderSensitivityInMenu</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000031,56.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderSensitivityInGame\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<RangeMax>200</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderSensitivityInGame</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000031,12.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavDown>XuiSliderSensitivityInMenu\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<RangeMax>200</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_Control_480.xui
-75
View File
@@ -1,75 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>640.000000</Width>
<Height>480.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsControl</Id>
<Width>320.000000</Width>
<Height>106.000000</Height>
<Position>160.000031,187.000015,0.000000</Position>
<ClassOverride>CScene_SettingsControl</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiSliderSensitivityInGame\XuiSlider</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderSensitivityInMenu</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,55.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderSensitivityInGame\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<RangeMax>200</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderSensitivityInGame</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,10.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavDown>XuiSliderSensitivityInMenu\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<RangeMax>200</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_Control_small.xui
-76
View File
@@ -1,76 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>640.000000</Width>
<Height>360.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsControl</Id>
<Width>320.000000</Width>
<Height>120.000000</Height>
<Position>160.000015,120.000015,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsControl</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiSliderSensitivityInGame\XuiSlider</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderSensitivityInMenu</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,55.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderSensitivityInGame\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<RangeMax>200</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderSensitivityInGame</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000031,10.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavDown>XuiSliderSensitivityInMenu\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<RangeMax>200</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_Graphics.xui
-112
View File
@@ -1,112 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>1280.000000</Width>
<Height>720.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsGraphics</Id>
<Width>330.000000</Width>
<Height>222.000000</Height>
<Position>474.000000,249.000015,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsGraphics</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiClouds</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderInterfaceOpacity</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000000,168.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderGamma\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderGamma</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000000,124.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiCustomSkinAnim</NavUp>
<NavDown>XuiSliderInterfaceOpacity\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderSound</NavUp>
<NavDown>XuiSliderSensitivity</NavDown>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiCustomSkinAnim</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,84.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiBedrockFog</NavUp>
<NavDown>XuiSliderGamma\XuiSlider</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiBedrockFog</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,48.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiClouds</NavUp>
<NavDown>XuiCustomSkinAnim</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiClouds</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,12.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavDown>XuiBedrockFog</NavDown>
</Properties>
</XuiCheckbox>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_Graphics_480.xui
-111
View File
@@ -1,111 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>640.000000</Width>
<Height>480.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsGraphics</Id>
<Width>320.000000</Width>
<Height>192.000000</Height>
<Position>160.000000,144.000015,0.000000</Position>
<ClassOverride>CScene_SettingsGraphics</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiClouds</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderInterfaceOpacity</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000000,138.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderGamma\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderGamma</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000000,94.000000,0.000000</Position>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiCustomSkinAnim</NavUp>
<NavDown>XuiSliderInterfaceOpacity\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderSound</NavUp>
<NavDown>XuiSliderSensitivity</NavDown>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiCustomSkinAnim</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,62.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiBedrockFog</NavUp>
<NavDown>XuiSliderGamma\XuiSlider</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiBedrockFog</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,38.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiClouds</NavUp>
<NavDown>XuiCustomSkinAnim</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiClouds</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,14.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavDown>XuiBedrockFog</NavDown>
</Properties>
</XuiCheckbox>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_Graphics_small.xui
-112
View File
@@ -1,112 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>640.000000</Width>
<Height>360.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsGraphics</Id>
<Width>320.000000</Width>
<Height>224.000000</Height>
<Position>160.000000,68.000015,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsGraphics</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiClouds</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderInterfaceOpacity</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000000,158.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderGamma\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderGamma</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000000,112.000000,0.000000</Position>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiCustomSkinAnim</NavUp>
<NavDown>XuiSliderInterfaceOpacity\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderSound</NavUp>
<NavDown>XuiSliderSensitivity</NavDown>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiCustomSkinAnim</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,68.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiBedrockFog</NavUp>
<NavDown>XuiSliderGamma\XuiSlider</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiBedrockFog</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,38.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiClouds</NavUp>
<NavDown>XuiCustomSkinAnim</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiClouds</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,8.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavDown>XuiBedrockFog</NavDown>
</Properties>
</XuiCheckbox>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_UI.xui
-152
View File
@@ -1,152 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>1280.000000</Width>
<Height>720.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsUI</Id>
<Width>330.000000</Width>
<Height>328.000000</Height>
<Position>474.000000,214.000000,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsUI</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiDisplayHUD</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderUISizeSplitscreen</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000000,274.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderUISize\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<RangeMin>1</RangeMin>
<RangeMax>3</RangeMax>
<Value>1</Value>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderUISize</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000000,230.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiShowSplitscreenGamertags</NavUp>
<NavDown>XuiSliderUISizeSplitscreen\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderSound</NavUp>
<NavDown>XuiSliderSensitivity</NavDown>
<RangeMin>1</RangeMin>
<RangeMax>3</RangeMax>
<Value>1</Value>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiShowSplitscreenGamertags</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,188.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiSplitScreen</NavUp>
<NavDown>XuiSliderUISize\XuiSlider</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiSplitScreen</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,156.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiShowAnimatedCharacter</NavUp>
<NavDown>XuiShowSplitscreenGamertags</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiShowAnimatedCharacter</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,120.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiDisplayDeathMessages</NavUp>
<NavDown>XuiSplitScreen</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiDisplayDeathMessages</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,84.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiDisplayHand</NavUp>
<NavDown>XuiShowAnimatedCharacter</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiDisplayHand</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,48.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiDisplayHUD</NavUp>
<NavDown>XuiDisplayDeathMessages</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiDisplayHUD</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,12.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavDown>XuiDisplayHand</NavDown>
<NavTabForward>XuiDisplayHand</NavTabForward>
</Properties>
</XuiCheckbox>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_UI_480.xui
-157
View File
@@ -1,157 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>640.000000</Width>
<Height>480.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsUI</Id>
<Width>320.000000</Width>
<Height>250.000000</Height>
<Position>160.000000,134.000000,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsUI</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiDisplayHUD</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderUISizeSplitscreen</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000000,204.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderUISize\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<RangeMin>1</RangeMin>
<RangeMax>3</RangeMax>
<Value>1</Value>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderUISize</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000000,162.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiShowSplitscreenGamertags</NavUp>
<NavDown>XuiSliderUISizeSplitscreen\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderSound</NavUp>
<NavDown>XuiSliderSensitivity</NavDown>
<RangeMin>1</RangeMin>
<RangeMax>3</RangeMax>
<Value>1</Value>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiShowSplitscreenGamertags</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,136.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiSplitScreen</NavUp>
<NavDown>XuiSliderUISize\XuiSlider</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiSplitScreen</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,112.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiShowAnimatedCharacter</NavUp>
<NavDown>XuiShowSplitscreenGamertags</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiShowAnimatedCharacter</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,88.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiDisplayDeathMessages</NavUp>
<NavDown>XuiSplitScreen</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiDisplayDeathMessages</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,64.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiDisplayHand</NavUp>
<NavDown>XuiShowAnimatedCharacter</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiDisplayHand</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,40.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiDisplayHUD</NavUp>
<NavDown>XuiDisplayDeathMessages</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiDisplayHUD</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,16.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavDown>XuiDisplayHand</NavDown>
</Properties>
</XuiCheckbox>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_UI_small.xui
-157
View File
@@ -1,157 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>640.000000</Width>
<Height>360.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsUI</Id>
<Width>320.000000</Width>
<Height>294.000000</Height>
<Position>160.000000,10.000000,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsUI</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiDisplayHUD</DefaultFocus>
</Properties>
<XuiScene>
<Properties>
<Id>XuiSliderUISizeSplitscreen</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000000,242.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderUISize\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<RangeMin>1</RangeMin>
<RangeMax>3</RangeMax>
<Value>1</Value>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderUISize</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>6.000000,196.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiShowSplitscreenGamertags</NavUp>
<NavDown>XuiSliderUISizeSplitscreen\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<NavLeft>SchemeList</NavLeft>
<NavUp>XuiSliderSound</NavUp>
<NavDown>XuiSliderSensitivity</NavDown>
<RangeMin>1</RangeMin>
<RangeMax>3</RangeMax>
<Value>1</Value>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiShowSplitscreenGamertags</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,164.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiSplitScreen</NavUp>
<NavDown>XuiSliderUISize\XuiSlider</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiSplitScreen</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,134.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiShowAnimatedCharacter</NavUp>
<NavDown>XuiShowSplitscreenGamertags</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiShowAnimatedCharacter</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,104.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiDisplayDeathMessages</NavUp>
<NavDown>XuiSplitScreen</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiDisplayDeathMessages</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,74.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiDisplayHand</NavUp>
<NavDown>XuiShowAnimatedCharacter</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiDisplayHand</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,44.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiDisplayHUD</NavUp>
<NavDown>XuiDisplayDeathMessages</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiDisplayHUD</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,14.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavDown>XuiDisplayHand</NavDown>
</Properties>
</XuiCheckbox>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_options.xui
-144
View File
@@ -1,144 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>1280.000000</Width>
<Height>720.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsOptions</Id>
<Width>330.000000</Width>
<Height>266.000000</Height>
<Position>474.000000,250.000000,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsOptions</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiViewBob</DefaultFocus>
</Properties>
<XuiLabel>
<Properties>
<Id>XuiDifficultyText</Id>
<Width>900.000000</Width>
<Height>100.000000</Height>
<Position>-285.000000,275.000000,0.000000</Position>
<Anchor>16</Anchor>
<Visual>TipPanel</Visual>
</Properties>
</XuiLabel>
<XuiScene>
<Properties>
<Id>XuiSliderDifficulty</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000000,214.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderAutosave\XuiSlider</NavUp>
<NavDown>XuiSliderMusic\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<RangeMax>3</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderAutosave</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>12.000000,170.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiMashUpWorlds</NavUp>
<NavDown>XuiSliderDifficulty\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<RangeMax>8</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiMashUpWorlds</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,132.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiInGameGamertags</NavUp>
<NavDown>XuiSliderAutosave\XuiSlider</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiInGameGamertags</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,102.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiShowTooltips</NavUp>
<NavDown>XuiMashUpWorlds</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiShowTooltips</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,72.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiShowHints</NavUp>
<NavDown>XuiInGameGamertags</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiShowHints</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,42.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavUp>XuiViewBob</NavUp>
<NavDown>XuiShowTooltips</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiViewBob</Id>
<Width>300.000000</Width>
<Height>32.000000</Height>
<Position>14.000000,12.000000,0.000000</Position>
<Anchor>5</Anchor>
<NavDown>XuiShowHints</NavDown>
</Properties>
</XuiCheckbox>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_options_480.xui
-146
View File
@@ -1,146 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>640.000000</Width>
<Height>480.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsOptions</Id>
<Width>320.000000</Width>
<Height>230.000000</Height>
<Position>160.000000,120.000000,0.000000</Position>
<ClassOverride>CScene_SettingsOptions</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiViewBob</DefaultFocus>
</Properties>
<XuiLabel>
<Properties>
<Id>XuiDifficultyText</Id>
<Width>512.000000</Width>
<Height>62.000000</Height>
<Position>-104.000000,234.000000,0.000000</Position>
<Visual>TipPanel</Visual>
</Properties>
</XuiLabel>
<XuiScene>
<Properties>
<Id>XuiSliderDifficulty</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>8.000000,180.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderAutosave\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<RangeMax>3</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderAutosave</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Position>8.000000,138.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiMashUpWorlds</NavUp>
<NavDown>XuiSliderDifficulty\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>306.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<RangeMax>8</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiMashUpWorlds</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,110.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiInGameGamertags</NavUp>
<NavDown>XuiSliderAutosave\XuiSlider</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiInGameGamertags</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,86.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiShowTooltips</NavUp>
<NavDown>XuiMashUpWorlds</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiShowTooltips</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,62.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiShowHints</NavUp>
<NavDown>XuiInGameGamertags</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiShowHints</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,38.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiViewBob</NavUp>
<NavDown>XuiShowTooltips</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiViewBob</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,14.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavDown>XuiShowHints</NavDown>
</Properties>
</XuiCheckbox>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/XUI/xuiscene_settings_options_small.xui
-148
View File
@@ -1,148 +0,0 @@
<XuiCanvas version="000c">
<Properties>
<Width>640.000000</Width>
<Height>360.000000</Height>
</Properties>
<XuiScene>
<Properties>
<Id>SceneSettingsOptions</Id>
<Width>320.000000</Width>
<Height>250.000000</Height>
<Position>160.000000,69.000015,0.000000</Position>
<Anchor>16</Anchor>
<ClassOverride>CScene_SettingsOptions</ClassOverride>
<Visual>GraphicPanel</Visual>
<DefaultFocus>XuiViewBob</DefaultFocus>
</Properties>
<XuiLabel>
<Properties>
<Id>XuiDifficultyText</Id>
<Width>540.000000</Width>
<Height>110.000000</Height>
<Position>-109.999969,254.000000,0.000000</Position>
<Show>false</Show>
<Visual>TipPanel</Visual>
</Properties>
</XuiLabel>
<XuiScene>
<Properties>
<Id>XuiSliderDifficulty</Id>
<Width>300.000000</Width>
<Height>38.000000</Height>
<Position>9.000000,192.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiSliderAutosave\XuiSlider</NavUp>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>300.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<RangeMax>3</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiScene>
<Properties>
<Id>XuiSliderAutosave</Id>
<Width>300.000000</Width>
<Height>38.000000</Height>
<Position>9.000000,150.000000,0.000000</Position>
<Anchor>5</Anchor>
<ClassOverride>CXuiCtrlSliderWrapper</ClassOverride>
<Visual>XuiSliderWrapper</Visual>
<NavUp>XuiMashUpWorlds</NavUp>
<NavDown>XuiSliderDifficulty\XuiSlider</NavDown>
<DefaultFocus>FocusSink</DefaultFocus>
</Properties>
<XuiSlider>
<Properties>
<Id>XuiSlider</Id>
<Width>300.000000</Width>
<Height>38.000000</Height>
<Anchor>5</Anchor>
<Visual>XuiSlider</Visual>
<RangeMax>8</RangeMax>
</Properties>
</XuiSlider>
<XuiControl>
<Properties>
<Id>FocusSink</Id>
<Width>1.000000</Width>
<Height>1.000000</Height>
</Properties>
</XuiControl>
</XuiScene>
<XuiCheckbox>
<Properties>
<Id>XuiMashUpWorlds</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,120.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiInGameGamertags</NavUp>
<NavDown>XuiSliderAutosave\XuiSlider</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiInGameGamertags</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,92.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiShowTooltips</NavUp>
<NavDown>XuiMashUpWorlds</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiShowTooltips</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,64.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiShowHints</NavUp>
<NavDown>XuiInGameGamertags</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiShowHints</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,36.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavUp>XuiViewBob</NavUp>
<NavDown>XuiShowTooltips</NavDown>
</Properties>
</XuiCheckbox>
<XuiCheckbox>
<Properties>
<Id>XuiViewBob</Id>
<Width>300.000000</Width>
<Height>20.000000</Height>
<Position>9.000000,8.000000,0.000000</Position>
<Anchor>5</Anchor>
<Visual>XuiCheckboxSmall</Visual>
<NavDown>XuiShowHints</NavDown>
</Properties>
</XuiCheckbox>
</XuiScene>
</XuiCanvas>
Minecraft.Client/Common/Media/Xbox/Graphics/CraftIcons/icon_armour.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 852 B

After

Width:  |  Height:  |  Size: 3.1 KiB

Minecraft.Client/Common/Media/Xbox/Graphics/CraftIcons/icon_decoration.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 672 B

After

Width:  |  Height:  |  Size: 3.3 KiB

Minecraft.Client/Common/Media/Xbox/Graphics/CraftIcons/icon_food.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 598 B

After

Width:  |  Height:  |  Size: 3.5 KiB

Minecraft.Client/Common/Media/Xbox/Graphics/CraftIcons/icon_mechanisms.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 562 B

After

Width:  |  Height:  |  Size: 4.9 KiB

Minecraft.Client/Common/Media/Xbox/Graphics/CraftIcons/icon_structures.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Minecraft.Client/Common/Media/Xbox/Graphics/CraftIcons/icon_tools.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 961 B

After

Width:  |  Height:  |  Size: 3.4 KiB

Minecraft.Client/Common/Media/Xbox/Graphics/CraftIcons/icon_transport.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 810 B

After

Width:  |  Height:  |  Size: 3.6 KiB

Minecraft.Client/Common/Media/Xbox/Graphics/Logos/mojang.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Minecraft.Client/Common/Media/Xbox/Graphics/MenuTitle.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Minecraft.Client/Common/Media/Xbox/Graphics/Panorama_Background_N.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 83 KiB

After

Width:  |  Height:  |  Size: 88 KiB

Minecraft.Client/Common/Media/Xbox/Graphics/Panorama_Background_S.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 101 KiB

Minecraft.Client/Common/Media/Xbox/Graphics/TutorialExitScreenshot.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 86 KiB

Minecraft.Client/Common/Media/splashes.txt
+13 -21
View File
@@ -1,10 +1,4 @@
Happy birthday, ez!
Happy birthday, Notch!
Merry X-mas!
Happy New Year!
Hobo humping slobo babe!
This text is hard to read if you play the game at the default resolution, but at 1080p it's fine!
As seen on TV!
As seen on TV!
Awesome!
100% pure!
May contain nuts!
@@ -79,6 +73,7 @@ Herregud!
Complex cellular automata!
Yes, sir!
Played by cowboys!
OpenGL 1.2!
Thousands of colors!
Try it!
Age of Wonders is better!
@@ -129,6 +124,7 @@ Falling off cliffs!
150% hyperbole!
Synecdoche!
Let's danec!
Seecret Friday update!
Reference implementation!
Lewd with two dudes with food!
Kiss the sky!
@@ -194,6 +190,7 @@ Gasp!
...!
Bees, bees, bees, bees!
Jag känner en bot!
This text is hard to read if you play the game at the default resolution, but at 1080p it's fine!
Haha, LOL!
Hampsterdance!
Switches and ores!
@@ -232,6 +229,7 @@ Undefeated!
Kinda like Lemmings!
Follow the train, CJ!
Leveraging synergy!
This message will never appear on the splash screen, isn't that weird?
DungeonQuest is unfair!
110813!
90210!
@@ -259,6 +257,7 @@ This is my true form!
Totally forgot about Dre!
Don't bother with the clones!
Pumpkinhead!
Hobo humping slobo babe!
Made by Jeb!
Has an ending!
Finally complete!
@@ -287,6 +286,13 @@ From the streets of Södermalm!
Technologic!
Funk soul brother!
Pumpa kungen!
日本ハロー！
한국 안녕하세요!
Helo Cymru!
Cześć Polska!
你好中国！
Привет Россия!
Γεια σου Ελλάδα!
My life for Aiur!
Lennart lennart = new Lennart();
I see your vocabulary has improved!
@@ -296,17 +302,3 @@ if not ok then return end
§1C§2o§3l§4o§5r§6m§7a§8t§9i§ac
§kFUNKY LOL
SOPA means LOSER in Swedish
Big Pointy Teeth!
Bekarton guards the gate!
Mmmph, mmph!
Don't feed avocados to parrots!
Swords for everyone!
Plz reply to my tweet!
.party()!
Take her pillow!
Put that cookie down!
Pretty scary!
I have a suggestion.
Now with extra hugs!
Almost java 6!
Woah.
Minecraft.Client/Common/XUI/XUI_HUD.cpp
-434
View File
@@ -1,434 +0,0 @@
#include "stdafx.h"
#include "XUI_HUD.h"
#include "..\..\Minecraft.h"
#include "..\..\Gui.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\Random.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.material.h"
HRESULT CXuiSceneHud::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{
m_iPad = *(int *)pInitData->pvInitData;
MapChildControls();
XuiElementGetPosition(m_hObj,&m_OriginalPosition);
m_tickCount = 0;
return S_OK;
}
HRESULT CXuiSceneHud::OnCustomMessage_Splitscreenplayer(bool bJoining, BOOL& bHandled)
{
bHandled=true;
app.ReloadHudScene(m_iPad, bJoining);
return S_OK;
}
HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
{
Minecraft *pMinecraft = Minecraft::GetInstance();
if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return S_OK;
++m_tickCount;
int iGuiScale;
if(pMinecraft->localplayers[m_iPad]->m_iScreenSection == C4JRender::VIEWPORT_TYPE_FULLSCREEN)
{
iGuiScale=app.GetGameSettings(m_iPad,eGameSetting_UISize);
}
else
{
iGuiScale=app.GetGameSettings(m_iPad,eGameSetting_UISizeSplitscreen);
}
int startFrame = 0;
switch(iGuiScale)
{
case 0:
XuiElementFindNamedFrame(m_hObj, L"ScaleSmall", &startFrame);
break;
case 1:
XuiElementFindNamedFrame(m_hObj, L"Normal", &startFrame);
break;
case 2:
XuiElementFindNamedFrame(m_hObj, L"ScaleLarge", &startFrame);
break;
}
if(startFrame >= 0) XuiElementPlayTimeline( m_hObj, startFrame, startFrame, startFrame, FALSE, TRUE);
// Move the whole hud group if we are not in fullscreen
if(pMinecraft->localplayers[m_iPad]->m_iScreenSection != C4JRender::VIEWPORT_TYPE_FULLSCREEN)
{
int iTooltipsYOffset = 0;
// if tooltips are off, set the y offset to zero
if(app.GetGameSettings(m_iPad,eGameSetting_Tooltips)==0)
{
switch(iGuiScale)
{
case 0:
iTooltipsYOffset=28;//screenHeight/10;
break;
case 2:
iTooltipsYOffset=28;//screenHeight/10;
break;
case 1:
default:
iTooltipsYOffset=28;//screenHeight/10;
break;
}
}
float fHeight, fWidth;
GetBounds(&fWidth, &fHeight);
int iSafezoneYHalf = 0;
switch(pMinecraft->localplayers[m_iPad]->m_iScreenSection)
{
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
iSafezoneYHalf = -fHeight/10;// 5% (need to treat the whole screen is 2x this screen)
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
iSafezoneYHalf = (fHeight/2)-(fHeight/10);// 5% (need to treat the whole screen is 2x this screen)
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
iSafezoneYHalf = (fHeight/2)-(fHeight/10);// 5% (need to treat the whole screen is 2x this screen)
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
iSafezoneYHalf = -fHeight/10; // 5% (the whole screen is 2x this screen)
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
iSafezoneYHalf = -fHeight/10; // 5% (the whole screen is 2x this screen)
break;
};
D3DXVECTOR3 pos;
m_hudGroup.GetPosition(&pos);
pos.y = iTooltipsYOffset + iSafezoneYHalf;
m_hudGroup.SetPosition(&pos);
}
// Update inventory
float opacity = 1.0f;
GetOpacity(&opacity);
int selected = pMinecraft->localplayers[m_iPad]->inventory->selected;
for(unsigned int j = 0; j < 9; ++j)
{
m_hotbarIcon[j]->SetSlot(m_hotbarIcon[j]->m_hObj,pMinecraft->localplayers[m_iPad]->inventoryMenu->getSlot(InventoryMenu::USE_ROW_SLOT_START + j));
m_hotbarIcon[j]->SetUserIndex(m_hotbarIcon[j]->m_hObj, m_iPad );
if(j == selected)
{
m_hotbarIcon[j]->SetEnable(FALSE); //Makes the selected overlay display
}
else
{
m_hotbarIcon[j]->SetEnable(TRUE); //Hides the selected overlay display
}
m_hotbarIcon[j]->SetAlpha( m_hotbarIcon[j]->m_hObj, opacity );
}
if (pMinecraft->localgameModes[m_iPad]->canHurtPlayer())
{
m_random.setSeed(m_tickCount * 312871);
// Update health
int heartOffsetIndex = -1;
if (pMinecraft->localplayers[m_iPad]->hasEffect(MobEffect::regeneration))
{
heartOffsetIndex = m_tickCount % 25;
}
bool blink = pMinecraft->localplayers[m_iPad]->invulnerableTime / 3 % 2 == 1;
if (pMinecraft->localplayers[m_iPad]->invulnerableTime < 10) blink = false;
int iHealth = pMinecraft->localplayers[m_iPad]->getHealth();
int iLastHealth = pMinecraft->localplayers[m_iPad]->lastHealth;
bool bHasPoison = pMinecraft->localplayers[m_iPad]->hasEffect(MobEffect::poison);
for (int icon = 0; icon < Player::MAX_HEALTH / 2; icon++)
{
if(blink)
{
if (icon * 2 + 1 < iLastHealth || icon * 2 + 1 < iHealth)
{
// Full
if(bHasPoison)
{
m_healthIcon[icon].PlayVisualRange(L"FullPoisonFlash",NULL,L"FullPoisonFlash");
}
else
{
m_healthIcon[icon].PlayVisualRange(L"FullFlash",NULL,L"FullFlash");
}
}
else if (icon * 2 + 1 == iLastHealth || icon * 2 + 1 == iHealth)
{
// Half
if(bHasPoison)
{
m_healthIcon[icon].PlayVisualRange(L"HalfPoisonFlash",NULL,L"HalfPoisonFlash");
}
else
{
m_healthIcon[icon].PlayVisualRange(L"HalfFlash",NULL,L"HalfFlash");
}
}
else
{
// Empty
m_healthIcon[icon].PlayVisualRange(L"NormalFlash",NULL,L"NormalFlash");
}
}
else
{
if (icon * 2 + 1 < iHealth)
{
// Full
if(bHasPoison)
{
m_healthIcon[icon].PlayVisualRange(L"FullPoison",NULL,L"FullPoison");
}
else
{
m_healthIcon[icon].PlayVisualRange(L"Full",NULL,L"Full");
}
}
else if (icon * 2 + 1 == iHealth)
{
// Half
if(bHasPoison)
{
m_healthIcon[icon].PlayVisualRange(L"HalfPoison",NULL,L"HalfPoison");
}
else
{
m_healthIcon[icon].PlayVisualRange(L"Half",NULL,L"Half");
}
}
else
{
// Empty
m_healthIcon[icon].PlayVisualRange(L"Normal",NULL,L"Normal");
}
}
float yo = 0;
if (iHealth <= 4)
{
yo = (float)m_random.nextInt(2) * (iGuiScale+1);
}
if (icon == heartOffsetIndex)
{
yo = -2.0f * (iGuiScale+1);
}
D3DXVECTOR3 pos;
m_healthIcon[icon].GetPosition(&pos);
// TODO - 4J Stu - This should be scaled based on gui scale and overall size (ie full, split or 480)
pos.y = yo;
m_healthIcon[icon].SetPosition(&pos);
}
// Update food
bool foodBlink = false;
FoodData *foodData = pMinecraft->localplayers[m_iPad]->getFoodData();
int food = foodData->getFoodLevel();
int oldFood = foodData->getLastFoodLevel();
bool hasHungerEffect = pMinecraft->localplayers[m_iPad]->hasEffect(MobEffect::hunger);
int saturationLevel = pMinecraft->localplayers[m_iPad]->getFoodData()->getSaturationLevel();
for (int icon = 0; icon < 10; icon++)
{
if(foodBlink)
{
if (icon * 2 + 1 < oldFood || icon * 2 + 1 < food)
{
// Full
if(hasHungerEffect)
{
m_foodIcon[icon].PlayVisualRange(L"FullPoisonFlash",NULL,L"FullPoisonFlash");
}
else
{
m_foodIcon[icon].PlayVisualRange(L"FullFlash",NULL,L"FullFlash");
}
}
else if (icon * 2 + 1 == oldFood || icon * 2 + 1 == food)
{
// Half
if(hasHungerEffect)
{
m_foodIcon[icon].PlayVisualRange(L"HalfPoisonFlash",NULL,L"HalfPoisonFlash");
}
else
{
m_foodIcon[icon].PlayVisualRange(L"HalfFlash",NULL,L"HalfFlash");
}
}
else
{
// Empty
m_foodIcon[icon].PlayVisualRange(L"NormalFlash",NULL,L"NormalFlash");
}
}
else
{
if (icon * 2 + 1 < food)
{
// Full
if(hasHungerEffect)
{
m_foodIcon[icon].PlayVisualRange(L"FullPoison",NULL,L"FullPoison");
}
else
{
m_foodIcon[icon].PlayVisualRange(L"Full",NULL,L"Full");
}
}
else if (icon * 2 + 1 == food)
{
// Half
if(hasHungerEffect)
{
m_foodIcon[icon].PlayVisualRange(L"HalfPoison",NULL,L"HalfPoison");
}
else
{
m_foodIcon[icon].PlayVisualRange(L"Half",NULL,L"Half");
}
}
else
{
// Empty
if(hasHungerEffect)
{
m_foodIcon[icon].PlayVisualRange(L"NormalPoison",NULL,L"NormalPoison");
}
else
{
m_foodIcon[icon].PlayVisualRange(L"Normal",NULL,L"Normal");
}
}
}
float yo = 0;
if (saturationLevel <= 0)
{
if ((m_tickCount % (food * 3 + 1)) == 0)
{
yo = (float)(m_random.nextInt(3) - 1) * (iGuiScale+1);
}
}
D3DXVECTOR3 pos;
m_foodIcon[icon].GetPosition(&pos);
// TODO - 4J Stu - This should be scaled based on gui scale and overall size (ie full, split or 480)
pos.y = yo;
m_foodIcon[icon].SetPosition(&pos);
}
// Update armour
int armor = pMinecraft->localplayers[m_iPad]->getArmorValue();
if(armor > 0)
{
m_armourGroup.SetShow(TRUE);
for (int icon = 0; icon < 10; icon++)
{
if (icon * 2 + 1 < armor) m_armourIcon[icon].PlayVisualRange(L"Full",NULL,L"Full");
else if (icon * 2 + 1 == armor) m_armourIcon[icon].PlayVisualRange(L"Half",NULL,L"Half");
else if (icon * 2 + 1 > armor) m_armourIcon[icon].PlayVisualRange(L"Normal",NULL,L"Normal");
}
}
else
{
m_armourGroup.SetShow(FALSE);
}
// Update air
if (pMinecraft->localplayers[m_iPad]->isUnderLiquid(Material::water))
{
m_airGroup.SetShow(TRUE);
int count = (int) ceil((pMinecraft->localplayers[m_iPad]->getAirSupply() - 2) * 10.0f / Player::TOTAL_AIR_SUPPLY);
int extra = (int) ceil((pMinecraft->localplayers[m_iPad]->getAirSupply()) * 10.0f / Player::TOTAL_AIR_SUPPLY) - count;
for (int icon = 0; icon < 10; icon++)
{
// Air bubbles
if (icon < count)
{
m_airIcon[icon].SetShow(TRUE);
m_airIcon[icon].PlayVisualRange(L"Bubble",NULL,L"Bubble");
}
else if(icon < count + extra)
{
m_airIcon[icon].SetShow(TRUE);
m_airIcon[icon].PlayVisualRange(L"Pop",NULL,L"Pop");
}
else m_airIcon[icon].SetShow(FALSE);
}
}
else
{
m_airGroup.SetShow(FALSE);
}
}
else
{
m_healthGroup.SetShow(FALSE);
m_foodGroup.SetShow(FALSE);
m_armourGroup.SetShow(FALSE);
m_airGroup.SetShow(FALSE);
}
return S_OK;
}
HRESULT CXuiSceneHud::OnCustomMessage_DLCInstalled()
{
// mounted DLC may have changed
bool bPauseMenuDisplayed=false;
bool bInGame=(Minecraft::GetInstance()->level!=NULL);
// ignore this if we have menus up - they'll deal with it
for(int i=0;i<XUSER_MAX_COUNT;i++)
{
if(app.IsPauseMenuDisplayed(i))
{
bPauseMenuDisplayed=true;
break;
}
}
if(bInGame && !bPauseMenuDisplayed)
{
app.StartInstallDLCProcess(ProfileManager.GetPrimaryPad());
}
// this will send a CustomMessage_DLCMountingComplete when done
return S_OK;
}
HRESULT CXuiSceneHud::OnCustomMessage_DLCMountingComplete()
{
// A join from invite may have installed the trial pack during the game.
// Need to switch to the texture pack if it's not being used yet, and turn off background downloads
// what texture pack are we using?
// TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
// if(tPack->getDLCParentPackId()!=app.GetRequiredTexturePackID())
// {
// app.DebugPrintf("DLC install finished, and the game is using a texture pack that isn't the required one\n");
// }
return S_OK;
}
Minecraft.Client/Common/XUI/XUI_HUD.h
-125
View File
@@ -1,125 +0,0 @@
#pragma once
#include "../Media/XUI/xuiscene_hud.h"
#include "XUI_CustomMessages.h"
#define CHAT_LINES_COUNT 10
class CXuiSceneHud : public CXuiSceneImpl
{
private:
Random m_random;
int m_tickCount;
protected:
CXuiControl m_hudHolder; // Contains the HUD group to enable moving all elements together
CXuiControl m_hudGroup; // Contains all the HUD elements except crosshair, in a group that scales
CXuiControl m_hudScaleGroup; // Contains all the HUD elements except crosshair
CXuiControl m_hotbarGroup;
CXuiCtrlSlotItem *m_hotbarIcon[9];
CXuiControl m_healthGroup;
CXuiControl m_healthIcon[10];
CXuiControl m_armourGroup;
CXuiControl m_armourIcon[10];
CXuiControl m_foodGroup;
CXuiControl m_foodIcon[10];
CXuiControl m_airGroup;
CXuiControl m_airIcon[10];
D3DXVECTOR3 m_OriginalPosition;
int m_iPad;
// Message map. Here we tie messages to message handlers.
XUI_BEGIN_MSG_MAP()
XUI_ON_XM_INIT( OnInit )
XUI_ON_XM_SPLITSCREENPLAYER_MESSAGE(OnCustomMessage_Splitscreenplayer)
XUI_ON_XM_CUSTOMTICKSCENE_MESSAGE(OnCustomMessage_TickScene)
XUI_ON_XM_DLCINSTALLED_MESSAGE(OnCustomMessage_DLCInstalled)
XUI_ON_XM_DLCLOADED_MESSAGE(OnCustomMessage_DLCMountingComplete)
XUI_END_MSG_MAP()
BEGIN_CONTROL_MAP()
MAP_CONTROL(IDC_HudHolder, m_hudHolder)
BEGIN_MAP_CHILD_CONTROLS(m_hudHolder)
MAP_CONTROL(IDC_HudGroup, m_hudGroup)
BEGIN_MAP_CHILD_CONTROLS(m_hudGroup)
MAP_CONTROL(IDC_HudScaleGroup, m_hudScaleGroup)
BEGIN_MAP_CHILD_CONTROLS(m_hudScaleGroup)
MAP_CONTROL(IDC_Hotbar, m_hotbarGroup)
BEGIN_MAP_CHILD_CONTROLS(m_hotbarGroup)
MAP_OVERRIDE(IDC_Inventory1, m_hotbarIcon[0])
MAP_OVERRIDE(IDC_Inventory2, m_hotbarIcon[1])
MAP_OVERRIDE(IDC_Inventory3, m_hotbarIcon[2])
MAP_OVERRIDE(IDC_Inventory4, m_hotbarIcon[3])
MAP_OVERRIDE(IDC_Inventory5, m_hotbarIcon[4])
MAP_OVERRIDE(IDC_Inventory6, m_hotbarIcon[5])
MAP_OVERRIDE(IDC_Inventory7, m_hotbarIcon[6])
MAP_OVERRIDE(IDC_Inventory8, m_hotbarIcon[7])
MAP_OVERRIDE(IDC_Inventory9, m_hotbarIcon[8])
END_MAP_CHILD_CONTROLS()
MAP_CONTROL(IDC_Health, m_healthGroup)
BEGIN_MAP_CHILD_CONTROLS(m_healthGroup)
MAP_CONTROL(IDC_Health0, m_healthIcon[0])
MAP_CONTROL(IDC_Health1, m_healthIcon[1])
MAP_CONTROL(IDC_Health2, m_healthIcon[2])
MAP_CONTROL(IDC_Health3, m_healthIcon[3])
MAP_CONTROL(IDC_Health4, m_healthIcon[4])
MAP_CONTROL(IDC_Health5, m_healthIcon[5])
MAP_CONTROL(IDC_Health6, m_healthIcon[6])
MAP_CONTROL(IDC_Health7, m_healthIcon[7])
MAP_CONTROL(IDC_Health8, m_healthIcon[8])
MAP_CONTROL(IDC_Health9, m_healthIcon[9])
END_MAP_CHILD_CONTROLS()
MAP_CONTROL(IDC_Armour, m_armourGroup)
BEGIN_MAP_CHILD_CONTROLS(m_armourGroup)
MAP_CONTROL(IDC_Armour0, m_armourIcon[0])
MAP_CONTROL(IDC_Armour1, m_armourIcon[1])
MAP_CONTROL(IDC_Armour2, m_armourIcon[2])
MAP_CONTROL(IDC_Armour3, m_armourIcon[3])
MAP_CONTROL(IDC_Armour4, m_armourIcon[4])
MAP_CONTROL(IDC_Armour5, m_armourIcon[5])
MAP_CONTROL(IDC_Armour6, m_armourIcon[6])
MAP_CONTROL(IDC_Armour7, m_armourIcon[7])
MAP_CONTROL(IDC_Armour8, m_armourIcon[8])
MAP_CONTROL(IDC_Armour9, m_armourIcon[9])
END_MAP_CHILD_CONTROLS()
MAP_CONTROL(IDC_Food, m_foodGroup)
BEGIN_MAP_CHILD_CONTROLS(m_foodGroup)
MAP_CONTROL(IDC_Food0, m_foodIcon[0])
MAP_CONTROL(IDC_Food1, m_foodIcon[1])
MAP_CONTROL(IDC_Food2, m_foodIcon[2])
MAP_CONTROL(IDC_Food3, m_foodIcon[3])
MAP_CONTROL(IDC_Food4, m_foodIcon[4])
MAP_CONTROL(IDC_Food5, m_foodIcon[5])
MAP_CONTROL(IDC_Food6, m_foodIcon[6])
MAP_CONTROL(IDC_Food7, m_foodIcon[7])
MAP_CONTROL(IDC_Food8, m_foodIcon[8])
MAP_CONTROL(IDC_Food9, m_foodIcon[9])
END_MAP_CHILD_CONTROLS()
MAP_CONTROL(IDC_Air, m_airGroup)
BEGIN_MAP_CHILD_CONTROLS(m_airGroup)
MAP_CONTROL(IDC_Air0, m_airIcon[0])
MAP_CONTROL(IDC_Air1, m_airIcon[1])
MAP_CONTROL(IDC_Air2, m_airIcon[2])
MAP_CONTROL(IDC_Air3, m_airIcon[3])
MAP_CONTROL(IDC_Air4, m_airIcon[4])
MAP_CONTROL(IDC_Air5, m_airIcon[5])
MAP_CONTROL(IDC_Air6, m_airIcon[6])
MAP_CONTROL(IDC_Air7, m_airIcon[7])
MAP_CONTROL(IDC_Air8, m_airIcon[8])
MAP_CONTROL(IDC_Air9, m_airIcon[9])
END_MAP_CHILD_CONTROLS()
END_MAP_CHILD_CONTROLS()
END_MAP_CHILD_CONTROLS()
END_MAP_CHILD_CONTROLS()
END_CONTROL_MAP()
HRESULT OnInit( XUIMessageInit* pInitData, BOOL& bHandled );
HRESULT OnCustomMessage_Splitscreenplayer(bool bJoining, BOOL& bHandled);
HRESULT OnCustomMessage_TickScene();
HRESULT OnCustomMessage_DLCInstalled();
HRESULT OnCustomMessage_DLCMountingComplete();
public:
// Define the class. The class name must match the ClassOverride property
// set for the scene in the UI Authoring tool.
XUI_IMPLEMENT_CLASS( CXuiSceneHud, L"CXuiSceneHud", XUI_CLASS_SCENE )
};
Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp
-1
View File
@@ -62,7 +62,6 @@ HRESULT CScene_LoadGameSettings::OnInit( XUIMessageInit* pInitData, BOOL& bHandl
// 4J-JEV: Fix for:
// TU12: Content: Gameplay: New "Mass Effect World" remembers and uses the settings of another - lately created - World.
m_MoreOptionsParams.bBonusChest = FALSE;
m_MoreOptionsParams.bFlatWorld = FALSE;
m_MoreOptionsParams.bStructures = TRUE;
Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp
-1
View File
@@ -57,7 +57,6 @@ HRESULT CScene_MultiGameCreate::OnInit( XUIMessageInit* pInitData, BOOL& bHandle
m_MoreOptionsParams.bGenerateOptions=TRUE;
m_MoreOptionsParams.bStructures=TRUE;
m_MoreOptionsParams.bFlatWorld=FALSE;
m_MoreOptionsParams.bBonusChest=FALSE;
m_MoreOptionsParams.bPVP = TRUE;
m_MoreOptionsParams.bTrust = TRUE;
m_MoreOptionsParams.bFireSpreads = TRUE;
Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp
-2
View File
@@ -37,7 +37,6 @@ HRESULT CScene_MultiGameLaunchMoreOptions::OnInit( XUIMessageInit* pInitData, BO
m_CheckboxBonusChest.SetEnable(TRUE);
m_CheckboxStructures.SetCheck(m_params->bStructures);
m_CheckboxFlatWorld.SetCheck (m_params->bFlatWorld);
m_CheckboxBonusChest.SetCheck(m_params->bBonusChest);
// This is a create world, so don't need Reset Nether
float fHeight, fCheckboxHeight, fWidth;
@@ -143,7 +142,6 @@ HRESULT CScene_MultiGameLaunchMoreOptions::OnKeyDown(XUIMessageInput* pInputData
m_params->bStructures = m_CheckboxStructures.IsChecked();
m_params->bFlatWorld = m_CheckboxFlatWorld.IsChecked();
m_params->bBonusChest = m_CheckboxBonusChest.IsChecked();
m_params->bPVP = m_CheckboxPVP.IsChecked();
m_params->bTrust = m_CheckboxTrustPlayers.IsChecked();
m_params->bFireSpreads = m_CheckboxFireSpreads.IsChecked();
Minecraft.Client/Common/XUI/XUI_SettingsAll.h
+1
View File
@@ -40,6 +40,7 @@ protected:
MAP_CONTROL(IDC_XuiViewBob, m_ViewBob)
MAP_CONTROL(IDC_XuiSplitScreen, m_SplitScreen)
MAP_CONTROL(IDC_XuiVisibleOnMaps, m_VisibleOnMaps)
MAP_CONTROL(IDC_XuiDifficultyText, m_DifficultyText)
MAP_CONTROL(IDC_XuiSliderDifficulty, m_SliderA[SLIDER_SETTINGS_DIFFICULTY])
END_CONTROL_MAP()
Minecraft.Client/Gui.cpp
+12 -20
View File
@@ -28,11 +28,7 @@
#include "..\Minecraft.World\LevelChunk.h"
#include "..\Minecraft.World\Biome.h"
#define RENDER_HUD 0
#ifndef _XBOX
#undef RENDER_HUD
#define RENDER_HUD 1
#endif
float Gui::currentGuiBlendFactor = 1.0f; // 4J added
float Gui::currentGuiScaleFactor = 1.0f; // 4J added
@@ -307,21 +303,17 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
shared_ptr<Inventory> inventory = minecraft->player->inventory;
if(bTwoPlayerSplitscreen)
{
// need to apply scale factors depending on the mode
{
const int splitscreenQuickSelectX = iWidthOffset + screenWidth / 2 - quickSelectWidth / 2 - 1;
// 4J Stu - Moved this push and scale further up as we still need to do it for the few HUD components not replaced by xui
//glPushMatrix();
//glScalef(fScaleFactorWidth, fScaleFactorHeight, fScaleFactorWidth);
// 4J-PB - move into the safe zone, and account for 2 player splitscreen
blit(iWidthOffset + (screenWidth - quickSelectWidth)/2, iHeightOffset + screenHeight - iSafezoneYHalf - iTooltipsYOffset , 0, 0, 182, 22);
blit(iWidthOffset + (screenWidth - quickSelectWidth)/2 - 1 + inventory->selected * 20, iHeightOffset + screenHeight - iSafezoneYHalf - iTooltipsYOffset - 1, 0, 22, 24, 22);
blit(splitscreenQuickSelectX, iHeightOffset + screenHeight - iSafezoneYHalf - iTooltipsYOffset , 0, 0, 182, 22);
blit(splitscreenQuickSelectX - 1 + inventory->selected * 20, iHeightOffset + screenHeight - iSafezoneYHalf - iTooltipsYOffset - 1, 0, 22, 24, 22);
}
else
{
blit(iWidthOffset + screenWidth / 2 - quickSelectWidth / 2, iHeightOffset + screenHeight - iSafezoneYHalf - iTooltipsYOffset , 0, 0, 182, 22);
blit(iWidthOffset + screenWidth / 2 - quickSelectWidth / 2 - 1 + inventory->selected * 20, iHeightOffset + screenHeight - iSafezoneYHalf - iTooltipsYOffset - 1, 0, 22, 24, 22);
blit(iWidthOffset + screenWidth / 2 - quickSelectWidth / 2 - 1 + inventory->selected * 20, iHeightOffset + screenHeight - iSafezoneYHalf - iTooltipsYOffset - 1, 0, 22, 24, 22);
}
@@ -335,11 +327,11 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
// 4J Stu - We don't want to adjust the cursor by the safezone, we want it centred
if(bTwoPlayerSplitscreen)
{
blit(iWidthOffset + screenWidth / 2 - 7, (iHeightOffset + screenHeight) / 2 - 7, 0, 0, 16, 16);
blit(iWidthOffset + screenWidth / 2 - 8, (iHeightOffset + screenHeight) / 2 - 8, 0, 0, 16, 16);
}
else
{
blit(screenWidth / 2 - 7, screenHeight / 2 - 7, 0, 0, 16, 16);
blit(screenWidth / 2 - 8, screenHeight / 2 - 8, 0, 0, 16, 16);
}
// if(bTwoPlayerSplitscreen)
@@ -375,12 +367,12 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
// 4J Stu - TODO Work out proper positioning for splitscreen
if(bTwoPlayerSplitscreen)
{
xLeft = iWidthOffset + (screenWidth - quickSelectWidth)/2;
xRight = iWidthOffset + (screenWidth + quickSelectWidth)/2;
xLeft = iWidthOffset + (screenWidth - quickSelectWidth) / 2 - 1;
xRight = iWidthOffset + (screenWidth + quickSelectWidth) / 2;
}
else
{
xLeft = (screenWidth - quickSelectWidth)/2;
xLeft = (screenWidth - quickSelectWidth) / 2;
xRight = (screenWidth + quickSelectWidth) / 2;
}
@@ -500,7 +492,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
// 4J - do render of crouched player. This code is largely taken from the inventory render of the player, with some special hard-coded positions
// worked out by hand from the xui implementation of the crouch icon
if(app.GetGameSettings(iPad,eGameSetting_AnimatedCharacter) && !minecraft->options->renderDebug) //str1k3r - disable paperdoll if "F3" is on screen
if(!minecraft->options->renderDebug) //str1k3r - disable paperdoll if "F3" is on screen
{
//int playerIdx = minecraft->player->GetXboxPad();
@@ -756,7 +748,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glDisable(GL_ALPHA_TEST);
#if RENDER_HUD
#ifndef _XBOX //#if RENDER_HUD
glPushMatrix();
// 4J-PB we need to move this up a bit because we've moved the quick select
//glTranslatef(0, ((float)screenHeight) - 48, 0);
Minecraft.Client/Minecraft.Client.vcxproj
-76
View File
@@ -6303,44 +6303,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="Common\XUI\XUI_HUD.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="Common\XUI\XUI_Scene_Anvil.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
@@ -23352,44 +23314,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Common\XUI\XUI_HUD.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Common\XUI\XUI_Scene_Anvil.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
Minecraft.Client/Minecraft.Client.vcxproj.filters
-6
View File
@@ -2340,9 +2340,6 @@
<ClInclude Include="Orbis\OrbisExtras\OrbisStubs.h">
<Filter>Orbis\OrbisExtras</Filter>
</ClInclude>
<ClInclude Include="Common\XUI\XUI_HUD.h">
<Filter>Xbox\Source Files\XUI\Base Scene</Filter>
</ClInclude>
<ClInclude Include="Common\DLC\DLCUIDataFile.h">
<Filter>Common\Source Files\DLC</Filter>
</ClInclude>
@@ -4727,9 +4724,6 @@
<ClCompile Include="Orbis\OrbisExtras\TLSStorage.cpp">
<Filter>Orbis\OrbisExtras</Filter>
</ClCompile>
<ClCompile Include="Common\XUI\XUI_HUD.cpp">
<Filter>Xbox\Source Files\XUI\Base Scene</Filter>
</ClCompile>
<ClCompile Include="Common\DLC\DLCUIDataFile.cpp">
<Filter>Common\Source Files\DLC</Filter>
</ClCompile>
Minecraft.Client/Xbox/Xbox_App.cpp
+2 -53
View File
@@ -50,7 +50,6 @@
#include "..\Common\XUI\XUI_XZP_Icons.h"
#include "..\Common\XUI\XUI_Controls.h"
#include "..\Common\XUI\XUI_Scene_Win.h"
#include "..\Common\XUI\XUI_HUD.h"
#include "..\Common\XUI\XUI_DebugSetCamera.h"
//#include "..\Common\XUI\XUI_TransferToXboxOne.h"
@@ -160,7 +159,6 @@
#include "..\Common\XUI\XUI_XZP_Icons.h"
#include "..\Common\XUI\XUI_Controls.h"
#include "..\Common\XUI\XUI_Scene_Win.h"
#include "..\Common\XUI\XUI_HUD.h"
#include "..\Common\XUI\XUI_Scene_Anvil.h"
#include "..\Common\XUI\XUI_Scene_Trading.h"
#include "..\Common\XUI\XUI_Teleport.h"
@@ -261,7 +259,6 @@ WCHAR *CConsoleMinecraftApp::wchSceneA[]=
L"xuiscene_enchant",
L"xuiscene_brewingstand",
L"xuiscene_win",
L"xuiscene_hud",
L"xuiscene_trading",
L"xuiscene_anvil",
L"xuiscene_teleportmenu",
@@ -517,8 +514,6 @@ HRESULT CConsoleMinecraftApp::RegisterXuiClasses()
if( FAILED( hr) ) return hr;
hr = CScene_Win::Register();
if( FAILED( hr) ) return hr;
hr = CXuiSceneHud::Register();
if( FAILED( hr) ) return hr;
hr = CXuiSceneAnvil::Register();
if( FAILED( hr) ) return hr;
hr = CXuiSceneTrading::Register();
@@ -563,7 +558,6 @@ HRESULT CConsoleMinecraftApp::UnregisterXuiClasses()
CXuiSceneTrading::Unregister();
CXuiSceneAnvil::Unregister();
// CScene_TransferToXboxOne::Unregister();
CXuiSceneHud::Unregister();
CScene_Win::Unregister();
CXuiCtrlMobEffect::Unregister();
CXuiCtrlEnchantmentButtonText::Unregister();
@@ -960,11 +954,6 @@ HRESULT CConsoleMinecraftApp::LoadXuiResources()
}
m_hCurrentChatScene[idx]=hScene;
XuiElementGetChildById( m_PlayerBaseScene[idx], L"XuiSceneHudRoot", &m_hCurrentHudScene[idx]);
m_hFirstHudScene[idx]=m_hCurrentHudScene[idx];
ReloadHudScene(idx, false, true);
}
// get the "Press START to join in" message
@@ -1718,7 +1707,7 @@ HRESULT CConsoleMinecraftApp::NavigateToScene(int iPad,EUIScene eScene, void *in
CXuiSceneBase::SetPlayerBaseScenePosition( idx, CXuiSceneBase::e_BaseScene_Fullscreen );
}
if( eScene != eUIComponent_TutorialPopup && eScene != eUIComponent_Chat && eScene != eUIScene_HUD )
if( eScene != eUIComponent_TutorialPopup && eScene != eUIComponent_Chat )
{
SetMenuDisplayed(idx,true);
}
@@ -1757,7 +1746,7 @@ HRESULT CConsoleMinecraftApp::NavigateToScene(int iPad,EUIScene eScene, void *in
break;
default:
// some scenes are forced into fullscreen even though we are insplitscreen mode (saving)
if(eScene==eUIComponent_TutorialPopup || eScene==eUIComponent_Chat || eScene==eUIScene_HUD)
if(eScene==eUIComponent_TutorialPopup || eScene==eUIComponent_Chat)
{
hr = XuiSceneCreate(szResourceLocator,app.GetSceneName(eScene,true,bIsSplitscreen), initData, &hScene);
}
@@ -1803,18 +1792,6 @@ HRESULT CConsoleMinecraftApp::NavigateToScene(int iPad,EUIScene eScene, void *in
m_hCurrentChatScene[iPad]=hScene;
}
else if( eScene == eUIScene_HUD )
{
hr = XuiSceneNavigateForward(m_hCurrentHudScene[iPad], FALSE, hScene, XUSER_INDEX_NONE);
if (FAILED(hr))
{
app.DebugPrintf("scene navigate fail");
XuiDestroyObject(hScene);
return hr;
}
m_hCurrentHudScene[iPad]=hScene;
}
else
{
MemSect(5);
@@ -2064,7 +2041,6 @@ HRESULT CConsoleMinecraftApp::CloseAllPlayersXuiScenes()
{
CloseXuiScenes(idx, true);
ReloadChatScene(idx, false, true);
ReloadHudScene(idx, false, true);
}
return hr;
@@ -2296,33 +2272,6 @@ void CConsoleMinecraftApp::ReloadChatScene(int iPad, bool bJoining /*= false*/,
XuiElementSetPosition( m_hCurrentChatScene[iPad], &vPosition );
}
void CConsoleMinecraftApp::ReloadHudScene(int iPad, bool bJoining /*= false*/, bool bForce /*= false*/)
{
if(m_hFirstHudScene[iPad] == NULL || m_hCurrentHudScene[iPad] == NULL) return;
// Re-create the hud scene so it is the correct size. It starts without any visible lines.
BOOL hudSceneVisible = FALSE;
if( m_hFirstHudScene[iPad] != m_hCurrentHudScene[iPad] )
{
hudSceneVisible = XuiElementIsShown(m_hCurrentHudScene[iPad]);
}
int iLocalPlayerC=GetLocalPlayerCount();
// we need to decide whether to close the xui scene or just reposition it
if( bForce ||
(bJoining && iLocalPlayerC==2) ||
(!bJoining && iLocalPlayerC==1) ||
m_hFirstHudScene[iPad] == m_hCurrentHudScene[iPad])
{
if( m_hFirstHudScene[iPad] != m_hCurrentHudScene[iPad] ) XuiSceneNavigateBack(m_hCurrentHudScene[iPad], m_hFirstHudScene[iPad],iPad);
m_hCurrentHudScene[iPad] = m_hFirstHudScene[iPad];
app.NavigateToScene(iPad,eUIScene_HUD,NULL,true);
XuiElementSetShow( m_hCurrentHudScene[iPad], hudSceneVisible);
}
}
void CConsoleMinecraftApp::AdjustSplitscreenScene(HXUIOBJ hScene,D3DXVECTOR3 *pvOriginalPosition, int iPad, bool bAdjustXForSafeArea)
{
D3DXVECTOR3 vec;
Minecraft.Client/Xbox/Xbox_App.h
-1
View File
@@ -144,7 +144,6 @@ public:
D3DXVECTOR3 GetElementScreenPosition(HXUIOBJ hObj);
virtual void SetChatTextDisplayed(int iPad, bool bVal);
virtual void ReloadChatScene(int iPad, bool bJoining = false, bool bForce = false);
virtual void ReloadHudScene(int iPad, bool bJoining = false, bool bForce = false);
bool GetMenuDisplayed(int iPad);
void SetMenuDisplayed(int iPad,bool bVal);
Minecraft.Client/XboxMedia/XZP/Minecraft.xzp
BIN
View File
Binary file not shown.