mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 12:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'menu' into 'master'

Browse Source 
Put the main menu below other windows (bug #5622)

See merge request OpenMW/openmw!312
This commit is contained in:
psi29a 2020-10-12 07:36:15 +00:00
commit ed0bf72119
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -51,6 +51,7 @@
Bug #5588: Randomly clicking on the journal's right-side page when it's empty shows random topics Bug #5588: Randomly clicking on the journal's right-side page when it's empty shows random topics
Bug #5603: Setting constant effect cast style doesn't correct effects view Bug #5603: Setting constant effect cast style doesn't correct effects view
Bug #5611: Usable items with "0 Uses" should be used only once Bug #5611: Usable items with "0 Uses" should be used only once
Bug #5622: Can't properly interact with the console when in pause menu
Feature #390: 3rd person look "over the shoulder" Feature #390: 3rd person look "over the shoulder"
Feature #2386: Distant Statics in the form of Object Paging Feature #2386: Distant Statics in the form of Object Paging
Feature #4894: Consider actors as obstacles for pathfinding Feature #4894: Consider actors as obstacles for pathfinding

1
files/mygui/openmw_layers.xml
View File

@ -6,6 +6,7 @@
<Layer name="AdditiveOverlay" type="AdditiveLayer" pick="false"/> <Layer name="AdditiveOverlay" type="AdditiveLayer" pick="false"/>
<Layer name="HUD" overlapped="false" pick="true"/> <Layer name="HUD" overlapped="false" pick="true"/>
<Layer name="Menu" overlapped="false" pick="true"/> <Layer name="Menu" overlapped="false" pick="true"/>
<Layer name="MainMenu" overlapped="true" pick="true"/>
<Layer name="JournalBooks" type="ScalingLayer" pick="true"> <Layer name="JournalBooks" type="ScalingLayer" pick="true">
<Property key="Size" value="600 520"/> <Property key="Size" value="600 520"/>
</Layer> </Layer>

2
files/mygui/openmw_mainmenu.layout
View File

@ -2,7 +2,7 @@
<MyGUI type="Layout"> <MyGUI type="Layout">
<!-- The entire screen --> <!-- The entire screen -->
<Widget type="Widget" layer="Windows" position="0 0 300 300" name="_Main"> <Widget type="Widget" layer="MainMenu" position="0 0 300 300" name="_Main">
<Widget type="EditBox" skin="MW_TextBoxEdit" position="0 250 280 50" align="Bottom Right" name="VersionText"> <Widget type="EditBox" skin="MW_TextBoxEdit" position="0 250 280 50" align="Bottom Right" name="VersionText">
<Property key="TextAlign" value="Right"/> <Property key="TextAlign" value="Right"/>
<Property key="TextShadow" value="true"/> <Property key="TextShadow" value="true"/>