d8440e1fdc
implemented reference record merging
11 years ago
7c149e98e0
Merge branch 'openmw-30'
11 years ago
37f1a49352
Merge remote-tracking branch 'mrcheko/master'
11 years ago
fa14df62b7
fix crash on disappeared target
11 years ago
a5f0fe7282
incremented version number
11 years ago
1294682196
Merge remote-tracking branch 'scrawl/master'
11 years ago
3dceb7ee4f
Fix overwriting DialInfo
11 years ago
aa05acd26e
Merge remote-tracking branch 'scrawl/master'
11 years ago
56c4367c1a
Merge remote-tracking branch 'mrcheko/master'
11 years ago
e1249f6a31
actor handle and id confusing fix
11 years ago
a87b64d2da
Fix some ancient code
11 years ago
0aa1042fd7
Optimized dialogue merging with a lookup map
11 years ago
1677fcf324
Dialogue merging
11 years ago
66307dd889
travis fix #3 :(
11 years ago
74697f8116
travis fix #2
11 years ago
5b76c0893a
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
components/esm/inventorystate.hpp
11 years ago
a872c9f83a
Feature #1323 : handle restocking levelled items
11 years ago
69c1eb28c5
travis compile fix
11 years ago
90ec19c3ac
Remove unneeded MWScrollView
11 years ago
150b920ef1
Fix long journal entries not being displayed
11 years ago
5fc2b1a41b
Allow setting a journal index even if there's no related journal entry
...
This is used by the MV_SlaveMule quest.
11 years ago
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.
11 years ago
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.
11 years ago
b36bb58e8c
Bug #1324 : Artem's solution
11 years ago
aa5647b45e
merge master, resolve conflicts
11 years ago
8971db8962
SceneWidget windowHandle fix for Windows.
11 years ago
b4ed828e21
Feature #1323 : Implement restocking items (does not handle levelled lists yet)
11 years ago
f7c89015f9
Merge remote-tracking branch 'scrawl/master'
11 years ago
ae66d28c87
Feature #32 : Implement respawn for containers, creatures and NPCs
11 years ago
92c5bb56e0
Un-reverted actorId for AiPursue
11 years ago
e266aff561
Savegame: store projectiles
11 years ago
15368188dc
Fix sliders in effect editor not being precisely movable
11 years ago
9adb990143
Fix potentially unsafe use of MWWorld::Ptr
11 years ago
e5a21aca53
Refactor projectiles to no longer use MW-objects
11 years ago
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.
11 years ago
36d9ae17cc
Revert "Change all AI packages (except AiActivate) to use ActorIds"
...
Causes potential infinite loops (AiSequence::fill -> AiPackage() -> getCreatureStats -> ensureCustomData -> ..)
This reverts commit 2e9985c1a3
11 years ago
028e00c98f
Add missing status report for some toggle commands
11 years ago
868e38a07c
Fix Assault crimes being reported when striking in self-defense
...
Last missing fix for Bug #1134 .
11 years ago
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.
11 years ago
d70306382e
Don't create the player object until the game starts
...
Fixes a crash introduced in e591d23
11 years ago
5be37f04ef
Feature 1314: make npc fight creatures
11 years ago
b3735981d6
Remove unused file_finder
11 years ago
3b2ba4f6cd
Merge remote-tracking branch 'scrawl/master'
11 years ago
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
11 years ago
b16d444f0f
Fix never clearing graveyard. Oops
11 years ago
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.
11 years ago
b6a7aee42e
Fix player not being allowed to use his own items
11 years ago
eb40032bde
Fix item owner not resetting when dragging an item from a corpse to the player avatar
11 years ago
bac4d875df
Fix a potential exploit that made it possible to reset the owner of any item
11 years ago
a6e1d7ffd6
AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)
11 years ago
Marc Zinnschlag
mrcheko
scrawl
cc9cii