teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
3589 commits 34 branches 0 tags 66 MiB
Commit graph

3589 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2012-07-17 10:32:18 +02:00
Marc Zinnschlag
0d3a7d482e Merge remote branch 'modred11/master' 2012-07-17 10:21:46 +02:00
Marc Zinnschlag
4bfed952bc Merge remote branch 'guidoj/master' 2012-07-17 10:17:06 +02:00
Marc Zinnschlag
47ec8f68ee Merge branch 'fix' 2012-07-17 09:50:23 +02:00
Marc Zinnschlag
e9b95d55cd Revert "Proper way to find and use libtbb" 
This reverts commit d6bf2b7d29.
 2012-07-17 09:49:52 +02:00
guidoj
a021165d9f Changed standard C lib includes to C++ format 2012-07-17 09:44:24 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
Chris Robinson
ada88596dc Fix an abort at shutdown 
Ogre uses a special method to delete the stream object, so it needs to be
allocated properly.
 2012-07-16 15:30:09 -07:00
Dmitry Marakasov
d6bf2b7d29 Proper way to find and use libtbb 2012-07-17 00:11:56 +04:00
Dmitry Marakasov
0e934a52ca Include soundmanager.hpp for Play_Normal enum 2012-07-16 23:54:24 +04:00
Dmitry Marakasov
1c53add6c4 Include boost/shared_ptr.hpp for boost:shared_ptr 2012-07-16 23:54:21 +04:00
Dmitry Marakasov
e862b6b5a5 Fix comparison in cmake 2012-07-16 15:53:02 +04:00
scrawl
fb1f8082d2 fix link error with recent glibc versions 2012-07-15 21:27:57 +02:00
Marc Zinnschlag
da916cecfb fixed a bug in a cmake script that resulted in some files being compiled twice 2012-07-15 19:29:09 +02:00
Marc Zinnschlag
871b1d1c9b silenced a warning 2012-07-15 19:20:59 +02:00
Chris Robinson
bc0a6bffcf Remove outdated comment 2012-07-15 09:03:35 -07:00
Chris Robinson
b353cfd457 Remove unused Mangle::VFS 2012-07-15 08:54:00 -07:00
Chris Robinson
bd68f7bd33 Remove final direct uses of Mangle::Stream 2012-07-15 08:51:51 -07:00
Chris Robinson
2a3ce5ee6d Remove Mangle::Stream 
The base Stream class is left because some part of the terrain esm land factory
inherits from it, though it's largely unused (few of the methods work, and none
actually do anything).
 2012-07-15 08:40:18 -07:00
Chris Robinson
7734771245 Use Ogre to load ESM data instead of Mangle 2012-07-15 08:31:03 -07:00
Chris Robinson
a8ebb39883 Avoid Mangle for BSA accesses 
The way it was set up was not very efficient, and we're using Ogre for resource
management anyway, so it's best to just use that.
 2012-07-15 07:50:24 -07:00
scrawl
94c3fb81d1 check if CMAKE_BUILD_TYPE is defined instead of defining it by default 2012-07-14 21:36:42 +02:00
scrawl
32e14907a2 add a default value for CMAKE_BUILD_TYPE, resolves error when it is not set 2012-07-14 19:09:35 +02:00
scrawl
5345d4eeef fix a warning 2012-07-14 18:45:03 +02:00
Marc Zinnschlag
573d7e7e45 Issue #314: fix to potion use function (was mixing up potion with potion user) 2012-07-13 15:51:57 +02:00
Marc Zinnschlag
c4f9bbdc8b Merge remote branch 'scrawl/plugins_dbg' 2012-07-13 13:09:45 +02:00
Marc Zinnschlag
782d417d5b Issue #314: potion usage 2012-07-13 13:09:22 +02:00
Marc Zinnschlag
182017b8e9 Issue #314: Moved ingredients and potions to a different type of record list 2012-07-13 13:08:48 +02:00
Carl Maxwell
e4d046f69c Prepending m to the name of every member variable. 
I made a bunch of changes in apps/openmw/mwrender/animation.cpp
because the scope brackets didn't line up in a bunch of places
    npcanimations.cpp & creatureanimations.cpp were the same kind of
thing
 2012-07-13 03:51:58 -07:00
scrawl
1429c8d5cb copy&paste mistake 2012-07-13 12:43:48 +02:00
scrawl
fb109ec7e2 use debug versions of ogre plugins in debug mode 2012-07-13 11:30:47 +02:00
Marc Zinnschlag
29b4a5e5f7 Issue #314: added apply actions 2012-07-13 09:41:38 +02:00
Marc Zinnschlag
84d846cf07 Issue #314: implemented apply and skillUsageSucceeded functions for MWClass::Npc 2012-07-13 09:16:27 +02:00
Marc Zinnschlag
805b81bf6e Issue #314: added skillUsageSucceeded function to Class 2012-07-13 09:03:17 +02:00
Marc Zinnschlag
7a2d613043 Issue #314: extended Class::apply function to cover the actor 2012-07-13 08:50:46 +02:00
jvoisin
6c73f5e518 Add some translators/reversers to credits.txt 2012-07-10 22:25:19 +03:00
Marc Zinnschlag
089ee33588 some readme.txt improvements 2012-07-10 17:06:27 +02:00
Marc Zinnschlag
1fef4f2bc2 splitting off credits from readme file 2012-07-10 16:59:26 +02:00
Chris Robinson
348b5fa207 Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	components/nifbullet/bullet_nif_loader.cpp
 2012-07-10 06:16:16 -07:00
Marc Zinnschlag
ec9ebe6b58 Merge branch 'skillgain' into potions 
Conflicts:
	apps/openmw/mwmechanics/activespells.cpp
 2012-07-10 14:08:30 +02:00
Chris Robinson
dddf1b4ee5 Rename getMatrix->getMatrix3 and getVector->getVector3 2012-07-10 04:45:14 -07:00
Marc Zinnschlag
f11bf49a90 cmake fix; silenced some warnings 2012-07-10 13:23:41 +02:00
Chris Robinson
d30f64650a Make the read_* methods private and remove the generic load() methods 2012-07-10 04:21:47 -07:00
Chris Robinson
930459365b Rename getShort->getUShort and getByte->getChar 2012-07-10 03:52:01 -07:00
gugus
164a5c8fe4 rotation now also work with the physic representation 2012-07-10 12:10:50 +02:00
Chris Robinson
95b804a104 Remove NIFFile::getArrayLen 2012-07-10 03:02:37 -07:00
gugus
70c74ede05 changed rotation order 2012-07-10 11:53:12 +02:00
Chris Robinson
ca37706b34 Use Ogre types for Matrix and Vector objects 2012-07-10 02:38:35 -07:00
gugus
410b693555 setAngle improvement 2012-07-10 11:15:46 +02:00
Chris Robinson
10072f74b4 Remove NIFFile::getType 2012-07-10 00:27:13 -07:00