Commit Graph

596 Commits (341ca691fc8a465a81b48d7953fc800a887b46fd)

Author SHA1 Message Date
David Cernat a032c8d399 Add TES3MP 0.8.0 commits up to 28 Apr 2022
# Conflicts:
#	apps/openmw/mwclass/creature.cpp
#	apps/openmw/mwclass/npc.cpp
3 years ago
David Cernat e72bacbed3 [Client] Prevent main menu from being opened while in TES3MP listboxes 3 years ago
David Cernat 339a196579 Add OpenMW VR commits up to 4 Jul 2021
# Conflicts:
#   CMakeLists.txt
#   LICENSE
#   README.md
#   apps/openmw/CMakeLists.txt
#   apps/openmw/engine.cpp
#   apps/openmw/mwclass/creature.cpp
#   apps/openmw/mwclass/npc.cpp
#   apps/openmw/mwclass/npc.hpp
#   apps/openmw/mwinput/bindingsmanager.cpp
#   apps/openmw/mwmechanics/combat.cpp
3 years ago
David Cernat 572b16af41 Add OpenMW 0.47 commits to OpenMW VR up to 4 Dec 2021
# Conflicts:
#   .gitlab-ci.yml
#   CI/before_script.msvc.sh
#   CI/install_debian_deps.sh
#   CMakeLists.txt
#   apps/openmw/mwrender/screenshotmanager.cpp
#   files/ui/advancedpage.ui
3 years ago
David Cernat e010c61167 Add OpenMW 0.47 commits up to 10 Oct 2021 3 years ago
psi29a b81df8af9c Merge branch 'cursorspeedmerge' into 'master'
Updated: Change cursor speed with settings.cfg (#6312)

Closes #6312

See merge request OpenMW/openmw!1255

(cherry picked from commit 1d342f80ed1af25d3cf1f70759be7fba1c9237b2)

b5af1928 gamepad cursor speed fix
3 years ago
David Cernat 7a6dfc61ec Add OpenMW commits up to 21 May 2021
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwscript/interpretercontext.cpp
#   components/CMakeLists.txt
4 years ago
Andrei Kortunov c11774f278 Do not trigger in-game bindings via mouse buttons when controls are disabled (bug #6047) 4 years ago
David Cernat a3f304107b Add OpenMW commits up to 2 May 2021
# Conflicts:
#   components/CMakeLists.txt
4 years ago
jvoisin ee2446d5c4 Trim even more 4 years ago
madsbuvi f4e36f4be5 Merge remote-tracking branch 'remotes/origin/master' into openmw-vr 4 years ago
Andrei Kortunov 33b8233887 Validate GUI scaling and place it to the launcher 4 years ago
David Cernat cedf70f367 Add OpenMW commits up to 13 Apr 2021
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/actors.cpp
#   apps/openmw/mwmechanics/summoning.cpp
#   apps/openmw/mwphysics/mtphysics.hpp
4 years ago
Andrei Kortunov 903b89a0ff Add bound for UI scale factor, as it specified in docs 4 years ago
David Cernat 59cb31e0a7 Add OpenMW commits up to 20 Mar 2021
# Conflicts:
#   apps/openmw/CMakeLists.txt
#   apps/openmw/mwmechanics/aipursue.cpp
#   components/CMakeLists.txt
4 years ago
madsbuvi d598923421 Merge remote-tracking branch 'remotes/origin/master' into openmw-vr 4 years ago
Evil Eye 6e0f070cd1 Don't assume unmapped keycodes outside the extended ASCII range are unprintable 4 years ago
David Cernat e1259fdc41 Add OpenMW commits up to 4 Feb 2021
# Conflicts:
#   apps/openmw/engine.cpp
#   apps/openmw/mwmechanics/npcstats.hpp
#   apps/openmw/mwrender/globalmap.cpp
4 years ago
madsbuvi 6c9df35725 Merge remote-tracking branch 'remotes/origin/master' into openmw-vr 4 years ago
Gleb Mazovetskiy fe815d3d8d Fix memory leak in MWInput
mListener wasn't being cleaned up
4 years ago
Andrei Kortunov 799bd3379c Move screenshots handling to the separate class 4 years ago
Mads Buvik Sandvei 85033bb647 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 4 years ago
David Cernat 4620adc662 Add OpenMW commits up to 30 Nov 2020
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwphysics/actor.cpp
4 years ago
Andrei Kortunov 8084a336b5 Replace zeroes and nulls by nullptrs 4 years ago
Mads Buvik Sandvei 259330ab14 Drop MyGUI 3.4 requirement. Manage layer and widget focus manually. 4 years ago
David Cernat 7f435ceeac Add OpenMW commits up to 1 Nov 2020
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/main.cpp
#   apps/openmw/mwclass/container.hpp
#   apps/openmw/mwclass/creature.hpp
#   apps/openmw/mwclass/npc.hpp
#   apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#   apps/openmw/mwdialogue/journalimp.hpp
#   apps/openmw/mwgui/container.cpp
#   apps/openmw/mwgui/dialogue.hpp
#   apps/openmw/mwgui/mainmenu.cpp
#   apps/openmw/mwgui/windowmanagerimp.hpp
#   apps/openmw/mwmechanics/aiactivate.hpp
#   apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#   apps/openmw/mwscript/containerextensions.cpp
#   apps/openmw/mwscript/interpretercontext.hpp
#   components/CMakeLists.txt
4 years ago
Mads Buvik Sandvei 4f8f0cc8ac Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into openxr_vr 4 years ago
Andrei Kortunov 8ca3c3b123 Mark overrided methods by override keyword 4 years ago
David Cernat 0eedf8fd9f Add OpenMW commits up to 30 Sep 2020
# Conflicts:
#   apps/openmw/mwmechanics/aicombat.cpp
#   apps/openmw/mwmechanics/character.cpp
#   apps/openmw/mwmechanics/summoning.cpp
#   components/CMakeLists.txt
4 years ago
Petr Mikheev 874c754b68 Fix #5557 4 years ago
David Cernat 80af0ce6a7 Add OpenMW commits up to 29 Aug 2020
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwmechanics/character.cpp
4 years ago
Andrei Kortunov 9189a42c4c Fix failed assertion 4 years ago
Petr Mikheev 694e0b5906 Refactoring. Simplification of camera interface. 4 years ago
David Cernat baa9446cd1 Add OpenMW commits up to 4 Aug 2020 4 years ago
Perry Hugh 4bf24a955e Restore Gamepad Zooming 4 years ago
David Cernat ff10aa816b Add OpenMW commits up to 25 Jul 2020
# Conflicts:
#   .travis.yml
5 years ago
Mads Buvik Sandvei 1023ef6e49 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 5 years ago
Mads Buvik Sandvei c9e761eb88 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 5 years ago
Petr Mikheev 62c8ea373b Fix not completely correct camera transition when switching from 1st person to 3rd person if armed. 5 years ago
Petr Mikheev d78b227670 Fix inverted preview rotation when using controller 5 years ago
Petr Mikheev 8ac7ffc32b Remove 'separate preview camera' and make the new behavior the default one.
Also minor refactoring in camera.cpp
5 years ago
Petr Mikheev 4d206d2c67 Improved preview mode 5 years ago
Mads Buvik Sandvei 69b4a4741f Formatting errors 5 years ago
David Cernat 5eb7eb8d88 Add OpenMW commits up to 4 Jul 2020
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/charactercreation.cpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/character.cpp
5 years ago
Andrei Kortunov 7fb78e801f Fix mouse release injection 5 years ago
Andrei Kortunov 5f0cc87a67 Do not discard remnants 5 years ago
Mads Buvik Sandvei 58d73e14e6 Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
# Conflicts:
#	apps/openmw/mwbase/environment.cpp
#	apps/openmw/mwbase/environment.hpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwinput/inputmanagerimp.hpp
#	apps/openmw/mwrender/animation.cpp
#	apps/openmw/mwrender/camera.cpp
#	apps/openmw/mwrender/camera.hpp
#	apps/openmw/mwrender/renderingmanager.cpp
#	apps/openmw/mwrender/renderingmanager.hpp
5 years ago
Andrei Kortunov 230e06dec7 Make joysticks dead zone configurable (bug #5502) 5 years ago
David Cernat 3b2eb6f62c Add OpenMW commits up to 22 Jun 2020
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
5 years ago
Andrei Kortunov 1541c7e5eb Fix ordering warning 5 years ago