scrawl
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +02:00
scrawl
b47b2b84f3
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwdialogue/filter.cpp
apps/openmw/mwgui/waitdialog.cpp
2014-05-23 08:39:48 +02:00
Marc Zinnschlag
244eb11651
Merge remote-tracking branch 'greye/widechar'
2014-05-23 07:48:26 +02:00
scrawl
e51300989c
Handle NiBSPArrayController as alias for NiParticleSystemController
...
The differences (if any) are unknown.
NiBSPArrayController is used by the Atronach_Fire.nif model. Its particles are now visible, but they don't look right yet. Need to handle NiAutoNormalParticlesData?
2014-05-22 23:07:06 +02:00
greye
663d5c314e
be more verbose on change reasons
2014-05-22 16:35:57 +04:00
greye
4346e3b4d0
try to load plugins from relative paths
2014-05-20 21:42:51 +04:00
greye
444a07c01b
workaround OgreLog Unicode path handling
2014-05-19 18:12:13 +04:00
greye
493f8c6050
fix opening BSA on Unicode path
2014-05-19 13:39:07 +04:00
greye
417e07fbce
fix irrelevant error reporting
2014-05-19 10:59:36 +04:00
greye
6cb795ef7d
attempt to fix LowLevelFile, minor code reuse
2014-05-19 10:47:02 +04:00
greye
2c82da8e6e
load Ogre::ConfigFile from DataStream
2014-05-19 10:07:43 +04: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
greye
e02b04536f
fix most vexing parse issue
2014-05-18 14:55:05 +04:00
greye
424d06a6f8
open fstreams from boost::filesystem::path, vol.2
2014-05-18 14:55:05 +04:00
greye
2236216344
minor simplification
2014-05-18 14:55:05 +04:00
greye
a22ec223d8
open fstreams from boost::filesystem::path, vol.1
2014-05-18 14:55:05 +04:00
greye
b4950509bc
use converted widechars in ini importer
2014-05-18 14:55:05 +04:00
greye
eafdefe999
using WindowsPath implies utf-8 for boost fs::path
2014-05-18 14:55:05 +04:00
greye
584c121f33
fix windows unicode path handling
2014-05-18 14:55:04 +04: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
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
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
085fb2c5a2
Simplified documentation a bit
2014-05-13 14:13:05 -04:00
Thomas
a61d804de6
now that I've found the documentation, fixed some stuff for extensions
2014-05-13 13:53:06 -04: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
Thomas
645d174a96
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aisequence.hpp
2014-05-12 14:49:08 -04: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
Thomas
dbf06d8c8b
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aipursue.hpp
apps/openmw/mwmechanics/aisequence.hpp
2014-05-04 02:06:43 -04:00