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
99e89f23a6
Fix calculateNpcStatModifiers call for non-NPCs
2020-03-28 19:15:13 +03:00
Capostrophic
04ebe5c4c9
Reset skills of dead actors (bug #5328 )
2020-03-26 15:22:31 +03:00
David Cernat
43e7df6df8
Add OpenMW commits up to 11 Mar 2020
2020-03-11 22:17:17 +02:00
Capostrophic
1da4b31047
Switch torches to shields for hostile NPCs (bug #5300 )
2020-02-24 02:20:08 +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
Andrei Kortunov
84979fa8b7
Move VisMask to components
2020-02-16 16:03:35 +04:00
David Cernat
f0f76516d8
Add OpenMW commits up to 4 Feb 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
2020-02-05 02:03:31 +02:00
Andrei Kortunov
1522883fdd
Do not interrupt greeting update when Hello = 0 or actor starts to swim (bug #5248 )
2020-01-29 16:31:09 +04:00
David Cernat
59a38164ea
[Client] Add generic objects to ObjectList using addObjectGeneric()
2020-01-23 09:03:40 +02:00
David Cernat
989188c171
[Client] Remove ObjectList's confusing addObjectDelete() function
2020-01-22 14:35:51 +02:00
David Cernat
60b6f92fa3
Add OpenMW commits up to 13 Jan 2020
...
# Conflicts:
# apps/openmw/mwmechanics/actors.cpp
2020-01-15 07:49:26 +02:00
Andrei Kortunov
a384104f73
Rework greeting timeouts (bug #5249 )
2020-01-11 21:47:08 +04:00
capostrophic
fc0f813dcb
Add and use 'always active' AI package flag
...
Update documentation
2020-01-10 12:07:57 +03:00
capostrophic
2d87d287ba
Handle out-of-range actors' travel packages ( #5212 )
2020-01-09 14:17:54 +03: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
Andrei Kortunov
97ee4bc349
Improve equipment logic (bug #5223 )
2019-12-14 22:30:27 +04:00
David Cernat
c253950dd7
[Client] Don't play dying words for NPCs loaded up as dead from server
2019-12-06 14:50:10 +02:00
David Cernat
980edac942
[General] Rename PlayerTeam into PlayerAlly
...
Considering that you can be allies with someone without being allied to their allies, changing the name makes the system more intuitive.
2019-12-05 19:15:11 +02:00
David Cernat
c4950f1beb
[Client] Implement PlayerTeam packet, part 2
...
When determining actors siding with someone, also check the team members of DedicatedPlayers, not just those of the LocalPlayer.
Don't set players as each other's hitAttemptActor if they are team members.
Don't run startCombat() for DedicatedPlayers who get attacked.
2019-12-03 22:40:02 +02:00
David Cernat
9792a5256f
[General] Use different compromise for summoning
...
Revert 9502d84a9cb99028f76f7fd2e05f9193ca66561 because the creature graveyard solves more problems than it causes. Only have the authority of a cell send deletion packets when a summon despawns.
Summoning is one of the least multiplayer-friendly systems in OpenMW and really needs to be redone serverside.
2019-12-02 20:48:52 +02:00
David Cernat
753e310dd4
[General] Implement PlayerTeam packet
2019-12-02 19:08:03 +02:00
David Cernat
d9502d84a9
[Client] Disable clientside handling of summoned creature graveyards
2019-12-01 20:22:04 +02:00
David Cernat
ed7fe859dd
[Client] Set attackingOrSpell state instantly after Attack/Cast packets
...
It is no longer necessary to wait for the Actors::update() loop to set dedicated players and actors to their new states.
2019-11-30 15:03:51 +02:00
David Cernat
7acf6865b9
[Client] Don't clear spells for dying actors
2019-11-29 19:49:17 +02:00
David Cernat
bbf9f20053
[Client] Stop sending WorldKillCount packets or incrementing local kills
...
This means the server scripts are now required to send a WorldKillCount packet as a reply to ActorDeath packets sent by clients. This gives the server full control over which kills are counted, while also solving the previous problem of kills being counted only for actors that had finished their death animations.
2019-11-27 11:21:29 +02: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
6554130f6f
Merge pull request #2594 from Capostrophic/summonsummon
...
Minor summoned creature cleanup fixes
2019-11-17 10:47:07 +04:00
Andrei Kortunov
8dbbe42f21
Add missing isNpc() check (bug #5206 )
2019-11-17 09:17:03 +04:00
Capostrophic
1097c2cfc4
Minor summoned creature cleanup fixes
2019-11-12 17:50:06 +03:00
David Cernat
5762a36fc2
Add OpenMW commits up to 7 Nov 2019
...
# Conflicts:
# apps/openmw/mwmechanics/aifollow.hpp
2019-11-08 06:20:41 +02:00
Andrei Kortunov
61ab7f3c1e
Implement actors movement deceleration (feature #4544 )
2019-10-31 14:41:12 +04:00
David Cernat
54301f5f89
Add OpenMW commits up to 29 Oct 2019
...
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
# apps/openmw/mwworld/inventorystore.cpp
2019-10-29 23:49:31 +02: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
Capostrophic
ee4fa93bd4
Rework prevent merchant equipping setting again
2019-10-28 01:58:23 +03:00
Capostrophic
bc5d54a161
Fix GetEffect result when running on dead actors
2019-10-12 19:06:10 +03:00
Andrei Kortunov
31e78ed41f
Rework 'prevent merchant equipping' feature
2019-10-12 14:17:03 +04:00
Capostrophic
ce943b4f9e
Make enchantments affect all actors with an inventory (bug #5186 )
2019-10-11 19:29:12 +03:00
Andrei Kortunov
69aceb5c1e
Split greetings from AiWander (bug #4594 )
2019-10-10 09:28:40 +04:00
David Cernat
d163f1b6da
[General] Turn WorldKillCount into a Worldstate packet
...
Rename the old WorldKillCount that was a Player packet into PlayerPlaceholder. Rename the unused CellCreate that was a Worldstate packet into WorldKillCount. On the server, move kill count-related script functions from QuestFunctions to WorldstateFunctions.
2019-10-08 11:09:08 +03: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
Andrei Kortunov
6450d84473
Improve resurrection handling
2019-09-21 20:22:45 +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
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
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
David Cernat
9350e1d484
[General] Split up Attack packets into Attack and Cast ones
...
Create an entirely new PlayerCast packet for that purpose, but rename the already existing but unused ActorInteraction into ActorCast.
2019-08-25 09:35:23 +03: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
