Commit Graph

637 Commits (620b6bf27b8605d69bf5aae24f8d7bb66c72ef67)

Author SHA1 Message Date
Chris Robinson 4f46c8a8db Use a functor for the mismatch compare function 13 years ago
Chris Robinson 36be1536d9 Return text keys from NIFs when creating entities 13 years ago
scrawl 1fef086088 Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"
This reverts commit 546b640022, reversing
changes made to fcaa8aae06.
13 years ago
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
13 years ago
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
13 years ago
scrawl 1dbfd60305 Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup 13 years ago
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>
13 years ago
Chris Robinson 4035d7370e Fix name/filter comparison 13 years ago
Chris Robinson d8cb685543 Interpolate keyframes when creating them
Probably not fully correct, but better than nothing.
13 years ago
Chris Robinson c5b9098517 Remove an unused field from EntityList 13 years ago
scrawl 546b640022 Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup 13 years ago
Chris Robinson 4bc93ecd1a Use the skeleton name for the main animation 13 years ago
scrawl 014396e80c remove the plugins.cfg files, do not enforce CG plugin 13 years ago
Chris Robinson 4210880c06 Load the animation tracks into Ogre 13 years ago
Chris Robinson 0986cd5962 Get the animation controller target names 13 years ago
Chris Robinson c2acf47d88 Store the list of keyframe controllers when building the bones 13 years ago
Chris Robinson f6c837468f Load the proper NIF skeleton 13 years ago
Chris Robinson e760219953 Use a unique loader for each skeleton resource 13 years ago
Chris Robinson c9b1f72d81 Use a case-insensitive compare for the part filter 13 years ago
Chris Robinson bd74ab027a Mirror left-sided parts 13 years ago
Chris Robinson 4af1bce659 Restore and fix some missing parts 13 years ago
Chris Robinson d9b64b77ec Attach skinned parts to the scene node instead of the named bone 13 years ago
Chris Robinson 5154188110 Allow specifying an alternate skeleton for mesh skinning 13 years ago
Chris Robinson 626dcd54dc Store the skeleton name with the mesh resource loader instead of a flag 13 years ago
Chris Robinson 04b244cf9e Use the mesh's skeleton to transform shapes into "bind pose" instead of the NIF nodes 13 years ago
Chris Robinson 2890904fb5 Use lowercase names for the mesh and skeleton resources
To reduce the risk of duplicates due to different capitalizations.
13 years ago
Chris Robinson e8ff304562 Fix the initial normal vector for vertex fixups 13 years ago
Chris Robinson 3b29d280b9 Filter out skinned shapes that don't match the bone name 13 years ago
Chris Robinson db948969c9 Attach NPC parts to the proper bone 13 years ago
Chris Robinson a32740cf5e Remove an unused parameter 13 years ago
Chris Robinson b04c3cbcac Store the entities' root node in the EntityList 13 years ago
Chris Robinson 92546ca18d Move the last bits of code to createEntities 13 years ago
Chris Robinson 1c544682d5 Stub handling for NiTextKeyExtraData to suppress some spam 13 years ago
Chris Robinson 496343b714 Use the proper member for the NIF type string 13 years ago
Chris Robinson 3efd2030e2 Create entities when loading NIFs for creatures 13 years ago
Chris Robinson 3dedac5cb1 Create mesh entities for objects when loading the NIF 13 years ago
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
13 years ago
scrawl 4434fb640e Merge branch 'master' into shadersystem 13 years ago
Chris Robinson 93f0043afc Set the mesh's attach point as the NiTriShape's node 13 years ago
Marc Zinnschlag 2c70a93553 Merge branch 'master' into potions
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
13 years ago
Marc Zinnschlag 4bfed952bc Merge remote branch 'guidoj/master' 13 years ago
guidoj a021165d9f Changed standard C lib includes to C++ format 13 years ago
guidoj 0549e949ba Mostly removal of unnecessary #include's and a little clean up 13 years ago
Chris Robinson 65c20f128f Build bones for non-NiNode nodes (NiTriShapes, etc) 13 years ago
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.
13 years ago
Chris Robinson fefbf86531 Use Ogre's matrix ops to transform normals 13 years ago
Chris Robinson bf26f029f9 Fix some skinning-related transformations 13 years ago
Chris Robinson df76c324a4 Handle the MRK text string marker 13 years ago
Chris Robinson 63e40d6e92 Fix world transform calculation 13 years ago
Chris Robinson 12f1785882 Use default bone names for duplicate names 13 years ago