mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 10:49:57 +00:00
Code Issues Releases Wiki Activity
4307 commits 38 branches 54 tags 122 MiB
Commit graph

704 commits

Author SHA1 Message Date
Edmondo Tommasina
32b167ce2b Revert "nif_file.hpp: include type definitions to fix build" 
This reverts commit b0b3ebe123.
 2012-08-04 23:02:27 +02:00
Edmondo Tommasina
a63fd77ccc Revert "esm_reader.hpp: fix std::runtime_error compile error" 
This reverts commit 0f3cb5667f.
 2012-08-04 22:58:26 +02:00
Jason Hooks
cacf0bd10d Basic collision with npcs 2012-08-04 15:43:33 -04:00
Edmondo Tommasina
b0b3ebe123 nif_file.hpp: include type definitions to fix build 2012-08-03 22:42:59 +02:00
Edmondo Tommasina
0f3cb5667f esm_reader.hpp: fix std::runtime_error compile error 2012-08-03 22:41:51 +02:00
Michael Mc Donnell
7f802a22b5 Compare with stream position instead of int. 
Fixes compilation of Debug build on Windows.
 2012-08-01 17:52:20 -04:00
Marc Zinnschlag
f8e54b401b fixed linkage problem 2012-08-01 09:09:00 +02:00
Nikolay Kasyanov
32d2326b4d Update components/files/ogreplugin.hpp 
removed #error directive
 2012-07-31 18:15:09 +04:00
Nikolay Kasyanov
03cccee0e4 bug #348: workaround for boost older than 1.44 2012-07-31 10:51:34 +04:00
Nikolay Kasyanov
defab0e4b5 Merge remote-tracking branch 'upstream/master' into osx_fix 
Conflicts:
	CMakeLists.txt
 2012-07-31 01:06:18 +04:00
Nikolay Kasyanov
b05dfeae70 bug #348: cleanup 
moved files to appropriate component, moved function to namespace,
added docs
 2012-07-31 01:01:00 +04:00
Nikolay Kasyanov
a84d8e83cd add const specifier to first argument, also made it reference 2012-07-28 02:39:49 +04:00
Nikolay Kasyanov
b0b2064232 always add debug suffix in plugin loader 
also removed cout spam
 2012-07-28 02:31:30 +04:00
Nikolay Kasyanov
fbe9a94568 bug #348: fixed OS X deployment 
just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search
plugins inside application bundle instead of Ogre prefix
 2012-07-28 01:55:37 +04:00
scrawl
281e15f58e consider all material properties for nif material sharing, instead of just the texture 2012-07-26 23:40:55 +02:00
Chris Robinson
4f46c8a8db Use a functor for the mismatch compare function 2012-07-24 14:59:25 -07:00
Chris Robinson
36be1536d9 Return text keys from NIFs when creating entities 2012-07-23 17:20:47 -07:00
scrawl
1fef086088 Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup" 
This reverts commit 546b640022, reversing
changes made to fcaa8aae06.
 2012-07-23 15:36:12 +02:00
scrawl
f8d6a36196 Merge branch 'master' into nif-cleanup 
Conflicts:
	apps/openmw/mwrender/sky.cpp
	apps/openmw/mwrender/sky.hpp
	components/nifogre/ogre_nif_loader.cpp
	components/nifogre/ogre_nif_loader.hpp
 2012-07-23 15:35:31 +02:00
Marc Zinnschlag
2c5d3d8df9 Merge remote branch 'scrawl/shadersystem' into shadersystem 
Attention: We have submodules again. Don't forget to update!

Conflicts:
	components/files/configurationmanager.cpp
 2012-07-23 14:12:21 +02:00
scrawl
1dbfd60305 Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup 2012-07-23 13:48:12 +02:00
Lukasz Gromanowski
1dde806add Fixes #313: openmw without a ~/.config/openmw folder segfault. 
Added creation of $HOME/.config/openmw directory.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-07-22 14:52:55 +03:00
Chris Robinson
4035d7370e Fix name/filter comparison 2012-07-21 22:04:05 -07:00
Chris Robinson
d8cb685543 Interpolate keyframes when creating them 
Probably not fully correct, but better than nothing.
 2012-07-21 18:03:01 -07:00
Chris Robinson
c5b9098517 Remove an unused field from EntityList 2012-07-21 17:09:16 -07:00
scrawl
546b640022 Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup 2012-07-21 23:50:56 +02:00
Chris Robinson
4bc93ecd1a Use the skeleton name for the main animation 2012-07-20 11:09:05 -07:00
scrawl
014396e80c remove the plugins.cfg files, do not enforce CG plugin 2012-07-20 16:44:03 +02:00
Chris Robinson
4210880c06 Load the animation tracks into Ogre 2012-07-19 21:46:16 -07:00
Chris Robinson
0986cd5962 Get the animation controller target names 2012-07-19 20:48:12 -07:00
Chris Robinson
c2acf47d88 Store the list of keyframe controllers when building the bones 2012-07-19 20:30:10 -07:00
Chris Robinson
f6c837468f Load the proper NIF skeleton 2012-07-19 11:44:08 -07:00
Chris Robinson
e760219953 Use a unique loader for each skeleton resource 2012-07-19 11:36:36 -07:00
Chris Robinson
c9b1f72d81 Use a case-insensitive compare for the part filter 2012-07-18 22:31:07 -07:00
Chris Robinson
bd74ab027a Mirror left-sided parts 2012-07-18 21:21:49 -07:00
Chris Robinson
4af1bce659 Restore and fix some missing parts 2012-07-18 20:14:23 -07:00
Chris Robinson
d9b64b77ec Attach skinned parts to the scene node instead of the named bone 2012-07-18 18:38:55 -07:00
Chris Robinson
5154188110 Allow specifying an alternate skeleton for mesh skinning 2012-07-18 18:29:25 -07:00
Chris Robinson
626dcd54dc Store the skeleton name with the mesh resource loader instead of a flag 2012-07-18 17:26:51 -07:00
Chris Robinson
04b244cf9e Use the mesh's skeleton to transform shapes into "bind pose" instead of the NIF nodes 2012-07-18 17:18:21 -07:00
Chris Robinson
2890904fb5 Use lowercase names for the mesh and skeleton resources 
To reduce the risk of duplicates due to different capitalizations.
 2012-07-18 15:27:33 -07:00
