scrawl
1677fcf324
Dialogue merging
2014-05-18 15:25:16 +02:00
scrawl
5b76c0893a
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
components/esm/inventorystate.hpp
2014-05-18 12:55:43 +02:00
scrawl
a872c9f83a
Feature #1323 : handle restocking levelled items
2014-05-18 12:53:21 +02:00
scrawl
90ec19c3ac
Remove unneeded MWScrollView
2014-05-18 10:30:03 +02:00
scrawl
150b920ef1
Fix long journal entries not being displayed
2014-05-18 10:14:03 +02:00
scrawl
5fc2b1a41b
Allow setting a journal index even if there's no related journal entry
...
This is used by the MV_SlaveMule quest.
2014-05-18 07:39:16 +02:00
scrawl
e1458453f3
Fix "unknown info ID" exceptions when a dialogue response is from the Info Refusal group
...
Could be observed in TG_OverduePayments quest when talking to Trasteve about Dwemer Artifacts.
Info Refusal responses are not specific to any particular topic, so they should not be added to the journal. Trying to do so anyway will cause "unknown id" exceptions because MWDialogue::Entry expects the infoId to be from the Dialogue for the supplied topic.
2014-05-18 06:52:15 +02:00
cc9cii
12dc5cf4ea
Bug #1303 - resolves the bug by tweaking the slope constant (the value 49 was selected to mimic vanilla behaviour for a low level character exploring Seyda Neen). The feature to vary the climbable angle based on acrobatics is still to be implemented.
2014-05-18 12:05:08 +10:00
cc9cii
b36bb58e8c
Bug #1324 : Artem's solution
2014-05-18 07:34:13 +10:00
scrawl
b4ed828e21
Feature #1323 : Implement restocking items (does not handle levelled lists yet)
2014-05-17 14:30:31 +02:00
Marc Zinnschlag
f7c89015f9
Merge remote-tracking branch 'scrawl/master'
2014-05-17 11:50:31 +02:00
scrawl
ae66d28c87
Feature #32 : Implement respawn for containers, creatures and NPCs
2014-05-17 09:09:00 +02:00
scrawl
92c5bb56e0
Un-reverted actorId for AiPursue
2014-05-17 05:34:54 +02:00
scrawl
e266aff561
Savegame: store projectiles
2014-05-17 05:24:32 +02:00
scrawl
15368188dc
Fix sliders in effect editor not being precisely movable
2014-05-17 02:54:51 +02:00
scrawl
9adb990143
Fix potentially unsafe use of MWWorld::Ptr
2014-05-17 02:52:24 +02:00
scrawl
e5a21aca53
Refactor projectiles to no longer use MW-objects
2014-05-16 13:33:30 +02:00
scrawl
18852c09d0
Manually re-added AiCombat portion of actorid changes. This is the only one that really matters, and will not suffer from the infinite recursion because it's not included in AiSequence::fill.
2014-05-16 12:28:23 +02:00
scrawl
36d9ae17cc
Revert "Change all AI packages (except AiActivate) to use ActorIds"
...
Causes potential infinite loops (AiSequence::fill -> AiPackage() -> getCreatureStats -> ensureCustomData -> ..)
This reverts commit 2e9985c1a3
2014-05-16 12:11:34 +02:00
scrawl
028e00c98f
Add missing status report for some toggle commands
2014-05-16 09:21:28 +02:00
scrawl
868e38a07c
Fix Assault crimes being reported when striking in self-defense
...
Last missing fix for Bug #1134 .
2014-05-16 08:32:00 +02:00
scrawl
940a434479
Use ItemModel for moving items from a container to the world
...
Fixes owner not resetting when moving an item from a corpse to the world.
2014-05-16 03:19:38 +02:00
scrawl
d70306382e
Don't create the player object until the game starts
...
Fixes a crash introduced in e591d23
2014-05-16 00:58:12 +02:00
scrawl
b3735981d6
Remove unused file_finder
2014-05-15 21:36:24 +02:00
Marc Zinnschlag
3b2ba4f6cd
Merge remote-tracking branch 'scrawl/master'
2014-05-15 14:25:36 +02:00
scrawl
0bc33fa86a
Revert "AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)"
...
Apparently not working for AiCombat due to its higher getPriority(). What should we do here?
This reverts commit a6e1d7ffd6
2014-05-15 10:14:47 +02:00
scrawl
b16d444f0f
Fix never clearing graveyard. Oops
2014-05-15 10:05:35 +02:00
scrawl
6de7e16550
Fix searchPtrViaActorId not skipping over deleted references
...
Fixes an issue when an actor has moved cell: searchPtrViaActorId would randomly return the deleted Ptr from the old cell.
2014-05-15 09:57:09 +02:00
scrawl
b6a7aee42e
Fix player not being allowed to use his own items
2014-05-15 09:54:10 +02:00
scrawl
eb40032bde
Fix item owner not resetting when dragging an item from a corpse to the player avatar
2014-05-15 09:54:10 +02:00
scrawl
bac4d875df
Fix a potential exploit that made it possible to reset the owner of any item
2014-05-15 09:54:10 +02:00
scrawl
a6e1d7ffd6
AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)
2014-05-15 09:54:10 +02:00
scrawl
2e9985c1a3
Change all AI packages (except AiActivate) to use ActorIds
...
More robust in case the target changes cell or there are multiple targets with the same RefId
2014-05-15 09:54:10 +02:00
scrawl
2f13a17a39
Add some more safety checks to spellcasting
2014-05-15 09:54:10 +02:00
scrawl
f2c193ce3d
Fix searching the player's actorId
2014-05-15 09:54:10 +02:00
scrawl
a609dc5674
Fix exception when getting hit by a trap
2014-05-15 09:54:10 +02:00
scrawl
a76e391ad0
Savegame: store door movement state ( Closes #747 )
2014-05-15 09:54:10 +02:00
scrawl
37b9d2fb0c
Fix a wrong use of reference that causes potential crash
2014-05-15 09:54:10 +02:00
scrawl
471bbd0021
Savegame: store levelled creature state and move to actorIds
...
(Closes #1332 )
2014-05-15 09:54:04 +02:00
Marc Zinnschlag
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
2014-05-15 08:13:15 +02:00
slothlife
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
2014-05-14 20:12:52 -05:00
scrawl
9b67fcc4d7
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-05-14 23:54:25 +02:00
scrawl
9052cc4a57
Savegame: store ActiveSpells
2014-05-14 23:54:15 +02:00
Marc Zinnschlag
2116f16289
Merge remote-tracking branch 'digmaster/master'
2014-05-14 21:16:24 +02:00
Thomas
d2aada95b4
Fixed AiPursue by fixing underlying issue is Pathto()
2014-05-14 14:11:34 -04:00
Thomas
2425d2c2ab
Added stuck mitigation for AiAvoidDoor
2014-05-14 13:38:10 -04:00
Marc Zinnschlag
c2ea92b93a
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
2014-05-14 14:41:04 +02:00
Marek Kochanowicz
3439900239
ignore all drops that will not create usefull filter
2014-05-14 11:56:23 +02:00
Thomas
993ef1be43
Actor avoiding door asks all surrounding actors to do the same.
2014-05-14 04:05:18 -04:00
scrawl
1141c1f3f2
Change projectiles to use actorIds
2014-05-14 09:48:16 +02:00
