Marc Zinnschlag
9e21da9636
Merge remote-tracking branch 'scrawl/master'
2014-05-27 08:34:54 +02:00
Digmaster
e0d55116a4
Dims and disabled Goodbye button in dialogs when unavailable.
2014-05-27 00:30:37 -04:00
Digmaster
79d0ed64d9
Undo some changes I made in the past that shouldn't exist
2014-05-26 23:31:40 -04:00
Digmaster
1ca921d6e2
Merge remote-tracking branch 'upstream/master'
2014-05-26 23:26:23 -04:00
Digmaster
e3e51324a4
Esc button exits all non-modal GUI windows
2014-05-26 23:13:37 -04:00
scrawl
cf68f6da96
Fix ESX dependencies not being checked except for the first one
2014-05-27 00:06:34 +02:00
scrawl
4caa8c5cca
Fix offset to accumulation root not being cleared when adding an animation state with startpoint=1.f (observed with death animations)
2014-05-26 20:52:38 +02:00
scrawl
5660f283dd
Fix actor models incorrectly being rotated on X/Y axes
2014-05-26 20:52:38 +02:00
scrawl
0966755a0c
Store death animation index in CreatureStats
2014-05-26 20:52:32 +02:00
Marc Zinnschlag
3937cfcd8b
Merge remote-tracking branch 'scrawl/master'
2014-05-26 19:02:13 +02:00
scrawl
3cd835e61a
Fix bsa file loading not being case insensitive ( Fixes #1178 )
2014-05-26 17:34:36 +02:00
scrawl
f629307f60
Fix frame delay for sound listener position ( Fixes #1180 )
2014-05-26 16:43:19 +02:00
scrawl
bfd91c0681
Fix potential NpcStats overwriting issue
2014-05-26 12:31:08 +02:00
Marc Zinnschlag
4aab4bae65
minor cleanup and silenced a warning
2014-05-26 10:14:24 +02:00
Marc Zinnschlag
f0d0a31a19
Merge remote-tracking branch 'mrcheko/master'
2014-05-26 10:08:40 +02:00
Thomas
7697b9e868
Ensures nothing bad will happen if we try to lock a door that never had a lock level
2014-05-26 01:48:24 -04:00
Thomas
b3ffd5b868
Fix for bug Bug #1098
2014-05-26 01:42:11 -04:00
mrcheko
8fa7fcdbee
fix bug http://bugs.openmw.org/issues/1335 (1304 as well)
...
though fish detects if actor is swimming, but in MW it attacks even if
the player is knee-deep in water
2014-05-25 21:03:37 +04:00
scrawl
10d835a55c
Some more missing isInCell checks
2014-05-25 15:07:35 +02:00
scrawl
f3ba31de2d
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwscript/cellextensions.cpp
2014-05-25 14:58:47 +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
130af28fa5
Merge remote-tracking branch 'cc9cii/master'
...
Conflicts:
apps/openmw/mwrender/videoplayer.cpp
2014-05-25 12:07:09 +02:00
Marc Zinnschlag
ff15601a4c
Merge branch 'openmw-30'
2014-05-25 11:55:25 +02:00
mrcheko
c62187bd55
fix bug at http://bugs.openmw.org/issues/1155
...
Though it still can happen sometimes but not in such stupid manner.
2014-05-25 13:31:46 +04:00
cc9cii
d2794165ba
Disable binkaudio sound for FFmpeg libavocdec versions below 54.55.xxx (Windows x64) and 54.10.xxx (Windows 32bit). Later versions are all allowed, but due to sample formats there will be no sound and this message will be shown on the console "Sound Error: Unsupported sample format: fltp"
2014-05-25 18:56:50 +10:00
mrcheko
559c772906
Merge remote-tracking branch 'upstream/master'
2014-05-25 10:21:54 +04:00
cc9cii
4f94a31b54
Fix crash starting a new game.
2014-05-25 07:50:19 +10:00
mrcheko
56881cb7c9
fix bugs in aisequence::execute
2014-05-24 23:05:30 +04:00
scrawl
a05c8fd3ce
Make applyEnchantment return the record ID instead of modifying Ptr
2014-05-24 14:58:48 +02:00
scrawl
1d8da95756
Warning fix
2014-05-24 14:47:51 +02:00
scrawl
08cf58204f
Merge branch 'master' of github.com:scrawl/openmw
2014-05-23 16:45:28 +02:00
scrawl
f09c8ddc9e
Remove a pointless assert
2014-05-23 16:44:51 +02:00
scrawl
a7d525245c
Fix missing include
2014-05-23 16:07:02 +02:00
Scott Howard
c9011f707f
missing #include <iostream> in mwiniimporter
...
missing #include <iostream> in mwiniimporter/main.cpp
2014-05-23 08:41:49 -04:00
cc9cii
367acd9676
Enable video but without sound.
2014-05-23 21:55:47 +10:00
cc9cii
3718847ffc
Disable video for Windows until the crash issues are fixed.
2014-05-23 21:07:01 +10:00
Marc Zinnschlag
f4334da42e
added changed reference tracking for cells
2014-05-23 09:32:34 +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
6ac700a501
Merge remote-tracking branch 'potatoesmaster/getClass'
2014-05-23 08:00:52 +02:00
Marc Zinnschlag
244eb11651
Merge remote-tracking branch 'greye/widechar'
2014-05-23 07:48:26 +02:00
scrawl
a2f156be8e
Prevent magic bolts from colliding with their caster
2014-05-22 23:34:32 +02:00
scrawl
df8e095c83
Small cleanup
2014-05-22 23:27:54 +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
Emanuel Guevel
1e4a854433
Remove static method MWWorld::Class::get(&Ptr)
...
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
2014-05-22 20:50:00 +02:00
Emanuel Guevel
20cfdd4b43
Move LiveCellRefBase ctor where it belongs to
2014-05-22 20:50:00 +02:00
scrawl
cba50c7338
Optimize ManualRef: look up correct Store instead of searching
2014-05-22 15:46:35 +02:00
scrawl
4b5f02f644
Remove useless throwing of exception
2014-05-22 15:29:36 +02:00
greye
663d5c314e
be more verbose on change reasons
2014-05-22 16:35:57 +04:00
greye
8f9091550e
require boost::locale only on Windows
2014-05-22 15:42:47 +04:00
scrawl
3380e1e1c5
Fix ShouldAttack filter
...
This makes NPCs exit dialogue properly when they should attack as a result of taunting actions.
2014-05-22 12:20:25 +02:00