Chris Robinson
e8ff304562 Fix the initial normal vector for vertex fixups 2012-07-18 12:53:45 -07:00
Chris Robinson
3b29d280b9 Filter out skinned shapes that don't match the bone name 2012-07-18 12:47:16 -07:00
Chris Robinson
db948969c9 Attach NPC parts to the proper bone 2012-07-18 11:14:13 -07:00
Chris Robinson
a32740cf5e Remove an unused parameter 2012-07-17 22:41:26 -07:00
Chris Robinson
b04c3cbcac Store the entities' root node in the EntityList 2012-07-17 21:42:47 -07:00
Chris Robinson
92546ca18d Move the last bits of code to createEntities 2012-07-17 20:23:09 -07:00
Chris Robinson
1c544682d5 Stub handling for NiTextKeyExtraData to suppress some spam 2012-07-17 16:45:01 -07:00
Chris Robinson
496343b714 Use the proper member for the NIF type string 2012-07-17 16:36:43 -07:00
Chris Robinson
3efd2030e2 Create entities when loading NIFs for creatures 2012-07-17 14:11:07 -07:00
Chris Robinson
3dedac5cb1 Create mesh entities for objects when loading the NIF 2012-07-17 13:40:03 -07:00
Chris Robinson
6047dc6a0c Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/animation.hpp
	apps/openmw/mwrender/creatureanimation.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
	components/nifogre/ogre_nif_loader.hpp
 2012-07-17 10:57:15 -07:00
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Chris Robinson
93f0043afc Set the mesh's attach point as the NiTriShape's node 2012-07-17 10:04:21 -07:00
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
4bfed952bc Merge remote branch 'guidoj/master' 2012-07-17 10:17:06 +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
65c20f128f Build bones for non-NiNode nodes (NiTriShapes, etc) 2012-07-16 21:18:33 -07: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
Chris Robinson
fefbf86531 Use Ogre's matrix ops to transform normals 2012-07-16 14:30:23 -07:00
Chris Robinson
bf26f029f9 Fix some skinning-related transformations 2012-07-16 13:47:19 -07:00
Chris Robinson
df76c324a4 Handle the MRK text string marker 2012-07-16 13:34:56 -07:00
Chris Robinson
63e40d6e92 Fix world transform calculation 2012-07-16 13:16:11 -07:00
Chris Robinson
12f1785882 Use default bone names for duplicate names 2012-07-16 11:43:16 -07:00
Chris Robinson
75ce10c580 Don't load data for hidden meshes 2012-07-16 11:31:45 -07:00
Chris Robinson
ad75b47472 Build and set up a skeleton for meshes 2012-07-15 19:07:31 -07:00
Chris Robinson
b1f7fd9f7b Pre-transform the mesh vertices when there's no skinning or skeleton 2012-07-15 17:00:27 -07:00
Chris Robinson
61f32eca77 Add methods to get a node's local and full transform as a 4x4 matrix 2012-07-15 15:23:49 -07:00
Chris Robinson
441a5c2da2 Load NiTriShapes into Ogre meshes 2012-07-15 14:12:12 -07:00
Chris Robinson
3029c221ef Create materials when creating meshes 2012-07-15 12:59:39 -07:00
scrawl
509e9d7034 Merge branch 'master' into shadersystem 2012-07-15 21:58:45 +02:00
scrawl
fb1f8082d2 fix link error with recent glibc versions 2012-07-15 21:27:57 +02:00
Chris Robinson
b4c8375f3c Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	components/bsa/bsa_archive.cpp
 2012-07-15 12:04:43 -07:00
Chris Robinson
9028cfe83c Look for the NiTriShape when the mesh resource wants to load 
It's still not loaded yet.
 2012-07-15 12:02:47 -07:00
Chris Robinson
69ed73399a Avoid exposing the NIF mesh resource loading class 2012-07-15 11:40:48 -07:00
Chris Robinson
300730a834 Create the skeleton resource from NIFs 
Note they are not loaded yet.
 2012-07-15 11:13:48 -07: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
bd68f7bd33 Remove final direct uses of Mangle::Stream 2012-07-15 08:51:51 -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
Chris Robinson
9caa264074 Merge remote branch 'zini/master' into nif-cleanup 2012-07-14 17:27:36 -07: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
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
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
182017b8e9 Issue #314: Moved ingredients and potions to a different type of record list 2012-07-13 13:08:48 +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