mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 05:19:55 +00:00
Code Issues Releases Wiki Activity
25994 commits 38 branches 54 tags 122 MiB
Commit graph

1260 commits

Author SHA1 Message Date
David Cernat
e5b1843089 Add OpenMW commits up to 11 Jun 2020 
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/activespells.cpp
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aiactivate.hpp
#	apps/openmw/mwmechanics/creaturestats.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2020-06-11 13:21:58 +03:00
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
81805b7263 Introduce a separate class to control world date and time 2020-06-05 12:07:32 +04:00
Bret Curtis
2eb9d4ad4e
Merge pull request #2878 from Assumeru/mutate-ai 
Mutate base records when editing AI settings (#2798)
 2020-06-03 15:09:40 +02:00
Andrei Kortunov
c0e62e9529 Refactor list of variables in the WorldManager 2020-06-03 11:21:34 +04:00
Evil Eye
4d7947d27c Mutate base records when editing AI settings (#2798) 2020-06-02 21:59:37 +02:00
elsid
b67e18329e
Store AI packages as unique_ptr 2020-06-01 17:07:08 +02:00
Bret Curtis
9d0855baa5
Merge pull request #2866 from elsid/extend_osg_stats 
Extend OSG stats
 2020-05-29 23:23:38 +02:00
elsid
69df6098e5
Report frame number, number of actors and objects to stats 2020-05-22 17:39:18 +02:00
Capostrophic
c9c9599ec5 Improve GetDistance and object search warnings (bug #5427) 
Allow GetDistance to work with a non-existent object argument or with inventory items that belong to a container store that doesn't exist
 2020-05-22 15:50:04 +03:00
unknown
3b4782959e Allow targeting non-unique actors with StartScript (bug #2311) 2020-05-10 14:57:06 +02:00
David Cernat
053a5a6258 Add OpenMW commits up to 9 May 2020 
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/aiextensions.cpp
 2020-05-09 15:17:04 +03:00
Capostrophic
8d22e075e6 Separate functions that don't belong to CastSpell class 2020-04-26 22:17:38 +03:00
Capostrophic
5535a7fb44 Move getSummonedCreature() to summoning 2020-04-26 18:58:33 +03:00
David Cernat
a20f8e77dc Add OpenMW commits up to 25 Apr 2020 
# Conflicts:
#	.travis.yml
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
 2020-04-25 09:52:58 +03:00
Bret Curtis
c359406473 taking anyoldname3 review comments to heart; typo fixes plus rebase 2020-04-22 20:29:50 +02:00
bzzt
1cd4b9ee68 fixes shadows on savegame screenshot 2020-04-22 20:18:29 +02:00
Bret Curtis
8a8107e837 as it says; revert vismask and uncomplicate openmw 2020-04-20 20:57:38 +02:00
David Cernat
7bc3298ed4 Add OpenMW commits up to 1 Apr 2020 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	apps/openmw/mwphysics/physicssystem.cpp
 2020-04-01 19:24:11 +03:00
Capostrophic
ca6cce0c7e Separate Stepper 2020-03-31 00:38:34 +03:00
Andrei Kortunov
d2a2c74e08 Trace down dead persistent actors underwater (regression #5317) 2020-03-21 10:41:35 +04:00
David Cernat
43e7df6df8 Add OpenMW commits up to 11 Mar 2020 2020-03-11 22:17:17 +02:00
Alexei Dobrohotov
7e6a533a29
Merge pull request #2695 from elsid/aiwander_check_destination 
Add more destination checks for AiWander without pathgrid
 2020-03-11 20:48:22 +03:00
David Cernat
85fb1d1a0b Add OpenMW commits up to 19 Feb 2020 
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
 2020-02-20 01:51:47 +02:00
Bret Curtis
a0902bb98e
Merge pull request #2700 from akortunov/masks 
Move VisMask to components
 2020-02-17 11:58:53 +01:00
Andrei Kortunov
84979fa8b7 Move VisMask to components 2020-02-16 16:03:35 +04:00
elsid
1e4565a15c
Avoid using temporary vector to get items owned by 2020-02-11 22:24:18 +01:00
David Cernat
a13cef9913 Merge branch '0.7.0reset' of https://github.com/uramer/openmw into 0.7.1 
# Conflicts:
#	apps/openmw-mp/Script/Functions/Worldstate.cpp
#	apps/openmw-mp/Script/Functions/Worldstate.hpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwmp/CellController.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2020-02-11 15:41:38 +02:00
elsid
4a0c056489
Do not wander to occupied area by other actor 2020-02-10 22:29:54 +01:00
elsid
85414e2353
Check for line of sight for wander destination 2020-02-10 22:29:54 +01:00
David Cernat
a58f09fd6c Add OpenMW commits up to 2 Jan 2020 
# Conflicts:
#	apps/openmw/mwmechanics/enchanting.cpp
#	apps/openmw/mwworld/scene.cpp
 2020-01-02 22:09:54 +02:00
Andrei Kortunov
24ce242941 Implement TestCells (feature #5219) 2019-12-22 11:13:42 +04:00
David Cernat
ca9cd90a4d Add OpenMW commits up to 20 Dec 2019 
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
 2019-12-20 15:43:50 +02:00
Capostrophic
483b37bb3f Disallow resting if the fall height hasn't been reset (bug #4802) 2019-12-12 15:26:02 +03:00
David Cernat
3aaf64a984 [Client] Only send DoorState packets for logged in players 
This prevents problems with content that uses scripted doors in the area players are spawned in before they log in.
 2019-12-03 12:23:05 +02:00
David Cernat
9d6f3fdd09 Add OpenMW commits up to 1 Dec 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
 2019-12-01 23:52:42 +02:00
elsid
3cfd5fca4e
Rotate door object using direct rotation order once 
Instead of rotating using inverse and then applying the direct rotation.
To properly update object in navigator.
 2019-11-30 14:09:00 +01:00
David Cernat
0c98c5d09e Add OpenMW commits up to 19 Nov 2019 
# Conflicts:
#	apps/openmw/mwmechanics/aipursue.cpp
#	apps/openmw/mwmechanics/summoning.cpp
 2019-11-19 17:16:48 +02:00
Andrei Kortunov
6861d9d5e5
Merge pull request #2510 from elsid/ai_open_door 
Open door when it is on the way to a next path point (bug #5073)
 2019-11-17 21:21:22 +04:00
David Cernat
bde9f7b817 Add OpenMW commits up to 20 Oct 2019 
# Conflicts:
#	apps/openmw/mwgui/recharge.cpp
#	apps/openmw/mwrender/globalmap.cpp
#	apps/openmw/mwrender/globalmap.hpp
#	apps/openmw/mwworld/inventorystore.cpp
 2019-10-29 22:26:35 +02:00
Andrei Kortunov
c51aba0b13 Recharge items outside of player's inventory (bug #4077) 2019-10-07 22:59:43 +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
elsid
6253d2a7ac
Undo door rotation once 2019-09-29 13:42:51 +02:00
David Cernat
0b85829e38 [Client] Make it possible to unload Cells & clear CellStores from World 2019-09-28 13:09:03 +03:00
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
Andrei Kortunov
a4d196f33f Force view change when using Force1stPerson and Force3rdPerson commands (bug #5168) 2019-09-19 21:48:43 +04: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
elsid
209e33f5ce
Open door when it is on the way to a next path point 2019-09-15 21:16:00 +02:00
Capostrophic
6b74630f6e Preparation work 
Phase out canBeActivated() to unify activation checks
Use getName() for the name caption in tooltips
Always use tooltips for non-activator objects
Invert hasTooltip default value
 2019-09-10 23:38:16 +03:00