scrawl
c39a0368cf
Bug #618 : Make local map textures static in an attempt to fix the disappearing maps with D3D.
...
Also removed problematic DISCARDABLE flag for fog of war textures.
2014-05-11 02:40:15 +02:00
scrawl
c98bea2a88
Moved local map update to LocalMap::updatePlayer to fix a brief desync on cell transitions due to sFogOfWarSkip
2014-05-11 02:27:43 +02:00
scrawl
a4a9794417
Savegame: store fog of war ( Closes #1177 )
2014-05-11 02:07:58 +02:00
scrawl
7b46e9f914
Get rid of no longer needed widget names
2014-05-11 01:05:49 +02:00
scrawl
041319c43e
Fixes #1234 : Store dynamic record counter in savegame to prevent name clashes
2014-05-11 00:32:22 +02:00
scrawl
07d9845aa0
Fix a bug in ESMStore code that checks for duplicate record insertions
2014-05-11 00:10:28 +02:00
scrawl
3ad28ec5aa
Set a proper Page size for all scrollbars. Fixes scrollbars only moving very slowly when interacting with them (as opposed to using mousewheel on the content)
2014-05-11 00:09:02 +02:00
scrawl
dab4db87ff
Fix a bug in marker placement for interior maps
2014-05-10 23:47:00 +02:00
scrawl
b358cf2423
Fix a potential crash when loading script locals from savegame
2014-05-10 21:31:49 +02:00
scrawl
9fb5cef287
Oops, committed debug code
2014-05-10 21:31:49 +02:00
Marc Zinnschlag
8f5acf4741
Merge branch 'openmw-30'
2014-05-10 17:49:02 +02:00
Marc Zinnschlag
5b9e90744e
Merge branch 'load'
2014-05-10 13:49:25 +02:00
Marc Zinnschlag
6fdbd4d3f9
minor adjustment to UniversalId
2014-05-10 13:49:19 +02:00
Marc Zinnschlag
96ca9500ca
generate error messages when encounting non-critical problems during load
2014-05-10 13:47:22 +02:00
Marc Zinnschlag
79d59153c1
improved layout of loading window
2014-05-10 13:29:28 +02:00
Marc Zinnschlag
95d24492de
display load error messages in loading window
2014-05-10 13:18:40 +02:00
Marc Zinnschlag
aadaf7827d
added load error log
2014-05-10 12:04:36 +02:00
Marc Zinnschlag
31b8dad4e0
Merge remote-tracking branch 'scrawl/master'
2014-05-10 10:52:47 +02:00
Marc Zinnschlag
7500895519
updated changelog
2014-05-10 10:52:23 +02:00
Marc Zinnschlag
2009cf9ad7
Merge remote-tracking branch 'scrawl/master' into openmw-30
2014-05-10 10:48:40 +02:00
scrawl
242e19a136
Fix crash when exiting OpenMW while dialogue/journal is opened and mouse cursor on a topic
...
(Fixes #1300 )
2014-05-10 01:37:34 +02:00
scrawl
5163358478
Fix a crash when exiting OpenMW while the mouse cursor is over a local map marker
2014-05-10 01:14:12 +02:00
scrawl
d86585b153
Fix clearing of local map markers
...
destroyWidget changes the child count, so the for loop is flawed.
2014-05-10 01:07:40 +02:00
scrawl
1444cd9051
Fix AiCombat exception when actor has a lockpick/probe equipped.
...
Don't make NPCs autoEquip lockpicks/probes, since they can't use them.
2014-05-10 00:37:36 +02:00
scrawl
136813a882
Bug #1319 : Fix references not coming from a content file incorrectly overwriting each other
2014-05-10 00:01:30 +02:00
scrawl
e7a004824c
Fix a search that should have been find
2014-05-09 23:58:24 +02:00
scrawl
872d9be1b4
Fix potential issue with dialogue globals
...
Make sure they are updated throughout the conversation
2014-05-09 19:19:21 +02:00
scrawl
731bc9c275
Fix broken isClass check and renamed variable for clarity
2014-05-09 18:45:49 +02:00
Marc Zinnschlag
199f030d38
adjusted cmake file for opencs user settings file rename
2014-05-09 17:19:44 +02:00
cc9cii
cf23721f1b
Windows debug build crash fix.
2014-05-09 20:43:24 +10:00
scrawl
6e9458c076
Small fix for dropping items from inventory
...
Some widgets prevented clicking through
2014-05-08 21:04:11 +02:00
scrawl
312dc84fa4
Fix a bug where the player's inventory could be opened as a container
...
If an NPC uses AiActivate on the player (i.e. to activate dialogue) precisely in the frame where the player just died, the player's inventory would be opened as a container instead.
2014-05-08 20:40:45 +02:00
Marc Zinnschlag
3dfd239b83
updated changelog
2014-05-08 20:39:58 +02:00
Marc Zinnschlag
af14bca5aa
Merge branch 'master' into openmw-30
2014-05-08 20:37:54 +02:00
Marc Zinnschlag
cf90da6cd8
minor fix
2014-05-08 15:23:29 +02:00
Marc Zinnschlag
6eff5ecaad
Merge branch 'operations' into load
...
Conflicts:
apps/opencs/main.cpp
apps/opencs/model/doc/document.cpp
2014-05-08 13:17:24 +02:00
Marc Zinnschlag
205306ee3d
changed message passing format from QString to a UniversalId/std::string pair
2014-05-08 12:42:29 +02:00
graffy76
0e7d40de6a
Merge branch 'master' of https://github.com/OpenMW/openmw
...
upstream merge
2014-05-07 22:00:08 -05:00
graffy76
cd7983adb5
Decoupled setting definitions from the Setting class. QSettings
...
implementation is now fully responsible for managing user settings.
2014-05-07 21:59:26 -05:00
Marc Zinnschlag
224f5cf7db
updated changelog
2014-05-07 19:14:04 +02:00
Marc Zinnschlag
21142711f0
Merge remote-tracking branch 'graffy76/master'
2014-05-07 10:35:11 +02:00
graffy76
e47e3de3d2
Removed unneeded includes, cleaned up code, added comments
2014-05-06 21:58:50 -05:00
graffy76
8fb96e1be3
Removed error code for missing opencs.ini files.
2014-05-06 19:22:45 -05:00
Marc Zinnschlag
729e079b0b
Merge remote-tracking branch 'scrawl/master'
2014-05-06 20:18:19 +02:00
scrawl
1c8c26072d
Crime and self defense fixes
...
- NPCs should still shout messages such as "thief" even if they did not report the crime
- Fixed self defense for NPCs (they no longer attack the player when they were attacked by a non-player actor)
- Fixed self defense for creatures (Fixes #1203 )
2014-05-06 19:15:43 +02:00
scrawl
d2beb814e7
Remove superfluous attack phrases (already done by startCombat)
2014-05-06 18:05:53 +02:00
graffy76
042670fc73
Merge remote-tracking branch 'origin'
...
merge
2014-05-06 07:38:29 -05:00
graffy76
a17cb1f389
Fixed opencs.ini formatting
2014-05-06 07:37:52 -05:00
graffy76
79b13a74a3
Incorporated SettingManager into UserSettings class. Other minor code
...
changes to support QSettings integration
2014-05-06 07:33:32 -05:00
Marc Zinnschlag
a30d816982
fixed a mixup in CSMTools::Tools constructor/destructor
2014-05-06 11:44:20 +02:00
