David Cernat
a083439139
Merge pull request #469 from davidcernat/master while resolving conflicts
...
# Conflicts:
# apps/openmw/main.cpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
2018-08-20 14:08:44 +03:00
David Cernat
7efee0e968
[Client] Fix GCC build
2018-08-20 10:15:30 +03:00
David Cernat
5bd2244898
[Client] Uninitialize DedicatedActors instantly in some situations
...
When LocalActors briefly become DedicatedActors as the result of a server script, the DedicatedActors are immediately uninitialized to avoid bugs like them jumping in place or rotating slightly.
Additionally, the playing of animations and sounds received in packets for DedicatedActors is no longer done during their next update, but is instead done instantly when the packets are received.
2018-08-16 03:50:41 +03:00
David Cernat
5fd4113978
[General] Implement sending of ActorSpeech packets from server scripts
2018-08-13 20:39:03 +03:00
David Cernat
338efdb705
[General] Fix issues with MechanicsHelper::getItemPtrFromStore()
2018-08-11 19:00:02 +03:00
David Cernat
aec0c5bd49
[Server] Make capitalization consistent for AI-related script functions
2018-08-11 18:57:36 +03:00
David Cernat
9598212aad
[Client] Don't add bound items to inventory as a result of item packets
...
Additionally, don't include bound items when sending PlayerInventory packets.
2018-08-11 16:05:37 +03:00
David Cernat
a3b9274365
[Client] Make it possible to check if an item ID belongs to a bound item
2018-08-11 16:02:09 +03:00
David Cernat
a1933e7bc2
[Client] Don't declare variable twice in LocalPlayer's setEquipment()
...
The variable equipmentItem is identical to currentItem, so it should not have been added in commit 58a6a8c3bc
Addditionally, use a more descriptive variable name than "a" for item Ptrs.
2018-08-11 15:28:03 +03:00
Marc Zinnschlag
1cfc1f9bdb
Merged pull request #1666
2018-08-10 12:23:17 +02:00
Marc Zinnschlag
0aedb3aada
Merged puil request #1808
2018-08-10 12:22:13 +02:00
Marc Zinnschlag
24212d58e8
Merged pull request #1861
2018-08-10 12:21:05 +02:00
Andrei Kortunov
cde95979d0
Fix combat engagement for creatures
2018-08-10 09:29:01 +04:00
David Cernat
5d66a9bb66
[Client] Fix path to MechanicsHelper in ProcessorPlayerItemUse
2018-08-09 22:33:22 +03:00
David Cernat
8df08c7d10
[General] Implement PlayerItemUse packet
...
Players can no longer unilaterally use items on themselves in their inventory. When they try to use an item, they send a PlayerItemUse packet to the server with the item's details. A serverside script can then check the item and either send the packet back to make the item use go through or drop it.
2018-08-09 18:25:20 +03:00
Andrei Kortunov
780648b584
Do not reset idle animations if we do not have ammo
2018-08-09 16:39:46 +04:00
Andrei Kortunov
df577babe9
Increase priority of 1st-person weapon animations to avoid issues with animation blending
2018-08-09 16:39:20 +04:00
Andrei Kortunov
71bcc11ba5
Apply only crossbow reload animation to upper body
2018-08-09 16:37:08 +04:00
Andrei Kortunov
a0d0e5d2db
Give jumping animations higher priority than movement ones
2018-08-09 16:19:03 +04:00
Andrei Kortunov
6a03aa6fdb
Reduce jittering during turning animations for player
2018-08-09 16:19:00 +04:00
Andrei Kortunov
cd92014533
Do not touch GUI modes when taking screenshots (bug #4528 )
2018-08-09 16:19:00 +04:00
Marc Zinnschlag
fe19d8ff35
Merged pull request #1857
2018-08-09 13:52:51 +02:00
Marc Zinnschlag
a2a57cf694
Merged pull request #1858
2018-08-09 13:51:31 +02:00
Marc Zinnschlag
0f510011b3
Merged pull request #1852
2018-08-09 13:49:50 +02:00
Andrei Kortunov
126b2fdd42
Use the isPlayer variable to do not check if the current actor is player every time
2018-08-09 11:16:19 +04:00
Andrei Kortunov
51af729305
Do not use headtracking in the 1st-person view (bug #4573 )
2018-08-08 23:29:03 +04:00
Andrei Kortunov
6202b4eca9
Do not touch GUI modes when taking screenshots (bug #4528 )
2018-08-08 22:10:53 +04:00
Capostrophic
e9e9c0dd6b
Fix guild guide fast travelling to exteriors time
2018-08-08 12:46:36 +03:00
Andrei Kortunov
b7859b3fa9
Cap underwater view distance (bug #4565 )
2018-08-08 13:22:40 +04:00
Capostrophic
bcd9cc4baa
Check the actor cell instead of the destination cell in fast travel price logic
2018-08-08 02:07:48 +03:00
Marc Zinnschlag
b75b5d139a
Merged pull request #1845
2018-08-05 12:28:38 +02:00
Marc Zinnschlag
7a93d118d2
Merged pull request #1846
2018-08-05 12:26:56 +02:00
Capostrophic
7087bad580
Use special behavior for all topics with reserved names (bug #4557 )
2018-08-05 12:39:53 +03:00
Andrei Kortunov
1f4dd3b393
Make partial binary search case insensitive, as it supposed to be (bug #4558 )
2018-08-05 13:26:12 +04:00
David Cernat
888e1dfff8
[General] Allow setting of AI fight & dynamic stats in record packets
...
Additionally, allow the setting of the Autocalc flag for an NPC record based on an existing record.
2018-08-05 11:00:25 +03:00
Andrei Kortunov
b0f2e00e7f
Make forcegreeting a non-op for non-actor objects (bug #4553 )
2018-08-05 09:31:45 +04:00
Koncord
d03722b3f4
[Browser] Rework browser for improved stability & clarity
...
(cherry picked from commits 5c79e7106f
, 57353cdfff
, 15723adb9a
, 01a5196a92
, ed75563a94
, 3839a2dcfd
, 1fd16ba69c
, 66283943c5
, ba8613a179
, 5b8f4f3e92
, 35b771b19e
, 043eb224e2
, 05fac2f67d
)
2018-08-05 07:20:12 +03:00
Marc Zinnschlag
452a706047
Merged pull request #1837
2018-08-04 10:26:44 +02:00
Marc Zinnschlag
b6a919a2d1
Merged pull request #1838
2018-08-04 10:26:18 +02:00
Marc Zinnschlag
99c03d55f0
Merged pull request #1841
2018-08-04 10:25:52 +02:00
Marc Zinnschlag
2a621fedd1
Merged pull request #1842
2018-08-04 10:08:11 +02:00
Capostrophic
d15dcaff68
Don't adjust weapon rating according to weapon condition twice
2018-08-03 19:22:58 +03:00
David Cernat
6498bcb22b
[Server] Add script functions for getting player draw & sneak states
2018-08-03 18:26:44 +03:00
Andrei Kortunov
e2519226aa
Move boost include
2018-08-03 17:04:07 +04:00
Andrei Kortunov
eeffe2e557
Check if item model exists inside drag and drop functions
2018-08-03 16:42:43 +04:00
Andrei Kortunov
c2a175c2e0
Move crash catcher wrapper to separate file
2018-08-03 15:51:17 +04:00
Capostrophic
725a9323c4
Merge branch 'master' into sound
2018-08-03 14:16:51 +03:00
Capostrophic
4c7f3cf626
Merge branch 'master' into weaponpriority
2018-08-03 14:07:11 +03:00
Marc Zinnschlag
4d280add81
Merged pull request #1843
2018-08-03 12:56:17 +02:00
Marc Zinnschlag
d7718aae9b
Merged pull request #1840
2018-08-03 12:54:56 +02:00