David Cernat
339428872e
[Client] Fix infinite loop in CellController
...
Previously, using CellController::getCellStore() to get an unloaded CellStore would make its references get loaded in the process, with the CellStore's loadRefs() then running updateMergedRefs(), which in turn – before getting as far as setting the CellStore's state to State_Loaded – would call CellController::hasLocalAuthority() on its accompanying ESM::Cell, which would then run CellController::isActiveWorldCell(), which would then run CellController::getCellStore() to get the CellStore again, which – still being marked as unloaded – would run the whole loop again... and again.
2019-09-23 21:18:38 +03:00
David Cernat
cc25612b8d
Add OpenMW commits up to 18 Sep 2019
...
# Conflicts:
# apps/openmw/mwclass/container.cpp
# apps/openmw/mwclass/door.cpp
# apps/openmw/mwmechanics/security.cpp
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/miscextensions.cpp
2019-09-18 23:46:08 +03:00
Andrei Kortunov
85bb4a76f6
Improve faction items handling (bug #5164 )
2019-09-17 19:09:08 +04:00
Andrei Kortunov
d58f93f388
Use sayDone() only for scripting backward compatibility
2019-09-06 09:19:41 +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
Capostrophic
c89c14bb68
Rename objectOpened() to make its role more clear
2019-09-05 17:36:49 +03:00
Andrei Kortunov
b6044d231a
Handle death event manually before disposing a corpse if a death animation was not finished yet (feature #5146 )
2019-08-27 22:42:41 +04:00
elsid
16170131b7
Add enum type for door state
2019-08-25 15:21:00 +02: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
6205ff6b04
Add OpenMW commits up to 30 Jan 2019
...
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
2019-08-21 15:48:07 +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
3efffe92e3
Add OpenMW commits up to 5 Nov 2018
...
# Conflicts:
# CI/before_install.linux.sh
# CMakeLists.txt
# apps/openmw/mwmechanics/aifollow.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/CMakeLists.txt
2019-08-21 05:08:50 +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
Capostrophic
0b074f2211
Rewrite messed up playerlooking switch handling (bug #5078 )
2019-07-29 15:44:17 +03:00
Capostrophic
56539fee4f
Partially revert "Get rid of redundant setKeyFocusWidget() method"
2019-06-09 02:12:44 +03:00
Andrei Kortunov
1ce370e7fa
Make console to do not hide other GUI windows (bug #1515 )
2019-05-29 17:10:57 +04:00
Andrei Kortunov
faf940546b
Get rid of redundant setKeyFocusWidget() method
2019-05-17 19:09:40 +04:00
Alexei Dobrohotov
216f908a07
Merge pull request #2286 from akortunov/map
...
Do not re-render maps for all active cells during cell transitions
2019-05-11 02:30:38 +03:00
Alexei Dobrohotov
1d12d778ea
Merge pull request #2370 from akortunov/herbalism
...
Container search tweaks
2019-05-06 22:34:12 +03:00
Andrei Kortunov
7214f24f5c
Ignore containers, when we search for owner
2019-05-06 23:06:13 +04:00
Alexei Dobrohotov
632e7b973b
Merge pull request #2349 from akortunov/pinning
...
Allow to maximize windows via Shift + Double Click
2019-05-04 20:21:30 +03:00
Andrei Kortunov
861d41f4a4
Native graphics herbalism support (feature #5010 )
2019-05-02 23:03:47 +04:00
Andrei Kortunov
c5ac580e74
Allow to maximize windows via Shift + Double Click (feature #3999 )
2019-05-01 20:15:11 +04:00
Bret Curtis
7808cbbfe8
Merge pull request #2292 from akortunov/fallback
...
Make fallback map static to simplify constructors
2019-04-07 17:43:59 +02:00
Capostrophic
7202f45771
Only allow resting in air when a bed is used
2019-04-04 17:22:24 +03:00
Capostrophic
3a0e374dc6
Replicate vanilla Position/SetPos behavior more closely (bug #3109 )
2019-03-31 14:17:06 +03:00
bzzt
ed4ce4609b
Do not re-render maps for all active cells during cell transitions
2019-03-30 09:10:48 +04:00
Andrei Kortunov
a302ec9c65
Make fallback map static to simplify constructors
2019-03-29 15:30:49 +04:00
Bret Curtis
886c77bced
Merge pull request #2145 from akortunov/rest
...
Update jail state once instead of for every single hour
2019-03-27 13:14:22 +01:00
Capostrophic
abae35e88b
Loop title screen music (bug #4896 )
2019-03-17 21:05:52 +03:00
elsid
1218e4e15d
Use player half extents only to find path in exterior cells
2019-03-04 22:59:20 +03:00
Bret Curtis
14c93b3df0
Revert "Merge pull request #2204 from elsid/fix_navigator_update"
...
This reverts commit 26fb0e7a0f
, reversing
changes made to 42b2391303
.
2019-03-04 11:06:15 +01:00
elsid
a4f300f810
Use player half extents only to find path in exterior cells
2019-03-03 16:21:09 +03:00
Andrei Kortunov
fcdb0c16bf
Update jail state once instead of for every single hour
2019-02-23 09:17:06 +04:00
elsid
1d3668cd22
Add Navigator interface
2019-02-16 15:37:06 +03:00
Bret Curtis
a573efd30a
Merge pull request #2112 from Capostrophic/collision
...
[0.45.0 regression] Don't re-enable collision body for dead actors
2019-02-05 15:36:06 +01:00
Capostrophic
a584aa25ab
Don't re-enable collision object for dead actors
2019-02-04 22:13:30 +03:00
Andrei Kortunov
9e4a339ad3
Daytime node switch support (feature #4836 )
2019-02-02 10:50:15 +04:00
Andrei Kortunov
ab0841cc3d
Split physics update from world update in the profiler
2019-01-07 14:44:43 +04:00
Andrei Kortunov
a53333c3d5
Native animated containers support (feature #4730 )
2018-12-13 23:11:16 +04:00
Andrei Kortunov
829faf7b2c
Improve toggleactorspaths console command
2018-11-03 10:42:14 +04:00