David Cernat
b81ca18316
[Client] Don't clear container Ptrs when disposing of corpses
...
The reason for this is that only the server should be determine whether a corpse can be disposed of or not.
2018-06-28 01:45:15 +03:00
Nikolay Kasyanov
5fcb091127
Replace FIXME with a detailed explanation of the issue
2018-06-27 22:40:09 +02:00
Nikolay Kasyanov
9c78364c45
Revert "Merge pull request #1771 from Xenkhan/master"
...
This reverts commit 9667dd051cf52e06fc19
2018-06-27 22:19:09 +02:00
David Cernat
7ffdb18bf9
[General] Implement ActorDeath packet, part 1
...
ActorDeath packets are sent for dead actors before their StatsDynamic packets. They contain the actor's deathReason in a manner similar to that of PlayerDeath packets.
A future commit will replace the deathReason with a variable named killer which will be an mwmp::Target.
2018-06-27 21:47:55 +03:00
Andrei Kortunov
3c7ab976c3
Ignore movement from scripted animations (bug #4475 )
2018-06-27 08:22:45 +04:00
Finbar Crago
cac6d59140
Merge branch 'master' into fix_quickkey_segfalt
2018-06-27 12:58:43 +10:00
David Cernat
7060ff59c5
[Client] Enforce the default global map cell size in multiplayer
2018-06-27 01:23:48 +03:00
David Cernat
fec500c4b0
[Client] Reduce container debug spam by requiring VERBOSE logging for it
2018-06-26 23:40:19 +03:00
David Cernat
914b79fcc9
[General] Make it possible to check which placed objects have containers
2018-06-26 16:56:08 +03:00
Finbar Crago
43c9fd4cec
check MWWorld::Ptr != NULL for MWGui ItemPtr tooltips
2018-06-26 13:41:53 +10:00
Finbar Crago
186ec8c50f
rm ContainerStore/refItem
2018-06-26 13:35:04 +10:00
Marc Zinnschlag
705b2dca0e
Merged pull request #1777
2018-06-25 11:58:12 +02:00
Marc Zinnschlag
baeaff2309
Merged pull request #1778
2018-06-25 11:57:45 +02:00
Andrei Kortunov
97d8cc0efe
Check if the local was not found, just for sure
2018-06-25 11:21:00 +04:00
Andrei Kortunov
7dff8d8fe2
Check cell for null
2018-06-25 10:26:58 +04:00
Finbar Crago
46c6abcf54
add string vectors for name/id in QuickKeysMenu for item lookups
2018-06-25 16:02:28 +10:00
Andrei Kortunov
441463327c
Validate map size
2018-06-25 09:57:40 +04:00
Andrei Kortunov
359e748c28
Initialize some missing fields in constructors
2018-06-25 09:35:42 +04:00
David Cernat
deda6ec071
[Client] Don't send WorldMap packets for already explored map tiles
2018-06-25 02:34:11 +03:00
Capostrophic
ecafcefae9
Fall back to regular head when getVampireHead fails
2018-06-24 14:39:48 +03:00
Capostrophic
35b0546737
Consider <p> tag when discarding post-EOL tag text (regression #4473 )
2018-06-23 14:27:40 +03:00
Finbar Crago
da4c55d5ad
prevent segfalt in QuickKeysMenu when item has been removed from player inventory
...
added a MWWorld::ContainerStore to hold item copies which are then used to find
real items with findReplacement().
(storing the RefId could be a better solution but would probably leave tooltips broken...)
2018-06-23 17:51:32 +10:00
Bret Curtis
a55583a395
Merge branch 'master' into master
2018-06-21 22:22:01 +02:00
David Cernat
7e90d1f2a4
[Client] Fix interior-to-exterior and v.v. cell transitions for actors
...
Make sure only players who are cell authorities can get actors to teleport across cells for them, and display a message box for players who are not cell authorities.
2018-06-21 16:44:49 +03:00
Xenkhan
405a0caf29
Remove unneeded whitespace
2018-06-20 13:56:00 -05:00
Xenkhan
5a4817c147
Get rid of reinterpret_cast<>
2018-06-20 13:33:59 -05:00
Marc Zinnschlag
22eb037c18
Merged pull request #1773
2018-06-20 19:08:50 +02:00
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression
...
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
2018-06-20 17:19:48 +02:00
Bret Curtis
b619c0de2d
Merge pull request #1772 from akortunov/deathanim
...
Fast-forward death animation to end if death animation was finished earlier
2018-06-20 13:28:36 +02:00
Andrei Kortunov
c195144b17
Take transformation from first node with given name in file (bug #4469 )
2018-06-20 14:24:32 +04:00
Bret Curtis
664edc5a39
Merge pull request #1757 from akortunov/musicfix
...
Handle exception when try to load non-music file
2018-06-20 11:18:50 +02:00
Andrei Kortunov
c9756cee4c
Fast-forward death animation to end if death animation was finished earlier (regression #4468 )
2018-06-20 12:37:58 +04:00
David Cernat
fd05beef94
[Client] Don't delete disposed of corpses on client
...
Clients should instead await a server reply approving the deletion.
2018-06-20 02:01:19 +03:00
Xenkhan
24ddb66af9
Retrieve SDL window settings instead of using magic numbers
2018-06-19 15:03:30 -05:00
Capostrophic
6c23caadd7
Fix crash when a target in a different cell is (un)locked
2018-06-19 20:43:18 +03:00
Capostrophic
0c4fa55f16
Make Open spells casted by anything trigger player crime event ( fixes #4461 )
2018-06-19 17:04:38 +03:00
Marc Zinnschlag
7cfb7063c2
Merged pull request #1767
2018-06-19 13:30:10 +02:00
Marc Zinnschlag
7be069fcd2
Merged pull request #1743
2018-06-19 13:29:20 +02:00
Andrei Kortunov
5fd3ec1035
Implement unlockable locks with 'lock 0' console command
2018-06-19 14:17:33 +04:00
Marc Zinnschlag
a8ad530db9
Merged pull request #1749
2018-06-19 11:33:08 +02:00
Marc Zinnschlag
2a52ade219
Merged pull request #1760
2018-06-19 11:26:41 +02:00
David Cernat
aa3639f2da
Merge pull request #450 from TES3MP/0.6.2
...
Add 0.6.2 commits up to 19 Jun 2018
2018-06-19 05:26:38 +03:00
David Cernat
5b461b09ca
[Client] Display error when receiving ID_INCOMPATIBLE_PROTOCOL_VERSION
2018-06-19 05:24:26 +03:00
David Cernat
29be79e852
[General] Switch RakNet enums to CrabNet enums
...
CrabNet is TES3MP's fork of RakNet that has deviated too far from RakNet to still be compatible with it.
2018-06-19 00:37:52 +03:00
Capostrophic
8376c8c68e
Allow partial matches in NotCell condition ( fixes #4459 )
2018-06-18 03:27:31 +03:00
Bret Curtis
e93104a6b3
Merge pull request #1758 from Capostrophic/screenshot
...
Remove screenshot taken message again
2018-06-17 22:26:00 +02:00
Bret Curtis
70dec71c00
Merge pull request #1763 from akortunov/activatedoor
...
Forbid actors to use teleporting doors
2018-06-17 10:13:16 +02:00
Bret Curtis
3cc6da1db2
Update door.cpp
...
typo fix
2018-06-17 10:13:03 +02:00
Bret Curtis
3f2dbdc8a8
Merge branch 'master' into wanderfix
2018-06-17 10:00:38 +02:00
Andrei Kortunov
f3f7487664
Fix arguments parsing for AiWander console command (bug #4458 )
2018-06-16 22:11:10 +04:00
Andrei Kortunov
e08b0d3070
Ignore lights without CanCarry flags when NPC selects torch (bug #4457 )
2018-06-16 17:34:49 +04:00
Andrei Kortunov
2a65aaf5ab
Forbid actors to use teleporting doors (bug #2562 )
2018-06-16 14:21:28 +04:00
Nikolay Kasyanov
359f87ab9f
Change imageToSurface to return a unique_ptr to avoid manual surface cleanup
2018-06-16 12:12:32 +02:00
Andrei Kortunov
9c3da41130
Add murder bounty when a player follower commits murder (bug #2852 )
2018-06-15 14:31:09 +04:00
Capostrophic
1abf749f03
Remove screenshot taken message
2018-06-14 22:08:53 +03:00
Andrei Kortunov
2854f6ca83
Handle exception if we try to play non-music file (bug #4416 )
2018-06-14 21:32:40 +04:00
Miloslav Číž
477e1437d2
Resolve conflicts
2018-06-14 15:30:28 +02:00
Andrei Kortunov
49ba00a3ec
Add NPC validation to esmstore (bug #2772 )
2018-06-14 16:48:16 +04:00
Miloslav Číž
dd00e438fe
Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360
2018-06-13 21:35:03 +02:00
Miloslav Číž
7178ee3a6e
Add FIXME comment
2018-06-13 21:34:43 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
2018-06-13 21:16:28 +02:00
Marc Zinnschlag
2b35c5efd7
Merge remote-tracking branch 'upstream/master'
2018-06-13 18:13:15 +02:00
Marc Zinnschlag
aea481eacb
Merged pull request #1753
2018-06-13 18:12:38 +02:00
Andrei Kortunov
61c968d550
Ignore broken items when search for replacement (bug #4453 )
2018-06-13 18:39:02 +04:00
Andrei Kortunov
81b78a82e8
AI: try to open doors every AI_REACTION_TIME seconds (bug #4454 )
2018-06-13 17:47:32 +04:00
Miloslav Číž
dcfbd554bb
Remove try catch block
2018-06-13 11:12:46 +02:00
Bret Curtis
3e4dc31e39
Merge branch 'master' into fatigue
2018-06-13 10:04:32 +02:00
Marc Zinnschlag
1ba0317905
Merged pull request #1670
2018-06-13 09:02:31 +02:00
Marc Zinnschlag
48711bbdde
Merged pull request #1592
2018-06-13 08:58:06 +02:00
Miloslav Číž
c3d7ee5a9e
Resolve merge conflicts
2018-06-13 08:22:37 +02:00
Miloslav Číž
db8aaa74d6
Start cell border debug drawing
2018-06-13 01:48:31 +02:00
Andrei Kortunov
9c45cc7e48
Use player reference instead of pointer
2018-06-12 22:05:00 +04:00
Capostrophic
1c8a20a54a
Set ok button focus in settings window by default ( fixes #4368 )
2018-06-12 19:45:43 +03:00
Andrei Kortunov
f299be8158
Play scripted animations even if SkipAnim is used
2018-06-12 16:07:36 +04:00
Andrei Kortunov
25bb7c1826
Make 'PlayGroup idle' to cancel scripted animations
2018-06-12 14:04:03 +04:00
Andrei Kortunov
0e441d48ac
Give scripted animations highest priority (bug #4286 )
2018-06-12 12:55:28 +04:00
Andrei Kortunov
0c92655250
Avoid code duplication in character manager
2018-06-12 11:51:54 +04:00
Andrei Kortunov
e3812f4075
Check creature stats only for actors
2018-06-12 11:27:18 +04:00
Andrei Kortunov
b0a140e714
Disable actor collision only after end of death animation
2018-06-12 10:00:38 +04:00
Andrei Kortunov
ebaa6fb5a2
Play death scream only once
2018-06-12 09:55:43 +04:00
Andrei Kortunov
427be928d0
Do not update animation state for dead actors
2018-06-11 23:17:54 +04:00
Andrei Kortunov
977a27ecb7
Do not clear corpses until end of death animation (bug #4307 )
2018-06-11 22:29:32 +04:00
Bret Curtis
7310e3c8c2
Merge pull request #1748 from akortunov/bookfix
...
Do not show any book text after last <BR> tag
2018-06-11 17:08:26 +02:00
Andrei Kortunov
a42c663fd7
Do not interrupt scripted animations by death animation (bug #4286 )
2018-06-11 18:53:25 +04:00
Andrei Kortunov
d0619cfb35
Play death animation for non-persisting actors with 0 health (bug #4291 )
2018-06-11 18:52:20 +04:00
Andrei Kortunov
6099735c60
Early out only when scripted animation is playing
2018-06-11 17:52:58 +04:00
Andrei Kortunov
e234dd2a36
Do not interrupt scripted animations
2018-06-11 17:18:51 +04:00
Andrei Kortunov
66a46ff03c
Do not show any book text after last <BR> tag.
2018-06-11 11:22:56 +04:00
Capostrophic
d43766d3c9
Make WakeUpPC interrupt waiting if it was supposed to be ( fixes #3629 )
2018-06-10 18:42:18 +03:00
Andrei Kortunov
acd3cba5fa
Store previous items in the savegame
2018-06-10 16:21:19 +04:00
Andrei Kortunov
9fd2d57b86
Move previous items to player
2018-06-10 16:21:19 +04:00
Andrei Kortunov
f977c6876f
Bound items: store item ID instead of pointer
2018-06-10 16:21:19 +04:00
Andrei Kortunov
4de9d9fa77
Split adjustBoundItem()
2018-06-10 16:21:19 +04:00
Andrei Kortunov
d1b1cb748d
Reequip previous item only if the expired bound item was equipped
2018-06-10 16:21:19 +04:00
Andrei Kortunov
9b72a6ac69
Use the MWWorld::Ptr() instead of string ID
2018-06-10 16:21:19 +04:00
Andrei Kortunov
0375bedab2
Equip previous item after a bound item expires (bug #2326 )
2018-06-10 16:21:19 +04:00
Andrei Kortunov
ae87e0d3fc
Do not reset mUpperBodyState for weapon->weapon switch (regression #4446 )
2018-06-09 15:34:08 +04:00
Andrei Kortunov
4ba361fea6
Unhardcode sunset and sunrise settings (bug #1990 )
2018-06-09 13:09:17 +04:00
Marc Zinnschlag
7d9de93fd3
Merged pull request #1477
2018-06-09 10:52:35 +02:00
Marc Zinnschlag
551a69f1b1
Merged pull request #1559
2018-06-09 10:51:02 +02:00
