mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-16 19:19:56 +00:00
Fixed merge conflicts
This commit is contained in:
parent
d6f607e823
commit
640b32da56
2 changed files with 12 additions and 0 deletions
|
@ -81,6 +81,7 @@ bool Launcher::AdvancedPage::loadSettings()
|
|||
if (unarmedFactorsStrengthIndex >= 0 && unarmedFactorsStrengthIndex <= 2)
|
||||
unarmedFactorsStrengthComboBox->setCurrentIndex(unarmedFactorsStrengthIndex);
|
||||
|
||||
|
||||
// Input Settings
|
||||
loadSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");
|
||||
loadSettingBool(grabCursorCheckBox, "grab cursor", "Input");
|
||||
|
@ -140,6 +141,7 @@ void Launcher::AdvancedPage::saveSettings()
|
|||
if (unarmedFactorsStrengthIndex != mEngineSettings.getInt("strength influences hand to hand", "Game"))
|
||||
mEngineSettings.setInt("strength influences hand to hand", "Game", unarmedFactorsStrengthIndex);
|
||||
|
||||
|
||||
// Input Settings
|
||||
saveSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");
|
||||
saveSettingBool(grabCursorCheckBox, "grab cursor", "Input");
|
||||
|
|
|
@ -22,7 +22,11 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>641</width>
|
||||
<<<<<<< HEAD
|
||||
<height>998</height>
|
||||
=======
|
||||
<height>968</height>
|
||||
>>>>>>> Fixed merge conflicts
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="scrollAreaVerticalLayout">
|
||||
|
@ -89,6 +93,7 @@
|
|||
</property>
|
||||
<property name="text">
|
||||
<string>Enchanted weapons are magical</string>
|
||||
<<<<<<< HEAD
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
@ -100,6 +105,11 @@
|
|||
<property name="text">
|
||||
<string>Barter disposition change is permanent</string>
|
||||
<widget class="QCheckBox" name="strengthInfluencesHandToHand">
|
||||
=======
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
>>>>>>> Fixed merge conflicts
|
||||
<item alignment="Qt::AlignLeft">
|
||||
<widget class="QWidget" name="unarmedFactorsStrengthGroup" native="true">
|
||||
<property name="toolTip">
|
||||
|
|
Loading…
Reference in a new issue