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
greye
1b7ed98325
fix typos, reset memory before using
2014-05-20 12:41:45 +04:00
scrawl
220ab86eca
Simplify new game movie player
2014-05-20 10:07:08 +02:00
Marc Zinnschlag
e0b6bf6aeb
implemented reference record deleting
2014-05-20 09:28:18 +02:00
Marc Zinnschlag
d8440e1fdc
implemented reference record merging
2014-05-20 09:02:22 +02:00
greye
9dbe3f21d9
keep non-const signature for argv after conversion
2014-05-20 10:42:21 +04:00
greye
46c32f6c47
OpenEngine MyGUI logging facility
2014-05-20 10:37:04 +04:00
greye
a46662043a
tinyxml convert path to UTF-16 on Windows
2014-05-20 09:17:32 +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
86a8966306
manual screenshot creation and uploading (scrawl)
2014-05-19 22:56:40 +04:00
greye
444a07c01b
workaround OgreLog Unicode path handling
2014-05-19 18:12:13 +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
greye
db16bb8983
fix OpenCS saving to Unicode path destination
2014-05-19 15:52:19 +04:00
greye
9c6224c74d
fix saving to Unicode path destination
2014-05-19 15:43:25 +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
6f03694d50
Fixes #1334 : Only unequip item if the sell/drag action is actually successful
2014-05-19 08:03:55 +02:00
scrawl
510b7f8505
Task #1333 : Remove cmake git tag reading
2014-05-19 07:31:19 +02:00
scrawl
0fe0dc33a6
Fixes #1338 : Bring back a label that got lost
2014-05-19 05:35:16 +02:00
Marc Zinnschlag
7c149e98e0
Merge branch 'openmw-30'
2014-05-18 22:38:52 +02:00
Marc Zinnschlag
37f1a49352
Merge remote-tracking branch 'mrcheko/master'
2014-05-18 22:36:40 +02:00
mrcheko
fa14df62b7
fix crash on disappeared target
2014-05-18 23:15:22 +04:00
Marc Zinnschlag
a5f0fe7282
incremented version number
2014-05-18 20:07:41 +02:00
Marc Zinnschlag
1294682196
Merge remote-tracking branch 'scrawl/master'
2014-05-18 19:03:35 +02:00
scrawl
3dceb7ee4f
Fix overwriting DialInfo
2014-05-18 18:58:32 +02:00
Marc Zinnschlag
aa05acd26e
Merge remote-tracking branch 'scrawl/master'
2014-05-18 18:50:18 +02:00
Marc Zinnschlag
56c4367c1a
Merge remote-tracking branch 'mrcheko/master'
2014-05-18 18:42:23 +02:00
mrcheko
e1249f6a31
actor handle and id confusing fix
2014-05-18 20:13:46 +04:00
scrawl
a87b64d2da
Fix some ancient code
2014-05-18 16:34:58 +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
mrcheko
66307dd889
travis fix #3 :(
2014-05-18 16:10:14 +04:00
mrcheko
74697f8116
travis fix #2
2014-05-18 15:41:15 +04: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
18b3cfebdb
fix importer crash on empty lines (thanks to Ace)
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
cd990a665a
create QString from utf-8 when expected
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