Alexei Dobrohotov
f3e8fbfded
Merge branch 'range-safety' into 'master'
...
Make script literal lookup functions safer
See merge request OpenMW/openmw!113
2019-12-18 15:27:49 +00:00
Alexei Dobrohotov
c3073f3225
Merge pull request #2634 from akortunov/textures
...
Make TextureProperty warnings more informative
2019-12-15 16:28:10 +03:00
Alexei Dobrohotov
9dc8fecdb3
Merge pull request #2633 from akortunov/equip
...
Improve equipment logic
2019-12-15 16:27:09 +03:00
Andrei Kortunov
c41562fa27
Make TextureProperty warnings more informative
2019-12-15 13:56:20 +04:00
David Cernat
2249450b0e
[Client] Fix inability for actors to talk to players caused by 4118b20608
2019-12-15 11:50:15 +02:00
David Cernat
9763f6f9c5
[Client] Fix infinite activation loops caused by 48aba76ce9
2019-12-15 07:23:37 +02:00
Andrei Kortunov
d712d6b8ce
Merge pull request #2632 from Capostrophic/controllers
...
Avoid working with empty controller data (bug #5229 )
2019-12-14 22:51:22 +04:00
Andrei Kortunov
97ee4bc349
Improve equipment logic (bug #5223 )
2019-12-14 22:30:27 +04:00
Capostrophic
909c8ef0ea
Avoid working with empty controller data (bug #5229 )
2019-12-14 20:35:23 +03:00
David Cernat
bc093c8596
[General] Implement OnObjectHit packet, part 2
...
ObjectHit is now also sent when local actors succeed or fail in hitting other actors with melee attacks, with the packet including the success state of their attack.
It is also sent when creatures hit a non-actor object.
2019-12-13 14:00:51 +02:00
David Cernat
96049befe9
[Client] Add and use getObjectFromPtr() method in ObjectList
2019-12-13 13:07:21 +02:00
Andrei Kortunov
abe7d25844
Merge pull request #2631 from Capostrophic/falldamage
...
Disallow resting if the fall height hasn't been reset (bug #4802 )
2019-12-12 21:53:02 +04:00
Capostrophic
483b37bb3f
Disallow resting if the fall height hasn't been reset (bug #4802 )
2019-12-12 15:26:02 +03:00
Alexei Dobrohotov
0a32850441
Merge pull request #2630 from akortunov/reputation
...
Cap reputation values
2019-12-11 14:58:20 +03:00
Andrei Kortunov
3d9c42e8ee
Cap reputation values (bug #5226 )
2019-12-11 08:47:46 +04:00
Alexei Dobrohotov
150a1e735f
Merge pull request #2629 from akortunov/shapes
...
Handle NiKeyframeController for NiTriShape
2019-12-10 16:17:01 +03:00
Andrei Kortunov
5b5c52d92e
Handle NiKeyframeController for NiTriShape (feature #5224 )
2019-12-10 16:20:27 +04:00
Andrei Kortunov
1e62115800
Merge pull request #2628 from Capostrophic/launcher
...
Launcher: improve first run and missing game data dialogues (bug #4009 )
2019-12-09 10:43:06 +04:00
David Cernat
e98e57c797
[General] Reorder enums alphabetically in RECORD_TYPE
2019-12-08 17:23:14 +02:00
David Cernat
2973cc4f4d
[General] Implement OnObjectHit packet, part 1
...
ObjectHit is now sent when an NPC hits a non-actor object.
2019-12-08 16:14:01 +02:00
Capostrophic
0a96f065d7
Launcher: improve first run and missing game data dialogues (bug #4009 )
2019-12-08 17:03:27 +03:00
David Cernat
0e0ac7a60f
[Server] Add OnConsoleCommand event and associated script function
2019-12-07 10:13:10 +02:00
David Cernat
eeb77f80d2
[Client] Send ConsoleCommand packets when console is used
2019-12-07 10:11:45 +02:00
David Cernat
18cd3d1ea1
[General] Compress strings used in Object packets
2019-12-07 08:47:35 +02:00
David Cernat
4b27f8986b
[Client] Synchronize positions for actors during death animations
...
This needs some improvements, because:
1) Sometimes the cell authority sends the death animation too late and a different one gets played on the other clients
2) There is probably a simpler check that can be done for position changes during a death animation.
2019-12-06 21:04:42 +02:00
David Cernat
9b8818687d
[General] Add mDeathAnimationFinished to mwmp::SimpleCreatureStats
2019-12-06 20:59:43 +02:00
David Cernat
7dd03798e7
[Client] Don't update already initialized but deleted LocalActors
2019-12-06 16:12:29 +02: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
2af811be40
[Client] Use proper log message when receiving ActorDeath packets
2019-12-06 12:43:41 +02:00
David Cernat
1950748dae
[Client] Always use autoEquip on newly initialized LocalActors
...
Previously, it was possible for a Container packet to clear all equipment slots for an actor without the actor's authority then sending an equipment packet to correct that, due to packet loss or sudden disconnection, leading to actors not wearing any equipment as soon as they acquired a new authority.
This ensures that newly initialized LocalActors will now autoEquip.
2019-12-06 12:21:30 +02:00
David Cernat
cd444f8707
[Client] Send actor equipment after Container packet causes autoEquip
...
Previously, a Container packet with a SET action for an actor would clear their entire InventoryStore, also clearing all of their equipment slots. The actor's authority would then autoEquip new equipment for the actor, but that new equipment would not actually get sent to the other players. As a result, they would see the actor fighting with hand-to-hand attacks, while also not actually wearing anything despite being rendered as wearing the same clothes and armor as before.
This commit makes the actor's authority resend the actor's equipment as soon as the Container packet has caused the autoEquip to happen.
2019-12-06 11:40:07 +02:00
Andrei Kortunov
675ba806bf
Merge pull request #2627 from Capostrophic/essimporter
...
Fix essimporter script header and inventory item conversion
2019-12-06 10:01:51 +04:00
Capostrophic
0bc13b47fa
Fix essimporter script header and inventory item conversion
2019-12-05 23:50:55 +03:00
David Cernat
f43ba7fba2
[Client] Don't initialize disabled or deleted actors as LocalActors
2019-12-05 20:27:48 +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
Andrei Kortunov
43330f1dd1
Merge pull request #2626 from akortunov/master
...
Reset holstered shield before rebuilding an NPC animation
2019-12-05 17:37:21 +04:00
Andrei Kortunov
d66b81d7f7
Reset holstered shield before rebuilding an NPC animation
2019-12-05 17:35:32 +04:00
David Cernat
a383b7b612
[General] Include death animations in ActorDeath packets
2019-12-05 13:27:55 +02:00
David Cernat
ecf00af548
[General] Implement WorldDestinationOverride packet, part 1
...
Destinations for doors with cell transitions are now overridden.
2019-12-04 16:43:56 +02:00
David Cernat
9cb9d4b7ca
[General] Compress strings used in Worldstate packets
2019-12-04 11:01:50 +02:00
David Cernat
154a9ce5a6
[General] Fix declarations hiding class members, part 2
2019-12-04 10:17:33 +02:00
David Cernat
270867a397
[Client] Ensure mwmp::Main is initialized before GUIController cleanup
...
Previously, certain errors early in the program's execution – such as an attempt to use two different packet processors for the same packet ID – would not be displayed because of a crash when attempting to get an uninitialized mwmp::Main in the Engine's destructor.
2019-12-04 08:39:33 +02:00
Andrei Kortunov
ed9f4d965f
Merge pull request #2624 from Capostrophic/cellname
...
Make sure empty cell name subrecords are saved (bug #5222 )
2019-12-04 08:30:00 +04:00
David Cernat
5b4db83d61
[Client] Once again allow beds to be used even if waiting is disallowed
...
This had been broken by rest-related commits in OpenMW.
2019-12-03 23:55:55 +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
Capostrophic
86c8fe386b
Fix idle state reset
2019-12-03 20:50:57 +03:00
Capostrophic
4b38bab0d9
Make sure empty cell name subrecords are saved (bug #5222 )
2019-12-03 18:47:02 +03:00
David Cernat
3a52f7dcf5
[Client] Add isTeamMember() method to MechanicsHelper
2019-12-03 17:04:49 +02:00
David Cernat
68f524b822
[Client] Use more succinct methods for PlayerPtr in MechanicsHelper
2019-12-03 14:12:40 +02:00
David Cernat
21c8821d05
[General] Ignore carriage returns in resources/version file
2019-12-03 13:21:10 +02:00
