David Cernat
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
2018-07-14 03:57:05 +03:00
David Cernat
6d43c8d63d
[Client] Send ActorAI with combat when an NPC's fight is set to 100
2018-07-14 02:55:38 +03:00
David Cernat
743933134d
[Client] Simplify sending of ActorAI packets for uninitialized actors
2018-07-14 01:00:27 +03:00
David Cernat
5f4ec1331f
[Client] Send ActorAI packet when combat is started via a client script
2018-07-14 00:07:15 +03:00
David Cernat
cc9e294cc0
[Client] Send ActorAI packet for new cell after being followed to it
2018-07-13 22:34:36 +03:00
David Cernat
528bd26a3b
[General] Allow followers to follow non-authority players through cells
2018-07-13 21:27:29 +03:00
David Cernat
ab5fd0aef8
[Server] Clean up descriptions for Object script functions
2018-07-13 04:55:05 +03:00
David Cernat
6c1173d598
[Client] Rename searchPtrViaRefIndex into searchPtrViaUniqueIndex
2018-07-13 04:33:54 +03:00
David Cernat
09da24f1ea
[General] Rename all instances of refNumIndex into refNum
...
This creates symmetry with mpNum and should cause less confusion in the future.
2018-07-13 04:12:03 +03:00
David Cernat
20296859ee
[Server] Clarify functions used for getting data in Networking
2018-07-13 02:40:24 +03:00
David Cernat
04dd59e638
[Server] Use clearer names for functions used to get last received data
...
Additionally, rename GetObjectChangesSize() into the less confusing GetObjectListSize()
2018-07-13 02:33:50 +03:00
David Cernat
aeb2e57444
[Server] Bring Actor functions in line with Object functions, part 2
...
The ActorPacket-sending functions now have sendToOtherVisitors and skipAttachedPlayer arguments, except for the ones for ActorList and ActorAuthority (because such arguments don't make sense for those).
2018-07-13 01:25:43 +03:00
David Cernat
837c5369c0
[Server] Add OnActorAI event and remove autosync for ActorAI packets
2018-07-13 01:05:27 +03:00
David Cernat
8f745df055
[Server] Bring Actor functions in line with Object functions, part 1
...
The last received ActorList can now be copied into the write-only ActorList that can be sent in packets. Changing the pid of the write-only ActorList can now be done separately from clearing its contents.
2018-07-13 01:04:41 +03:00
David Cernat
f0d4f1bbe5
[Client] Send ActorAI packets when followed by an NPC
...
The packet is sent regardless of whether we are the cell authority or not, so the server can decide what it wants to do with it.
2018-07-12 23:08:17 +03:00
David Cernat
6316f1e590
[Client] Add ActorList methods for sending ActorAI packets
...
Additionally, use consistent capitalization for AI-related methods.
2018-07-12 20:48:47 +03:00
David Cernat
0fd8f7660b
[Client] Replace LocalActor arg with BaseActor in ActorList functions
2018-07-12 20:15:04 +03:00
Marc Zinnschlag
0bd6078826
Merged pull request #1789
2018-07-12 18:56:59 +02:00
Andrei Kortunov
32bd294a8a
Add missing changelog entries
2018-07-12 16:39:46 +04:00
Andrei Kortunov
3d1daaebab
Rework manual spellcasting (e.g. via scripts)
2018-07-12 16:24:25 +04:00
David Cernat
bdf2f03c4f
[General] Remove unnecessary MapChanges struct from BaseWorldstate
2018-07-12 05:06:31 +03:00
David Cernat
59a56ca35e
[Client] Disallow clients from scaling their associated players
...
Additionally, display messages when trying to scale players.
2018-07-12 03:29:38 +03:00
David Cernat
8ca29dbaac
[Client] Fix remaining mistakes in debug for received ActorAI packets
2018-07-11 23:11:37 +03:00
David Cernat
5bb442bbd3
[Server] Add sendToOtherVisitors boolean to SendActorAI()
...
Additionally, avoid repetition in functions that send Actor packets.
2018-07-11 22:17:00 +03:00
David Cernat
25f7a55495
[Client] Improve debug for received ActorAI packets
2018-07-11 19:54:56 +03:00
David Cernat
ceea65f666
[General] Change pre-rewrite's version to 0.7.0-alpha
2018-07-11 19:35:28 +03:00
Bret Curtis
99e4d49e7c
Merge pull request #1787 from akortunov/profilierfont
...
Use the DejaVuLGCSansMono.ttf for profiler output
2018-07-11 16:00:34 +02:00
Andrei Kortunov
70b6d4983d
Use the DejaVuLGCSansMono.ttf in profilier output
2018-07-11 14:41:49 +04:00
Marc Zinnschlag
2d919ba215
changelog cleanup
2018-07-11 10:10:38 +02:00
Marc Zinnschlag
232be000a2
Updated credits file
2018-07-11 10:09:31 +02:00
Marc Zinnschlag
5080a65910
Merged pull request #1796
2018-07-11 10:08:44 +02:00
Marc Zinnschlag
ee759effce
Merged pull request #1798
2018-07-11 10:06:30 +02:00
Marc Zinnschlag
fa96154edd
Merged pull request #1803
2018-07-11 10:04:59 +02:00
David Cernat
7a646494ee
[General] Point to serverCore.lua instead of server.lua in server config
2018-07-11 02:53:40 +03:00
elsid
686830a6e3
Update changelog
2018-07-10 23:52:51 +03:00
elsid
3f21c49479
Put check for nif file name into separate function
2018-07-10 23:46:06 +03:00
elsid
2599aba196
Fix check whether file name starts with x or X
...
If path doens't contains / or \, then slashpos will be 0.
Therefore slashpos + 1 = 1 doesn't point to first symbol.
xmesh.nif
^
slashpos + 1
2018-07-10 23:46:06 +03:00
David Cernat
bff6e9e235
[General] Implement ActorAI packet, part 5
...
Allow repetition for AiWander package to be turned on and off.
2018-07-10 23:18:32 +03:00
Andrei Kortunov
c77c50e92b
Make Equip console command to bypass most of restrictions (bug #4460 )
2018-07-11 00:06:21 +04:00
Capostrophic
3186edc630
Update changelog
2018-07-10 22:22:20 +03:00
Capostrophic
5cb9dc9d12
Use SpellTurnLeft/TurnRight animation groups
2018-07-10 22:19:56 +03:00
Bret Curtis
b390ce3002
Merge pull request #1776 from akortunov/crossbowfix
...
Apply weapon reload animations only for upper body
2018-07-10 19:16:23 +02:00
Bret Curtis
df1576fcf5
Merge branch 'master' into crossbowfix
2018-07-10 19:15:37 +02:00
Bret Curtis
fde46f03b3
Merge pull request #1801 from terabyte25/terabyte25-trainingskill
...
Update trainer skill cap based off modified skill instead of based skill
2018-07-10 16:54:28 +02:00
terrabyte25
76fa8a163d
Update CHANGELOG.md
2018-07-10 17:09:14 +04:00
Andrei Kortunov
1c35e20fcc
Use 1h animations as fallback for crossbows
2018-07-10 17:02:51 +04:00
Andrei Kortunov
75dcbea365
Apply weapon reload animations only for upper body
2018-07-10 17:00:48 +04:00
Bret Curtis
3f63e625cf
Merge pull request #1802 from Capostrophic/cmake
...
Update CMake lists for Windows (task #2490 )
2018-07-10 14:34:59 +02:00
Capostrophic
d000f2756e
Update disabled warnings
2018-07-10 14:20:26 +03:00
Capostrophic
21403f8920
Update changelog
2018-07-10 14:20:26 +03:00