David Cernat
|
a083439139
|
Merge pull request #469 from davidcernat/master while resolving conflicts
# Conflicts:
# apps/openmw/main.cpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
|
6 years ago |
Capostrophic
|
ab29f9e13f
|
Add permanent barter disposition change option (feature #3103)
|
7 years ago |
|
Capostrophic
|
4d48ede6f1
|
Add two missing gameplay settings to Advanced tab
|
7 years ago |
Marc Zinnschlag
|
20d4e27f82
|
Merged pull request #1821
|
7 years ago |
Andrei Kortunov
|
2d4ec86b8d
|
Provide launcher icons
|
7 years ago |
|
Andrei Kortunov
|
28a02ac93b
|
Use file selection dialogue result (bug #4524)
|
7 years ago |
|
David Cernat
|
a236ffc4be
|
Merge pull request #456 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
|
7 years ago |
Thunderforge
|
72f6b1a693
|
Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"
|
7 years ago |
|
Thunderforge
|
506d615acc
|
Moving csignal import from main to graphicspage
|
7 years ago |
|
Thunderforge
|
7615e78e52
|
Move SDL initialization from main.cpp to graphicspage.cpp
|
7 years ago |
|
Marc Zinnschlag
|
efb4abbb7f
|
Merged pull request #1623
|
7 years ago |
|
Thunderforge
|
dfa9968565
|
Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged
|
7 years ago |
|
Thunderforge
|
62c4eb8d6a
|
Explicitly flagging loaded cells changed as queued
|
7 years ago |
|
Thunderforge
|
d46590934a
|
Importing mutex
|
7 years ago |
|
Thunderforge
|
e282ece3d1
|
Fixing bug with autocomplete not loading correctly during startup
|
7 years ago |
|
Thunderforge
|
103a7ac628
|
Using a mutex lock to prevent race conditions
|
7 years ago |
|
Thunderforge
|
e26c675829
|
Changing join to detach so that the thread will not block the UI
|
7 years ago |
|
Thunderforge
|
26dfef7970
|
Changing where we are loading cells to prevent Qt access issue
|
7 years ago |
|
Thunderforge
|
78234e9468
|
Moving autocomplete code to thread
|
7 years ago |
|
Thunderforge
|
c2fff61ccd
|
Changing so that data changes happen only after the addon is checked
|
7 years ago |
|
Thunderforge
|
d58cce9c72
|
Adding WIP code to dynamically change the autocomplete fields
|
7 years ago |
|
David Cernat
|
296c69d788
|
Merge pull request #436 from OpenMW/master
Add OpenMW commits up to 22 May 2018
|
7 years ago |
declan-millar
|
9ed4f33048
|
Replace spelling: soulgem -> soul gem
|
7 years ago |
|
declan-millar
|
78e79d5775
|
Add advanced option to Rebalance soulgem values to the launcher
|
7 years ago |
|
David Cernat
|
9e5ddeac50
|
Merge pull request #408 from OpenMW/master
Add OpenMW commits up to 18 Apr 2018
|
7 years ago |
Andreas Sturmlechner
|
2c9d46a60b
|
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
|
7 years ago |
|
Thunderforge
|
fb27f34a32
|
Add autocomplete to the "Start default character at" field
|
7 years ago |
|
Thunderforge
|
d42791e260
|
Moving testing options to Advanced page
|
7 years ago |
|
David Cernat
|
b7c6261e16
|
Merge pull request #392 from OpenMW/master while resolving conflicts
# Conflicts:
# README.md
|
7 years ago |
|
Thunderforge
|
dcc262ed91
|
Fixing Skip Menu checkbox not working correctly
|
7 years ago |
|
Thunderforge
|
082e166fae
|
Making "start default character at" field enabled or disabled by the previous checkbox
|
7 years ago |
|
Thunderforge
|
da74ca5ce0
|
Add testing options to the Settings page
|
7 years ago |
|
Thunderforge
|
6c3ac834c4
|
Preventing max quicksaves from being saved to settings.cfg if it is unchanged.
|
7 years ago |
|
David Cernat
|
37b349c2f6
|
Merge pull request #390 from OpenMW/master
Add OpenMW commits up to 28 Feb 2018
|
7 years ago |
|
Thunderforge
|
b6d9b6f544
|
Formatting improvement for advanced page
|
7 years ago |
|
Thunderforge
|
4292351993
|
Adding Max Quicksaves setting to Launcher
|
7 years ago |
|
David Cernat
|
9e10eb9c84
|
Merge pull request #389 from OpenMW/master
Add OpenMW commits up to 24 Feb 2018
|
7 years ago |
|
Thunderforge
|
a67373d116
|
Fixing "Show Enchant Chance" checkbox setting melee info instead
|
7 years ago |
|
David Cernat
|
a7e3261b0b
|
Merge pull request #383 from OpenMW/master
Add OpenMW commits up to 11 Feb 2018
|
7 years ago |
|
Thunderforge
|
8b17844781
|
Replacing Qt5-only method with Qt4-compatible code
|
7 years ago |
|
Thunderforge
|
8837046d9c
|
Adding panel for advanced settings.cfg options
|
7 years ago |
|
David Cernat
|
bd541b1e5b
|
Merge pull request #287 from OpenMW/master while resolving conflicts
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
|
7 years ago |
AnyOldName3
|
a9b95596bc
|
Add a missed trailing new line.
|
7 years ago |
|
AnyOldName3
|
8c74f16247
|
Restore trailing new lines to shrink PR
|
7 years ago |
|
AnyOldName3
|
5ce34f1cbf
|
Move new behaviour into macro to reduce code duplication
|
7 years ago |
|
AnyOldName3
|
3c0ec0d6d0
|
If CMake supports it, sets the debugger working directory for Visual Studio
|
7 years ago |
|
David Cernat
|
4468e6ec4a
|
Merge pull request #280 from OpenMW/master while resolving conflicts
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
|
7 years ago |
Siimacore
|
c920d083e4
|
Correcting https://bugs.openmw.org/issues/3906.
|
8 years ago |
|
David Cernat
|
df67ae4689
|
Merge pull request #229 from OpenMW/master
Add OpenMW commits up to 20 Jun 2017
|
8 years ago |
scrawl
|
41fb17f39b
|
Revert "Correcting https://bugs.openmw.org/issues/3906"
This reverts commit b0abed00e5.
|
8 years ago |