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
Chris Robinson
6a447c88fb
Create meshes from the NiTriShapes in the NIF.
...
This doesn't actually load them yet. It's also very slow for certain NIFs.
2012-07-15 06:45:21 -07:00
scrawl
9ed2f1df67
boost wave not needed anymore
2012-07-15 08:39:34 +02:00
scrawl
778e59ee37
terrain as it was before, with about 4x less code
2012-07-15 08:21:43 +02:00
Chris Robinson
9caa264074
Merge remote branch 'zini/master' into nif-cleanup
2012-07-14 17:27:36 -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
5e8bf28212
Merge branch 'master' into shadersystem
2012-07-14 18:46:11 +02:00
scrawl
5345d4eeef
fix a warning
2012-07-14 18:45:03 +02:00
scrawl
29f91753f7
correction
2012-07-14 18:44:03 +02:00
scrawl
93c641efa7
terrain albedo
2012-07-14 18:25:43 +02:00
Chris Robinson
5a381006e5
Fix parsing of some key lists
...
It seems some still want you to read the interpolation type even when there's
no keys.
2012-07-14 09:20:09 -07:00
scrawl
d41050fb79
merge
2012-07-14 11:21:40 +02:00
scrawl
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2012-07-14 11:16:35 +02:00
scrawl
16c2ea3a75
terrain colourmap
2012-07-14 11:13:38 +02:00
Chris Robinson
939d0d2fc5
Return a list of meshes and the skeleton from NIFLoader::load
2012-07-13 20:01:15 -07:00
Chris Robinson
fdfe40a55a
Use a different loader object for each NIF mesh
2012-07-13 13:41:08 -07:00
Chris Robinson
9436ca4b0c
Use vectors for ShapeData properties
2012-07-13 09:32:58 -07: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
scrawl
d2fbb11475
temp commit
2012-07-13 11:26:36 +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
scrawl
7731e9a6fa
finished cleaning up sky
2012-07-13 09:13:12 +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
scrawl
b8384162b6
merge
2012-07-13 06:16:55 +02:00
Chris Robinson
ecdd4ee23f
Load NiMorphData and NiKeyframeData using proper key lists
2012-07-12 20:56:47 -07:00
Chris Robinson
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
2012-07-12 20:12:18 -07:00
Chris Robinson
9995dff943
Use a key list for NiColorData
2012-07-12 14:33:50 -07:00
Chris Robinson
3f11b6b1ae
Cleanup a couple unneeded misc component references
2012-07-12 12:01:11 -07:00
Chris Robinson
86b37c6c11
Move the velocity out of the transformation object
2012-07-12 11:21:52 -07:00
Chris Robinson
b292665de9
Use key lists to store some NIF data types
2012-07-12 08:00:26 -07:00
Chris Robinson
b7b9f11333
Add generic classes to help deal with NIF keys
2012-07-12 06:47:38 -07:00
Chris Robinson
645b507ba0
Return a reference to the RecordPtr from operator[] for consistency
...
RecordListT is supposed to be a list of RecordPtrT objects.
2012-07-12 05:37:56 -07:00
Chris Robinson
7e8c146de6
Constify some RecordListT methods
2012-07-11 06:39:03 -07:00
Chris Robinson
8e324c90dc
Constify some RecordPtrT methods
2012-07-11 06:37:17 -07:00
scrawl
cd6e9986b6
forgot to add files
2012-07-11 09:09:38 +02:00