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
terabyte25
27292ef4a3
Disable quick keys when fighting and spellcasting are disabled (bug #4962 )
2019-04-12 13:08:55 +00:00
Andrei Kortunov
f165d22cde
Fix a regression with disappearing cursor in the self-enchanting menu
2019-04-12 08:29:45 +04:00
Capostrophic
6dbd875f75
Disallow binding some reserved keys (bug #3282 )
2019-03-23 22:56:30 +03:00
Andrei Kortunov
7501f18d21
Avoid the 'structurally dead code' warning
2019-03-19 09:16:03 +04:00
Capostrophic
ca83b9ee90
Refactor main menu and settings toggling again
2019-03-08 23:09:57 +03:00
Andrei Kortunov
de41c98022
Refactor menu toggling
2019-03-08 13:36:44 +04:00
Perry Hugh
b8b7568ce5
Correct odd toggling menu behavior.
2019-03-07 11:41:48 +01:00
Perry Hugh
37f5ab2104
Gamepad controls now sent to keyboard input, excluding joystick. Added right thumbstick button to toggle mouse emulation.
2019-03-03 09:21:00 +00:00
Perry Hugh
313611b79d
Analogue Joystick Movement
2019-03-02 23:46:48 +00:00
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.
2019-03-02 14:28:26 +00:00
Perry Hugh
3ac5481ab4
Enable toggling sneak via gamepad.
2019-02-27 14:03:16 -08:00
Perry Hugh
c6fb94d6cb
xbox-bindings
2019-02-27 13:29:48 +00:00
Capostrophic
39dcbacf44
Option to disable controller (feature #3980 )
2019-02-15 18:40:22 +03:00
terrabyte25
c31fa3074e
Sanity check for text input in toggleWalking
2018-12-12 14:40:15 -06:00
terrabyte25
35755eb1f1
[Client] Disallow opening inventory menu when not logged in
2018-12-01 10:51:33 -06:00
Capostrophic
7b5932a49d
Add Invert X Axis option (feature #3610 )
2018-12-01 19:08:02 +03:00
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.
2018-10-13 15:36:13 +03:00
Capostrophic
4ec727c50b
Disallow to open the journal while settings window is open (bug #4674 )
2018-10-10 18:33:56 +03:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Sergey Fukanchik
c50ee22772
Wrap up World::canRest() implementation by moving enemiesNearby() from InputManager::rest() to World::canRest().
2018-09-23 01:52:56 +03:00
Marc Zinnschlag
06b2a23e74
Merged pull request #1768
2018-09-17 12:10:21 +02:00
Andrei Kortunov
7a986f38da
Support for user-defined TrueType fonts
2018-09-12 14:31:01 +04:00
Andrei Kortunov
33a66b778f
Disable repeating for Accept action in keyboard navigation (bug #4260 )
2018-09-09 23:10:09 +04:00
Capostrophic
7ef6fa9f61
Remove deprecated GMST get* functions
2018-08-29 18:38:12 +03:00
Andrei Kortunov
16edac8c47
Fix incorrect 'preparing' word spelling
2018-08-16 17:47:06 +04:00
Andrei Kortunov
5a4d0cec3a
Use new logging system for game itself
2018-08-14 23:05:43 +04:00
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
2018-07-04 01:52:29 +03:00
Capostrophic
1abf749f03
Remove screenshot taken message
2018-06-14 22:08:53 +03:00
Miloslav Číž
dd00e438fe
Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360
2018-06-13 21:35:03 +02:00
Miloslav Číž
7178ee3a6e
Add FIXME comment
2018-06-13 21:34:43 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
2018-06-13 21:16:28 +02:00
Miloslav Číž
dcfbd554bb
Remove try catch block
2018-06-13 11:12:46 +02:00
David Cernat
e3c43c6af7
Merge pull request #400 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
2018-04-03 01:25:17 +03:00
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.
2018-03-29 06:04:20 +03:00
Capostrophic
41f89c84f8
Don't move the player if opposite direction keys are held down at the same time ( Fixes #4233 )
2018-03-25 12:20:48 +03:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360
2018-02-25 11:25:19 +01:00
David Cernat
a7e3261b0b
Merge pull request #383 from OpenMW/master
...
Add OpenMW commits up to 11 Feb 2018
2018-02-11 06:57:54 +02:00
scrawl
f28024b541
Don't use Activate and Move keys for GUI navigation if bound to mouse buttons ( Fixes #4225 , Fixes #4320 )
2018-02-10 23:11:03 +00:00
David Cernat
5d4b97645d
Merge pull request #374 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
2018-01-27 22:52:59 +02:00
scrawl
83726ee06a
Fix Reset Controls button not functioning properly
2018-01-11 01:47:42 +00:00
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
2018-01-10 03:49:53 +02:00
