David Cernat
|
ed05125f6a
|
Add OpenMW commits up to 2 Aug 2019
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
|
5 years ago |
|
David Cernat
|
b57c0bcafe
|
Add OpenMW commits up to 6 June 2019
# Conflicts:
# apps/openmw/mwgui/hud.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/waitdialog.cpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwworld/worldimp.hpp
|
5 years ago |
|
David Cernat
|
5181c601c0
|
Add OpenMW commits up to 2 May 2019
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/statsextensions.cpp
|
5 years ago |
|
David Cernat
|
8729c3c5e3
|
Add OpenMW commits up to 9 Mar 2019
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# README.md
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwscript/animationextensions.cpp
# apps/openmw/mwscript/guiextensions.cpp
# apps/openmw/mwscript/miscextensions.cpp
# apps/openmw/mwscript/soundextensions.cpp
|
5 years ago |
|
David Cernat
|
6fdef4fd0a
|
Add OpenMW commits up to 1 Jan 2019
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
|
5 years ago |
|
David Cernat
|
fba07194cf
|
Add OpenMW commits up to 29 Oct 2018
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
|
5 years ago |
|
David Cernat
|
84cab59057
|
Add OpenMW commits up to 19 Aug 2018
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/main.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/misc/debugging.hpp
|
5 years ago |
Capostrophic
|
9502e9f3f7
|
Disable FPS limit spinbox by default and set the maximum to 1000
Make window border and framerate limit labels consistent with other labels
|
6 years ago |
|
Capostrophic
|
b87b29eeb0
|
Make framerate limit configurable in the launcher
|
6 years ago |
|
Capostrophic
|
5cd781b3eb
|
Experimental folder handling rewrite
|
6 years ago |
|
Capostrophic
|
686049679c
|
Launcher: Clone content list button (feature #4784)
|
6 years ago |
|
Capostrophic
|
34ea9ea813
|
Add an option to restore MCP-like movement behavior
|
6 years ago |
|
Capostrophic
|
c7ac06b960
|
Always account for every follower travelling
|
6 years ago |
terrabyte25
|
61c3847a12
|
Add magic animation option to advanced page
|
6 years ago |
Andrei Kortunov
|
bf5f68a4d8
|
Replace boost GCD to the homebrew implementation
|
6 years ago |
|
Andrei Kortunov
|
a14c832f4f
|
Fix Boost version check in the launcher
|
6 years ago |
Bret Curtis
|
735bcf17c2
|
Merge branch 'boost-gcd-deprecation' into 'master'
Fix boost deprecation warning
See merge request OpenMW/openmw!66
|
6 years ago |
AnyOldName3
|
cd4303da23
|
Add preprocessor check to determine which common_factor header to use.
|
6 years ago |
|
Capostrophic
|
4138e29ca4
|
Add option to restore the previous ammo behavior
|
6 years ago |
|
AnyOldName3
|
c68ccbc6b6
|
Use new common_factor header in the launcher, too
|
6 years ago |
mp3butcher
|
9de6c630f2
|
fix moc achieving to reach unparsable boost code
|
6 years ago |
Marc Zinnschlag
|
8b30f15df7
|
Merged pull request #1942
|
6 years ago |
|
Capostrophic
|
ba2fd8b795
|
Rename reflected absorb spells setting and add it to Advanced tab
|
6 years ago |
|
Andrei Kortunov
|
bce8de5fe9
|
Respect selected encoding in the content selector (bug #4467)
|
6 years ago |
|
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
|
37f9d45182
|
Remove an outdated checkbox from the advanced page
|
6 years ago |
Yohaulticetl
|
640b32da56
|
Fixed merge conflicts
|
6 years ago |
|
Yohaulticetl
|
7e9ce99062
|
Made the werewolf check optional
|
6 years ago |
|
Yohaulticetl
|
d19cbdb652
|
Factored strength into hand-to-hand combat
|
6 years ago |
|
Andrei Kortunov
|
2b90504558
|
Init SDL2 before Qt4 to avoid crash on Linux (bug #4529)
|
7 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 |