mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

fix rebase issue

Browse Source
This commit is contained in:
Bret Curtis 2018-08-14 23:15:30 +02:00
parent ffb103f7c5
commit 4cb9b52b81
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
files/ui/advancedpage.ui
View File

@ -22,11 +22,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>641</width> <width>641</width>
<<<<<<< HEAD
<height>998</height> <height>998</height>
=======
<height>968</height>
>>>>>>> Fixed merge conflicts
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="scrollAreaVerticalLayout"> <layout class="QVBoxLayout" name="scrollAreaVerticalLayout">
@ -93,7 +89,6 @@
</property> </property>
<property name="text"> <property name="text">
<string>Enchanted weapons are magical</string> <string>Enchanted weapons are magical</string>
<<<<<<< HEAD
</property> </property>
</widget> </widget>
</item> </item>
@ -104,12 +99,19 @@
</property> </property>
<property name="text"> <property name="text">
<string>Barter disposition change is permanent</string> <string>Barter disposition change is permanent</string>
<widget class="QCheckBox" name="strengthInfluencesHandToHand">
=======
</property> </property>
</widget> </widget>
</item> </item>
>>>>>>> Fixed merge conflicts <item>
<widget class="QCheckBox" name="strengthInfluencesHandToHand">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Uses the MCP formula (damage * (strength / 40)) to factor the Strength attribute into hand-to-hand combat.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Factor strength into hand-to-hand combat</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignLeft"> <item alignment="Qt::AlignLeft">
<widget class="QWidget" name="unarmedFactorsStrengthGroup" native="true"> <widget class="QWidget" name="unarmedFactorsStrengthGroup" native="true">
<property name="toolTip"> <property name="toolTip">