Marc Zinnschlag
9ff4f5e6b7
Merge remote-tracking branch 'scrawl/master'
2012-09-09 23:37:25 +02:00
scrawl
432c089434
fix the spell tooltips to show the spell target
2012-09-09 23:06:24 +02:00
Marc Zinnschlag
bcf3a81a6c
and a tiny bit more of cleanup
2012-09-09 21:18:47 +02:00
Marc Zinnschlag
9c49ca1468
a bit more random cleanup
2012-09-09 21:08:57 +02:00
Marc Zinnschlag
06677a0fc8
fixed ID handling and some misc cleanup
2012-09-09 21:03:39 +02:00
Marc Zinnschlag
3fad1c0786
fixed a crash
2012-09-09 20:43:21 +02:00
Adam Hogan
08410b9062
Renamed SpellBuyingWindow, took some suggestions from scrawl
2012-09-09 14:10:07 -04:00
Marc Zinnschlag
a3869980a4
Merge remote-tracking branch 'ace/win_fix'
2012-09-09 18:15:03 +02:00
Alexander "Ace" Olofsson
a61edb60fd
Fixed an issue with windows CPack failing due to trying to install linux binaries
2012-09-09 16:28:51 +02:00
Alexander "Ace" Olofsson
7934d8abd9
Fixed an issue with some paths not concatenating properly.
2012-09-09 16:28:02 +02:00
Adam Hogan
d1cae132aa
Merge branch 'master' of git://github.com/zinnschlag/openmw
2012-09-09 10:11:28 -04:00
scrawl
058f0b665c
Merge branch 'master' of https://github.com/zinnschlag/openmw
2012-09-09 15:39:05 +02:00
scrawl
b516813b28
fix a problem with older boost versions
2012-09-09 15:08:11 +02:00
Adam Hogan
562df5388f
Merge branch 'master' of git://github.com/zinnschlag/openmw
2012-09-09 08:38:56 -04:00
Marc Zinnschlag
a1d2505049
Merge remote-tracking branch 'lgro/jenkins-code-coverage-and-unittests'
2012-09-09 09:54:35 +02:00
Adam Hogan
fc10649bb5
Updated shiny
2012-09-08 18:32:43 -04:00
Adam Hogan
ebf80943a9
Added spell buying window
2012-09-08 18:17:03 -04:00
Alexander "Ace" Olofsson
bc6d87ba32
Oops, that would've broken getUserPath() on Linux...
2012-09-08 23:04:53 +02:00
Lukasz Gromanowski
99c46093dd
Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests
2012-09-08 22:18:25 +03:00
Alexander "Ace" Olofsson
cd3e780614
Removing the unnecessary local variables
2012-09-08 20:34:43 +02:00
Alexander "Ace" Olofsson
97f1be2b05
Testing a third way to solve the path issue
2012-09-08 18:47:31 +02:00
Alexander "Ace" Olofsson
6e317f00eb
Fix the problem in a different way
2012-09-08 15:57:12 +02:00
Alexander "Ace" Olofsson
b6fcd337df
Modified the cache path to work on windows
2012-09-08 15:08:24 +02:00
Marc Zinnschlag
21a8dc5ae7
silenced a completely pointless warning
2012-09-06 11:43:04 +02:00
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
gugus
d261263824
oups forgot vmformat
2012-09-02 21:09:07 +02:00
scrawl
c27ff546e4
shader cache
2012-09-02 19:40:26 +02:00
gugus
95c27723f7
fixed a bug (see commit reverted)
2012-09-02 18:12:13 +02:00
gugus
99885e8ca4
Revert "fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p"
...
This reverts commit 165065d378
2012-09-02 18:04:36 +02:00
gugus
fa9f2b268b
PlaceItem,PlaceItemCell,PlaceAtPC,PlaceAtMe
2012-09-02 17:57:03 +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
