Marc Zinnschlag
e3d893b001
Merge remote-tracking branch 'jhooks/animationsmooth'
2012-09-06 09:09:46 +02:00
Edmondo Tommasina
7b73bfb099
settings.cpp: fix std::runtime_error compile error
...
Fix following error:
[ 11%] Building CXX object
components/CMakeFiles/components.dir/nifoverrides/nifoverrides.cpp.o
/home/edmondo/src/openmw/components/settings/settings.cpp: In static
member function ‘static const std::string
Settings::Manager::getString(const std::string&, const std::string&)’:
/home/edmondo/src/openmw/components/settings/settings.cpp:82:15: error:
‘runtime_error’ is not a member of ‘std’
make[2]: ***
[components/CMakeFiles/components.dir/settings/settings.cpp.o] Error 1
2012-09-05 23:39:58 +02:00
Marc Zinnschlag
0879abb948
Merge branch 'actiontarget'
2012-09-04 20:56:40 +02:00
Marc Zinnschlag
da041f902f
Issue #370 : fixed item taking sound
2012-09-04 20:56:28 +02:00
Marc Zinnschlag
482874f99e
Merge remote-tracking branch 'scrawl/cache'
2012-09-04 20:40:18 +02:00
Marc Zinnschlag
6813bafbfc
added missing sound effect for chest opening; minor cleanup
2012-09-04 15:42:41 +02:00
Marc Zinnschlag
fb8aae243d
Issue #370 : replaced custom target handling in talk action with base class implementation
2012-09-04 15:38:21 +02:00
Marc Zinnschlag
8ed8dd649a
Issue #370 : replaced custom target handling in take action with base class implementation
2012-09-04 15:34:44 +02:00
Marc Zinnschlag
ea1c3fe1e4
Issue #370 : replaced custom target handling in open action with base class implementation
2012-09-04 15:29:51 +02:00
Marc Zinnschlag
8c2b4f996c
Issue #370 : replaced custom target handling in equip action with base class implementation
2012-09-04 15:27:10 +02:00
Marc Zinnschlag
b51c42146f
Issue #370 : replaced custom target handling in read action with base class implementation
2012-09-04 15:24:55 +02:00
Marc Zinnschlag
3f181f9a9d
Issue #370 : Support for targets in containers
2012-09-04 15:21:56 +02:00
Marc Zinnschlag
cc55056adf
Issue #370 : replaced custom target handling in apply action with base class implementation
2012-09-04 15:18:59 +02:00
Marc Zinnschlag
733654d730
Issue #370 : implemented target handling in action base class
2012-09-04 15:14:33 +02:00
Marc Zinnschlag
1cecab6e3d
fixed RefData::getHandle
2012-09-04 15:08:59 +02:00
Marc Zinnschlag
ead04e1cc3
Issue #389 : added AI sequence to CreatureStats; execute AI packages during the regular actor update
2012-09-04 13:32:35 +02:00
Marc Zinnschlag
345eec1135
Issue #389 : added AI package base class and AI packages management class
2012-09-04 13:25:53 +02:00
Marc Zinnschlag
ef6f033dd1
Merge branch 'multidata'
2012-09-04 11:02:28 +02:00
Marc Zinnschlag
2284d76307
re-enabled local data directory support in launcher
2012-09-04 11:02:18 +02:00
scrawl
c27ff546e4
shader cache
2012-09-02 19:40:26 +02:00
scrawl
950bf66334
throw an exception if default value for a setting is not found
2012-09-02 11:39:54 +02:00
scrawl
4f1bcb749f
turned off redundant edge list building
2012-09-02 10:09:41 +02:00
Marc Zinnschlag
e2bf4694cb
Merge remote-tracking branch 'scrawl/master'
2012-08-31 09:22:32 +02:00
scrawl
ba43f2997f
fix missing character in font for french morrowind version, thanks to jvoisin
2012-08-30 22:08:30 +02:00
scrawl
760f05c454
the HUD can be toggled with F12 key; useful for screenshots
2012-08-30 20:47:39 +02:00
Marc Zinnschlag
bc34fab17f
Merge remote-tracking branch 'greye/aidata'
2012-08-30 09:55:01 +02:00
greye
a90547bbbe
code formatting
2012-08-29 21:35:06 +04:00
Marc Zinnschlag
81463fa23d
Issue #372 : fixed positions in SoundManager
2012-08-29 18:48:20 +02:00
scrawl
dbe3cca828
added a separate core.xml file that works with the mygui layout editor
2012-08-29 13:11:06 +02:00
greye
75fa0288a3
fix creatures has spells, creatures ai data
2012-08-29 14:35:43 +04:00
greye
02d7aa4135
npc ai packages
2012-08-29 14:35:43 +04:00
Marc Zinnschlag
4f411ff1eb
Merge remote-tracking branch 'scrawl/master'
2012-08-29 11:17:33 +02:00
scrawl
6ad08dfd33
added settings for crosshair & subtitles
2012-08-29 11:15:17 +02:00
Marc Zinnschlag
b03f814046
Merge remote-tracking branch 'scrawl/doormarkers'
2012-08-29 11:12:19 +02:00
scrawl
5370fecb6f
fix a small input focus issue with the map
2012-08-29 10:51:36 +02:00
Marc Zinnschlag
4142a2e75c
Merge remote-tracking branch 'mmd/bug381'
2012-08-28 22:12:54 +02:00
Michael Mc Donnell
d7572d815e
Do not define OIS_DYNAMIC_LIB in ICSPrerequisites.h
...
Fixes http://bugs.openmw.org/issues/381
2012-08-28 15:32:12 -04:00
Artem Kotsynyak
e9b2f4ee74
fix equipment visibility update
2012-08-28 22:59:44 +04:00
scrawl
1c5055c8ac
fix a problem where hovering a marker would render it on top of the fog of war instead of below
2012-08-28 18:49:44 +02:00
scrawl
7eaf5e7f0f
changed the markers to look more like morrowind's (hover effect)
2012-08-28 18:40:11 +02:00
scrawl
d9276ca09d
don't make copy of CellRefList in World::getNorthVector
2012-08-28 18:23:59 +02:00
scrawl
3c39c47e2f
don't make copies of CellRefList & LiveCellRef
2012-08-28 18:23:01 +02:00
scrawl
571d5095d4
removed a cout
2012-08-28 17:32:50 +02:00
scrawl
5834b4baa5
door markers on the local map
2012-08-28 17:30:34 +02:00
Marc Zinnschlag
34c30b132c
Issue #378 : workaround for bad ingredient records in Morrowind.esm
2012-08-28 10:12:22 +02:00
Marc Zinnschlag
40d4dad15e
Issue #378 : Fix (record wasn't build fully)
2012-08-28 09:32:38 +02:00
Marc Zinnschlag
160b52162b
Merge remote-tracking branch 'scrawl/quick_keys'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2012-08-28 09:06:40 +02:00
scrawl
321f7c3419
fix an infinite recursion regression on several dialogs.
2012-08-27 21:29:04 +02:00
scrawl
5c28a67203
broke something in the last commit.
2012-08-27 20:55:39 +02:00
scrawl
4f19b7fb9b
fix leaks.
2012-08-27 20:52:32 +02:00