Commit Graph

582 Commits (master)

Author SHA1 Message Date
Andrei Kortunov b33c4c920c Move all OICS handling to the separate file 5 years ago
Andrei Kortunov 0eb24da2e7 Fix controls disabling 5 years ago
Andrei Kortunov 2f2b3173e3 Fix copy-paste error 5 years ago
Andrei Kortunov 8512133bb1 Move control switches to the separate file 5 years ago
Andrei Kortunov f990150c49 Move video wrapper to the WindowsManager 5 years ago
Andrei Kortunov 13b7c5b519 Rework actions update 5 years ago
Andrei Kortunov d3a9f893c8 Move keyboard-specific code to the separate file 5 years ago
Andrei Kortunov c368250e6a Rename misleading mInputManager variable 5 years ago
Andrei Kortunov e353647d15 Move gamepads handling to the separate file 5 years ago
Andrei Kortunov f9d6137a29 Do not store player reference in the InputManager 5 years ago
Andrei Kortunov ce40294124 Move input actions handling to the separate file 5 years ago
Andrei Kortunov fcac7d3ab7 Split mouse handling to the separate file 5 years ago
Andrei Kortunov 1560e71f4e Move SDL mappigs to the separate file 5 years ago
Andrei Kortunov 3c09d05615 Split actions enum to the separate file 5 years ago
Andrei Kortunov 15dc4d241d Split sensors handling so the separate file 5 years ago
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
5 years ago
Andrei Kortunov a68d9aed4c Fix issues, found by CoverityScan 5 years ago
Andrei Kortunov e63325ebff Support for camera rotation via gyroscope on Android (feature #5311) 5 years ago
David Cernat 60b6f92fa3 Add OpenMW commits up to 13 Jan 2020
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
5 years ago
Andrei Kortunov 4d4663e0ad Make 'Toggle HUD' hotkey configurable 5 years ago
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.
5 years ago
David Cernat 5575242299 [Client] Don't allow players to attack while in persuasion dialogue 5 years ago
David Cernat 5762a36fc2 Add OpenMW commits up to 7 Nov 2019
# Conflicts:
#	apps/openmw/mwmechanics/aifollow.hpp
5 years ago
Alexei Dobrohotov 5ae91465ee
Fix gamepad zoom value calculation 5 years ago
Michael Stopa e4bec88a68 Implement mouse wheel bindings (bug #2679) 5 years ago
David Cernat 4a34666c59 Add OpenMW commits up to 7 Oct 2019
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
5 years ago
Andrei Kortunov 7cb6a9c1e9 Do not allow to use quick keys during chargen 5 years ago
Andrei Kortunov 1bddbbcfa0 Check if related menus are allowed when using cycle hotkeys (bug #5167) 5 years ago
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
5 years ago
David Cernat 78a9a428a6 [Client] Remove unnecessary mwmp::Main::pressedKey() function
Additionally, add comment around where it was originally used.
5 years ago
Alexei Dobrohotov 43a58e181f
Merge pull request #2455 from Capostrophic/input
Revert questionable input manager decisions
5 years ago
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
5 years ago
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 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
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 95a5607509 Add OpenMW commits up to 22 Feb 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/containerextensions.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 056591b957 Add OpenMW commits up to 14 Sep 2018
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
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
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
Andrei Kortunov d0bc06b849
Merge pull request #2438 from Capostrophic/camera
Rewrite messed up playerlooking switch handling (bug #5078)
5 years ago
Alex Rice e7ae7a8ca6 Allow user controller bindings 5 years ago
capostrophic 15bf05215e Revert questionable input manager decisions
Remove Options Menu shortcut
Revert to more pleasant 0.45.0 Escape behavior
Re-enable keyboard GUI arrow conversion feature
Remove gamepad button release handling
6 years ago
Capostrophic 0b074f2211 Rewrite messed up playerlooking switch handling (bug #5078) 6 years ago
Justin Ivany 643f259cbf Adding option for cursor speed when using gamepad 6 years ago
Justin Ivany 49f2615d2b Fix scrolling with controller on gui 6 years ago
Alexei Dobrohotov ef2a7160fa
Fix automovement toggling on "joystick used" flag 6 years ago
Capostrophic 70635ed1e2 Correct always run behavior when both a gamepad and a keyboard are used 6 years ago
Andrei Kortunov 1ce370e7fa Make console to do not hide other GUI windows (bug #1515) 6 years ago
Capostrophic f271ac255d Avoid conflicts between gamepad movement and always run setting 6 years ago
Capostrophic 4787e6b9a7 Don't toggle sneaking while controls are disabled 6 years ago
Andrei Kortunov 4f42fe5595 Refactor Settings::Manager::apply() 6 years ago
Andrei Kortunov 0cd8d4b842 Do not track resolution settings changes in the InputManager (bug #4902) 6 years ago
terabyte25 27292ef4a3 Disable quick keys when fighting and spellcasting are disabled (bug #4962) 6 years ago
Andrei Kortunov f165d22cde Fix a regression with disappearing cursor in the self-enchanting menu 6 years ago
Capostrophic 6dbd875f75 Disallow binding some reserved keys (bug #3282) 6 years ago
Andrei Kortunov 7501f18d21 Avoid the 'structurally dead code' warning 6 years ago
Capostrophic ca83b9ee90 Refactor main menu and settings toggling again 6 years ago
Andrei Kortunov de41c98022 Refactor menu toggling 6 years ago
Perry Hugh b8b7568ce5 Correct odd toggling menu behavior. 6 years ago
Perry Hugh 37f5ab2104 Gamepad controls now sent to keyboard input, excluding joystick. Added right thumbstick button to toggle mouse emulation. 6 years ago
Perry Hugh 313611b79d Analogue Joystick Movement 6 years ago
Perry Hugh 7b6f41c5c3 Correct gamepad default bindings to exactly match vanilla XBOX, create fair interplay between toggling main menu and options menu, allow toggling menus at any time. 6 years ago
Perry Hugh 3ac5481ab4
Enable toggling sneak via gamepad. 6 years ago
Perry Hugh c6fb94d6cb xbox-bindings 6 years ago
Capostrophic 39dcbacf44 Option to disable controller (feature #3980) 6 years ago
terrabyte25 c31fa3074e
Sanity check for text input in toggleWalking 6 years ago
terrabyte25 35755eb1f1
[Client] Disallow opening inventory menu when not logged in 6 years ago
Capostrophic 7b5932a49d Add Invert X Axis option (feature #3610) 6 years ago
David Cernat d9dd7073cf [General] Send certain packets only when logged in
Previously, client mods adding packet-sending scripts to the spawn area made clients send the associated packets as soon as they inputted their character name when joining a server using those mods. This made the clients either get disconnected for not replying to a handshake first, or it made them get kicked for sending object packets that are disallowed for players who are not logged in.

To fix this, LocalPlayer's hasFinishedCharGen() has been replaced with isLoggedIn(), because the former was already returning true when players inputted their names.
6 years ago
Capostrophic 4ec727c50b Disallow to open the journal while settings window is open (bug #4674) 6 years ago
Andrei Kortunov e06f0b797a Replace all NULLs to nullptr 6 years ago
Sergey Fukanchik c50ee22772 Wrap up World::canRest() implementation by moving enemiesNearby() from InputManager::rest() to World::canRest(). 6 years ago
Marc Zinnschlag 06b2a23e74 Merged pull request #1768 6 years ago
Andrei Kortunov 7a986f38da Support for user-defined TrueType fonts 6 years ago
Andrei Kortunov 33a66b778f Disable repeating for Accept action in keyboard navigation (bug #4260) 6 years ago
Capostrophic 7ef6fa9f61 Remove deprecated GMST get* functions 6 years ago
Andrei Kortunov 16edac8c47 Fix incorrect 'preparing' word spelling 6 years ago
Andrei Kortunov 5a4d0cec3a Use new logging system for game itself 6 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
Capostrophic 1abf749f03
Remove screenshot taken message 7 years ago
Miloslav Číž dd00e438fe Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360 7 years ago
Miloslav Číž 7178ee3a6e Add FIXME comment 7 years ago
Miloslav Číž d629c30fdb
Merge branch 'master' into screenshot360 7 years ago
Miloslav Číž dcfbd554bb Remove try catch block 7 years ago
David Cernat e3c43c6af7 Merge pull request #400 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
7 years ago
David Cernat 1c340568d2 [Client] Disallow resting if player has not finished chargen
Previously, players pressing T rapidly before logging in had the Wait screen show up for them.
7 years ago
Capostrophic 41f89c84f8 Don't move the player if opposite direction keys are held down at the same time (Fixes #4233) 7 years ago
Miloslav Číž db6107f12f
Merge branch 'master' into screenshot360 7 years ago
David Cernat a7e3261b0b
Merge pull request #383 from OpenMW/master
Add OpenMW commits up to 11 Feb 2018
7 years ago
scrawl f28024b541
Don't use Activate and Move keys for GUI navigation if bound to mouse buttons (Fixes #4225, Fixes #4320) 7 years ago
David Cernat 5d4b97645d Merge pull request #374 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/CMakeLists.txt
7 years ago
scrawl 83726ee06a
Fix Reset Controls button not functioning properly 7 years ago
David Cernat 14ef2fa791
Merge pull request #369 from OpenMW/master
Add OpenMW commits up to 9 Jan 2018
7 years ago
Andrei Kortunov dba071f881 Remove the 'Screenshot saved' message (bug #4191) 7 years ago
David Cernat cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 7 years ago
Miloslav Číž a142a67972 Add default settings for 360 screenshots 7 years ago