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
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
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
cc9cii
4f94a31b54
Fix crash starting a new game.
2014-05-25 07:50:19 +10: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
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
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
scrawl
c6c254d279
Do not trigger levelup if rest was interrupted
2014-05-22 11:08:36 +02:00
scrawl
18bba6bcec
Fix layout glitch when autosaving
2014-05-22 11:03:45 +02:00
greye
cb598f0455
the same for data-local entry
2014-05-22 01:13:27 +04:00
greye
28b59f4008
process paths as UTF-8 in launcher
2014-05-22 01:08:03 +04:00
scrawl
cf07d2ab93
Fix swapped position of Save and Load menu buttons
2014-05-21 16:38:50 +02:00
scrawl
f812746010
Auto-select first save in load dialog
2014-05-21 16:36:55 +02:00
scrawl
3a7e2f8bb5
Allow invoking Journal instruction with non-existing index
...
This is used by the MG_EscortScholar1 quest.
2014-05-21 14:18:14 +02:00
greye
8b94e31062
try to set relative path to resources
2014-05-21 15:39:58 +04:00
scrawl
2f6d400c62
Merge branch 'master' of https://github.com/OpenMW/openmw into newgame
2014-05-21 10:41:03 +02:00
scrawl
b39b572c5a
Moved mStartupScript to World, so that it is executed for a New game
2014-05-21 09:25:45 +02:00
scrawl
9fe505c8fa
Only run --script-run commands when bypassing the menu
...
Running them while no game is started yet is dangerous, and also leaves bits and pieces of state (e.g. in LocalScripts for scripted items added to inventory) that will not get cleaned up properly when a game is loaded (since when no game was previously running, no cleanup is performed). As a result, dangling MWWorld::Ptrs were left in LocalScripts.
2014-05-20 18:35:17 +02:00
scrawl
abd6b6ab33
Fix not returning to main menu on failed loads when using quickload
2014-05-20 17:11:26 +02:00
scrawl
7ab98f0c6f
Clear choices when dialogue starts
...
This is usually not needed, because it is not possible to exit dialogue while in a choice. However you can still exit dialogue by loading a different savegame.
2014-05-20 16:57:38 +02:00
greye
b728a919a2
write dependency on boost::locale to CMake files
2014-05-20 12:59:58 +04:00
scrawl
220ab86eca
Simplify new game movie player
2014-05-20 10:07:08 +02:00
greye
9dbe3f21d9
keep non-const signature for argv after conversion
2014-05-20 10:42:21 +04:00
greye
130349e0cd
open files in binary mode when necessary
2014-05-20 08:14:29 +04:00
Marc Zinnschlag
58afa58549
Merge remote-tracking branch 'mrcheko/master'
2014-05-19 22:07:32 +02:00
mrcheko
638df221a6
memory leak fix
2014-05-19 23:29:35 +04:00
greye
20527e0bd4
use boost::filesystem instead of boost::iostreams
2014-05-19 16:56:41 +04:00
scrawl
6bd0bbb8df
Do not load (0,0) on new game
2014-05-19 14:09:16 +02:00
