mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 21:49:55 +00:00
Code Issues Releases Wiki Activity

Fixed merge conflicts

Browse source
This commit is contained in:
Yohaulticetl 2018-08-02 21:29:41 -03:00 committed by Bret Curtis
parent d6f607e823
commit 640b32da56
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/launcher/advancedpage.cpp
View file

@ -81,6 +81,7 @@ bool Launcher::AdvancedPage::loadSettings()
if (unarmedFactorsStrengthIndex >= 0 && unarmedFactorsStrengthIndex <= 2) if (unarmedFactorsStrengthIndex >= 0 && unarmedFactorsStrengthIndex <= 2)
unarmedFactorsStrengthComboBox->setCurrentIndex(unarmedFactorsStrengthIndex); unarmedFactorsStrengthComboBox->setCurrentIndex(unarmedFactorsStrengthIndex);
// Input Settings // Input Settings
loadSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input"); loadSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");
loadSettingBool(grabCursorCheckBox, "grab cursor", "Input"); loadSettingBool(grabCursorCheckBox, "grab cursor", "Input");
@ -140,6 +141,7 @@ void Launcher::AdvancedPage::saveSettings()
if (unarmedFactorsStrengthIndex != mEngineSettings.getInt("strength influences hand to hand", "Game")) if (unarmedFactorsStrengthIndex != mEngineSettings.getInt("strength influences hand to hand", "Game"))
mEngineSettings.setInt("strength influences hand to hand", "Game", unarmedFactorsStrengthIndex); mEngineSettings.setInt("strength influences hand to hand", "Game", unarmedFactorsStrengthIndex);
// Input Settings // Input Settings
saveSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input"); saveSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");
saveSettingBool(grabCursorCheckBox, "grab cursor", "Input"); saveSettingBool(grabCursorCheckBox, "grab cursor", "Input");

10
files/ui/advancedpage.ui
View file

@ -22,7 +22,11 @@
<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">
@ -89,6 +93,7 @@
</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>
@ -100,6 +105,11 @@
<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"> <widget class="QCheckBox" name="strengthInfluencesHandToHand">
=======
</property>
</widget>
</item>
>>>>>>> Fixed merge conflicts
<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">