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
terrabyte25
35755eb1f1
[Client] Disallow opening inventory menu when not logged in
2018-12-01 10:51:33 -06: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
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
Andrei Kortunov
dba071f881
Remove the 'Screenshot saved' message (bug #4191 )
2018-01-08 13:12:12 +04:00
David Cernat
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
2017-12-25 02:25:01 +02:00
Miloslav Číž
a142a67972
Add default settings for 360 screenshots
2017-12-06 21:16:30 +01:00
David Cernat
c9c363ebef
[General] Allow GameSettings to set bed & wilderness resting separately
2017-11-30 12:18:15 +02:00
David Cernat
22521578eb
Merge pull request #349 from OpenMW/master
...
Add OpenMW commits up to 28 Nov 2017
2017-11-29 03:52:15 +02:00
David Cernat
3508a16836
[General] Use GameSettings packet to set ability to rest and wait
2017-11-27 07:39:02 +02:00
Andrei Kortunov
dea7d0beff
Do not interrupt swim and sneak idle animations during attack (bug #4122 )
2017-11-26 09:54:12 +04:00
Miloslav Číž
902862aa8b
display confirming message for all screenshots
2017-11-16 13:50:10 +01:00
Miloslav Číž
1ab854446c
remove unused include
2017-11-11 17:21:01 +01:00
Miloslav Číž
511a5686da
planet mapping adjustment
2017-11-11 15:10:54 +01:00
Miloslav Číž
4fc532d873
reference screenshot settings only from one place
2017-11-11 14:32:28 +01:00
Miloslav Číž
d71d984cfa
more unused stuff cleanup
2017-11-11 14:14:24 +01:00
Miloslav Číž
525f8b4d8e
get rid of special key for 360 screenshot
2017-11-11 13:51:42 +01:00
David Cernat
01db219de4
Merge pull request #333 from OpenMW/master
...
Add OpenMW commits up to 11 Nov 2017
2017-11-11 03:46:21 +02:00
scrawl
f1aeb416ec
Disable Activate key when textinput is active (Bug #4151 )
2017-11-10 22:54:53 +00:00
scrawl
1afbf99f74
Make movement keys not function in text input mode
2017-11-10 22:51:31 +00:00
Miloslav Číž
319ed2f9b8
disable 360 screenshots in vanity/preview mode
2017-11-10 15:23:44 +01:00
Miloslav Číž
d763e9fe46
add settings for spherical screenshots
2017-11-09 20:25:29 +01:00
Miloslav Číž
8f32114025
segfault fix
2017-11-09 18:26:27 +01:00
Miloslav Číž
d4fd08a63f
save 360 screenshots in the configured directory
2017-11-09 16:49:46 +01:00
Miloslav Číž
1b97a541f4
make a new action for 360 screenshot
2017-11-09 16:06:29 +01:00
Miloslav Číž
5afe02505b
hide player in first person 360 screenshot
2017-11-07 16:12:31 +01:00
Miloslav Číž
7feba7e498
basic setup for 360 screenshots
2017-11-07 13:07:11 +01:00
David Cernat
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2017-10-16 07:37:29 +03:00
scrawl
548e90a7bc
Set cursor active when moving by controller
2017-10-13 16:22:44 +00:00
David Cernat
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
2017-10-06 04:10:04 +03:00
scrawl
cd437f094d
Fix exiting savegamedialog with 'esc' when no game is running
2017-10-05 18:35:09 +02:00
scrawl
0240a6c38b
Fix controls window regression
2017-09-27 21:30:12 +02:00
