pvdk
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
11 years ago
Marc Zinnschlag
f112c78858
Merge remote-tracking branch 'scrawl/master'
11 years ago
scrawl
e68600eda2
Make Activate instruction work properly even when onActivate was not called in the same frame.
...
There are two major differences to the old implementation:
- Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
- The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.
Fixes #1166 and #1346 .
11 years ago
Marc Zinnschlag
bb011f278e
Merge remote-tracking branch 'cc9cii/master'
11 years ago
cc9cii
bbe77d656a
Minor fixes from static analysis.
11 years ago
Arthur Moore
50a4d175da
Read NIF interpolation type 4 (XYZ_ROTATION_KEY)
...
Don't actually do anything with it yet, but without this the "MW Containers Animated" mod made containers inaccessible.
Partly implements Feature #1067
11 years ago
Marc Zinnschlag
be39395ce7
Merge remote-tracking branch 'scrawl/master'
11 years ago
Marc Zinnschlag
12fc0aaecb
removed an unused parser settings (implicitly fixing a case were this setting was not applied correctly)
11 years ago
scrawl
3e2eed9269
Implement getFactionReaction function
...
Strange bug when using value != 0 for the garbage argument?
11 years ago
scrawl
e266c39c5d
Implement modFactionReaction instruction ( Closes #1347 )
11 years ago
scrawl
0966755a0c
Store death animation index in CreatureStats
11 years ago
scrawl
3cd835e61a
Fix bsa file loading not being case insensitive ( Fixes #1178 )
11 years ago
scrawl
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
11 years ago
scrawl
b47b2b84f3
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwdialogue/filter.cpp
apps/openmw/mwgui/waitdialog.cpp
11 years ago
Marc Zinnschlag
244eb11651
Merge remote-tracking branch 'greye/widechar'
11 years ago
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?
11 years ago
greye
663d5c314e
be more verbose on change reasons
11 years ago
greye
4346e3b4d0
try to load plugins from relative paths
11 years ago
greye
444a07c01b
workaround OgreLog Unicode path handling
11 years ago
greye
493f8c6050
fix opening BSA on Unicode path
11 years ago
greye
417e07fbce
fix irrelevant error reporting
11 years ago
greye
6cb795ef7d
attempt to fix LowLevelFile, minor code reuse
11 years ago
greye
2c82da8e6e
load Ogre::ConfigFile from DataStream
11 years ago
scrawl
3dceb7ee4f
Fix overwriting DialInfo
11 years ago
scrawl
0aa1042fd7
Optimized dialogue merging with a lookup map
11 years ago
scrawl
1677fcf324
Dialogue merging
11 years ago
scrawl
5b76c0893a
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
components/esm/inventorystate.hpp
11 years ago
greye
e02b04536f
fix most vexing parse issue
11 years ago
greye
424d06a6f8
open fstreams from boost::filesystem::path, vol.2
11 years ago
greye
2236216344
minor simplification
11 years ago
greye
a22ec223d8
open fstreams from boost::filesystem::path, vol.1
11 years ago
greye
b4950509bc
use converted widechars in ini importer
11 years ago
greye
eafdefe999
using WindowsPath implies utf-8 for boost fs::path
11 years ago
greye
584c121f33
fix windows unicode path handling
11 years ago
scrawl
a872c9f83a
Feature #1323 : handle restocking levelled items
11 years ago
cc9cii
b36bb58e8c
Bug #1324 : Artem's solution
11 years ago
Marc Zinnschlag
f7c89015f9
Merge remote-tracking branch 'scrawl/master'
11 years ago
scrawl
ae66d28c87
Feature #32 : Implement respawn for containers, creatures and NPCs
11 years ago
scrawl
e266aff561
Savegame: store projectiles
11 years ago
scrawl
b3735981d6
Remove unused file_finder
11 years ago
Marc Zinnschlag
3b2ba4f6cd
Merge remote-tracking branch 'scrawl/master'
11 years ago
scrawl
a76e391ad0
Savegame: store door movement state ( Closes #747 )
11 years ago
scrawl
471bbd0021
Savegame: store levelled creature state and move to actorIds
...
(Closes #1332 )
11 years ago
Marc Zinnschlag
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
11 years ago
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.
11 years ago
scrawl
9b67fcc4d7
Merge branch 'master' of https://github.com/OpenMW/openmw
11 years ago
scrawl
9052cc4a57
Savegame: store ActiveSpells
11 years ago
scrawl
61187c2fef
Savegame: store actorIds
11 years ago
scrawl
51020fdb5f
Fix a bug for NpcStats::mUsedIds in savegames, and added a compile-time guard to prevent similar errors in the future.
11 years ago
Thomas
cbcf0f6039
Changed AiEScort to use new PathTo function
11 years ago