David Cernat
|
36a2308acd
|
Add OpenMW commits up to 30 May 2020
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwbase/windowmanager.hpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwscript/interpretercontext.cpp
|
2020-06-09 17:50:26 +03:00 |
|
David Cernat
|
62df188fd4
|
Add OpenMW commits up to 16 May 2020
# Conflicts:
# CI/before_script.linux.sh
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwscript/globalscripts.cpp
# apps/openmw/mwscript/interpretercontext.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/cellstore.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
# components/interpreter/context.hpp
|
2020-06-06 22:38:28 +03:00 |
|
Andrei Kortunov
|
b00d72b9e4
|
Move cursor update to the MouseManager
|
2020-05-26 18:03:29 +04:00 |
|
Andrei Kortunov
|
e3df170a53
|
Fix mControlsDisabled flag usage
|
2020-05-26 10:58:24 +04:00 |
|
Andrei Kortunov
|
73552f1d3c
|
Move control switch reading/writing to relevant class
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
b575712cb1
|
Formatting changes
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
85f91a7de8
|
Remove some redundant code
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
3328775eff
|
Unify cursor enabling
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
b33c4c920c
|
Move all OICS handling to the separate file
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
0eb24da2e7
|
Fix controls disabling
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
8512133bb1
|
Move control switches to the separate file
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
f990150c49
|
Move video wrapper to the WindowsManager
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
13b7c5b519
|
Rework actions update
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
d3a9f893c8
|
Move keyboard-specific code to the separate file
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
c368250e6a
|
Rename misleading mInputManager variable
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
e353647d15
|
Move gamepads handling to the separate file
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
f9d6137a29
|
Do not store player reference in the InputManager
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
ce40294124
|
Move input actions handling to the separate file
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
fcac7d3ab7
|
Split mouse handling to the separate file
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
1560e71f4e
|
Move SDL mappigs to the separate file
|
2020-05-09 11:27:02 +04:00 |
|
Andrei Kortunov
|
15dc4d241d
|
Split sensors handling so the separate file
|
2020-05-09 11:27:02 +04:00 |
|
David Cernat
|
25a632c650
|
Add OpenMW commits up to 13 Apr 2020
# Conflicts:
# CMakeLists.txt
# README.md
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creaturelevlist.cpp
# apps/openmw/mwgui/quickkeysmenu.cpp
|
2020-04-13 19:53:42 +03:00 |
|
Andrei Kortunov
|
a68d9aed4c
|
Fix issues, found by CoverityScan
|
2020-04-04 17:45:26 +04:00 |
|
Andrei Kortunov
|
e63325ebff
|
Support for camera rotation via gyroscope on Android (feature #5311)
|
2020-04-01 19:57:04 +04:00 |
|
David Cernat
|
60b6f92fa3
|
Add OpenMW commits up to 13 Jan 2020
# Conflicts:
# apps/openmw/mwmechanics/actors.cpp
|
2020-01-15 07:49:26 +02:00 |
|
Andrei Kortunov
|
4d4663e0ad
|
Make 'Toggle HUD' hotkey configurable
|
2020-01-10 14:31:25 +04:00 |
|
David Cernat
|
5b4db83d61
|
[Client] Once again allow beds to be used even if waiting is disallowed
This had been broken by rest-related commits in OpenMW.
|
2019-12-03 23:55:55 +02:00 |
|
David Cernat
|
5575242299
|
[Client] Don't allow players to attack while in persuasion dialogue
|
2019-11-30 20:05:20 +02:00 |
|
David Cernat
|
5762a36fc2
|
Add OpenMW commits up to 7 Nov 2019
# Conflicts:
# apps/openmw/mwmechanics/aifollow.hpp
|
2019-11-08 06:20:41 +02:00 |
|
Alexei Dobrohotov
|
5ae91465ee
|
Fix gamepad zoom value calculation
|
2019-11-02 19:47:05 +03:00 |
|
Michael Stopa
|
e4bec88a68
|
Implement mouse wheel bindings (bug #2679)
|
2019-10-30 20:45:51 +04:00 |
|
David Cernat
|
4a34666c59
|
Add OpenMW commits up to 7 Oct 2019
# Conflicts:
# apps/openmw/mwmechanics/aiactivate.cpp
|
2019-10-07 08:19:21 +03:00 |
|
Andrei Kortunov
|
7cb6a9c1e9
|
Do not allow to use quick keys during chargen
|
2019-09-20 07:27:34 +04:00 |
|
Andrei Kortunov
|
1bddbbcfa0
|
Check if related menus are allowed when using cycle hotkeys (bug #5167)
|
2019-09-20 07:27:27 +04:00 |
|
David Cernat
|
ca67587b89
|
Add OpenMW commits up to 5 Sep 2019
# Conflicts:
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwworld/worldimp.hpp
|
2019-09-05 21:41:50 +03:00 |
|
David Cernat
|
78a9a428a6
|
[Client] Remove unnecessary mwmp::Main::pressedKey() function
Additionally, add comment around where it was originally used.
|
2019-08-26 15:41:45 +03:00 |
|
Alexei Dobrohotov
|
43a58e181f
|
Merge pull request #2455 from Capostrophic/input
Revert questionable input manager decisions
|
2019-08-24 15:02:50 +03:00 |
|
David Cernat
|
353e7d530a
|
Add OpenMW commits up to 18 Aug 2019
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwworld/worldimp.hpp
|
2019-08-22 22:44:00 +03:00 |
|
David Cernat
|
ed05125f6a
|
Add OpenMW commits up to 2 Aug 2019
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
|
2019-08-22 15:38:15 +03:00 |
|
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
|
2019-08-22 11:42:02 +03:00 |
|
David Cernat
|
5181c601c0
|
Add OpenMW commits up to 2 May 2019
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/statsextensions.cpp
|
2019-08-22 08:40:32 +03:00 |
|
David Cernat
|
f671c0bddc
|
Add OpenMW commits up to 1 Apr 2019
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/engine.cpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/trainingwindow.cpp
# apps/openmw/mwgui/travelwindow.cpp
# apps/openmw/mwgui/waitdialog.cpp
|
2019-08-21 23:54:39 +03:00 |
|
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
|
2019-08-21 19:04:04 +03:00 |
|
David Cernat
|
95a5607509
|
Add OpenMW commits up to 22 Feb 2019
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/containerextensions.cpp
|
2019-08-21 17:29:24 +03:00 |
|
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
|
2019-08-21 14:37:54 +03:00 |
|
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
|
2019-08-20 13:15:00 +03:00 |
|
David Cernat
|
056591b957
|
Add OpenMW commits up to 14 Sep 2018
# Conflicts:
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwworld/worldimp.hpp
|
2019-08-20 12:14:57 +03:00 |
|
David Cernat
|
889bcec7f8
|
Add OpenMW commits up to 1 Sep 2018
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwclass/creature.cpp
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/difficultyscaling.cpp
# apps/openmw/mwscript/transformationextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
|
2019-08-20 11:31:51 +03:00 |
|
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
|
2019-08-20 10:06:15 +03:00 |
|
Andrei Kortunov
|
d0bc06b849
|
Merge pull request #2438 from Capostrophic/camera
Rewrite messed up playerlooking switch handling (bug #5078)
|
2019-08-17 23:15:21 +04:00 |
|