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
577ed3943b
Show wallpaper when loading a savegame
2014-06-02 23:26:43 +02:00
scrawl
c018319940
Addition to 7c9c0830a9: don't create useless BaseWhite clones
2014-06-01 02:21:47 +02:00
scrawl
7c9c0830a9
Fix errors due to BaseWhite material being removed
2014-05-31 19:50:01 +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
ecf3d52b46
Merge remote-tracking branch 'cc9cii/crash-fix-cg-shader'
2014-05-30 12:07:16 +02:00
Marc Zinnschlag
f5e587f566
Merge remote-tracking branch 'puppykevin/master'
2014-05-30 11:42:19 +02:00
cc9cii
11ce093a9e
Fix crashes caused when terrain materials don't get created (e.g. due to cg shader bug on Windows/D3D9). Should resolve Bug #1284 .
2014-05-30 18:46:18 +10: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
Marc Zinnschlag
be88168e91
Merge remote-tracking branch 'scrawl/master'
2014-05-30 10:07:18 +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
Marc Zinnschlag
f112c78858
Merge remote-tracking branch 'scrawl/master'
2014-05-28 19:47:36 +02:00
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 .
2014-05-28 19:23:50 +02:00
Marc Zinnschlag
bb011f278e
Merge remote-tracking branch 'cc9cii/master'
2014-05-28 14:45:57 +02:00
cc9cii
bbe77d656a
Minor fixes from static analysis.
2014-05-28 21:15:50 +10:00
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
2014-05-28 03:42:26 -04:00
Marc Zinnschlag
be39395ce7
Merge remote-tracking branch 'scrawl/master'
2014-05-27 21:09:24 +02:00
Marc Zinnschlag
12fc0aaecb
removed an unused parser settings (implicitly fixing a case were this setting was not applied correctly)
2014-05-27 21:08:29 +02:00
scrawl
3e2eed9269
Implement getFactionReaction function
...
Strange bug when using value != 0 for the garbage argument?
2014-05-27 15:23:22 +02: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
3cd835e61a
Fix bsa file loading not being case insensitive ( Fixes #1178 )
2014-05-26 17:34:36 +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
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
Marc Zinnschlag
d8440e1fdc
implemented reference record merging
2014-05-20 09:02:22 +02: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
