scrawl
98d7b6672a
Make MODL subrecord optional for potions ( Fixes #1419 )
2014-06-08 11:22:37 +02:00
scrawl
823ccb1b3d
Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386 )
2014-06-08 11:22:37 +02:00
scrawl
7376cb9b61
Fix loading ESX files cleaned with testool ( Fixes #1382 )
2014-06-03 22:49:37 +02:00
scrawl
ce14a6413b
Small optimization to ESM::Variant
2014-06-03 22:40:09 +02:00
scrawl
16ac6e7aac
Merge DialInfo objects by subrecord instead of overwriting the object
...
Fixes #1360
2014-05-31 13:01:11 +02:00
Marc Zinnschlag
f5e587f566
Merge remote-tracking branch 'puppykevin/master'
2014-05-30 11:42:19 +02:00
Marc Zinnschlag
be7f344eca
Merge branch 'refs'
...
Conflicts:
apps/opencs/model/doc/savingstate.cpp
components/esm/cellref.hpp
2014-05-30 10:38:38 +02:00
scrawl
50a72ed710
Fix ghosts in Cavern Of The Incarnate having -1 health
2014-05-29 18:09:13 +02:00
Kevin Poitra
18314b1707
We use spaces, not tabs.
2014-05-28 14:56:50 -05:00
Kevin Poitra
8e55eb8009
Fix some formatting.
2014-05-28 13:06:43 -05:00
Kevin Poitra
545c3c312c
Remove a superfluous clear.
2014-05-28 13:03:40 -05:00
scrawl
e266c39c5d
Implement modFactionReaction instruction ( Closes #1347 )
2014-05-27 14:54:29 +02:00
scrawl
0966755a0c
Store death animation index in CreatureStats
2014-05-26 20:52:32 +02:00
scrawl
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +02:00
Marc Zinnschlag
d8440e1fdc
implemented reference record merging
2014-05-20 09:02:22 +02:00
scrawl
3dceb7ee4f
Fix overwriting DialInfo
2014-05-18 18:58:32 +02:00
scrawl
0aa1042fd7
Optimized dialogue merging with a lookup map
2014-05-18 16:01:16 +02:00
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
cc9cii
b36bb58e8c
Bug #1324 : Artem's solution
2014-05-18 07:34:13 +10: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
e266aff561
Savegame: store projectiles
2014-05-17 05:24:32 +02:00
Marc Zinnschlag
3b2ba4f6cd
Merge remote-tracking branch 'scrawl/master'
2014-05-15 14:25:36 +02:00
scrawl
a76e391ad0
Savegame: store door movement state ( Closes #747 )
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
scrawl
61187c2fef
Savegame: store actorIds
2014-05-14 09:47:49 +02:00
scrawl
51020fdb5f
Fix a bug for NpcStats::mUsedIds in savegames, and added a compile-time guard to prevent similar errors in the future.
2014-05-14 09:17:30 +02:00
Thomas
cbcf0f6039
Changed AiEScort to use new PathTo function
2014-05-14 01:44:11 -04:00
slothlife
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
2014-05-14 00:03:30 -05:00
Thomas
77d365e196
Forced some function arguments to take in a specific array size
2014-05-13 13:25:22 -04:00
Thomas
9dbe53c722
Merge remote-tracking branch 'upstream/master'
2014-05-13 04:11:07 -04:00
Thomas
2c74ea381e
Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue
2014-05-12 21:05:32 -04:00
scrawl
6cc691115b
Savegame: store most of CreatureStats
2014-05-12 21:37:36 +02:00
scrawl
a4a9794417
Savegame: store fog of war ( Closes #1177 )
2014-05-11 02:07:58 +02:00
scrawl
041319c43e
Fixes #1234 : Store dynamic record counter in savegame to prevent name clashes
2014-05-11 00:32:22 +02:00
slothlife
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
2014-05-09 08:32:52 -05:00
scrawl
7bddfc0025
Fix some spelling mistakes.
2014-05-03 12:23:22 +02:00
scrawl
122e606e30
Crime: improvement to arrest on sight for large bounties
...
iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).
2014-05-03 12:17:44 +02:00
scrawl
8560b43464
Move to esm component
2014-05-02 12:48:07 +02:00
scrawl
17bb8d7f9a
Fixes #1252 : Add item/magic keybindings to savegame
2014-05-01 21:16:32 +02:00
scrawl
27a05027f4
Fixes #1172 : Added basic loading/saving progress bar
...
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
2014-04-28 11:29:57 +02:00
scrawl
30666f2cce
Fixes #1297 : Store global map markers in savegame
2014-04-26 13:42:32 +02:00
Thomas
f6deca7c80
Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors
2014-04-23 13:02:51 -04:00
Thomas
61341d4206
Removed mLocked, kept it as "Negative lock level means unlocked"
2014-04-23 10:00:18 -04:00
