Chris Robinson
a86ed46ec4
Use the race ID specified in the ref base's record instead of the race record
...
The latter is localized and doesn't match with international versions.
2012-07-19 11:00:26 -07:00
Chris Robinson
6caa39629d
Reimplement the skirt part
2012-07-18 22:32:26 -07:00
Chris Robinson
b505d4ace0
Fix feet and entity part detachment
2012-07-18 21:39:50 -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
db948969c9
Attach NPC parts to the proper bone
2012-07-18 11:14:13 -07:00
Chris Robinson
04e496a6ca
Store the entity lists for NPC parts
2012-07-18 10:26:25 -07:00
Chris Robinson
6611b0b317
Use an array instead of a bunch of nearly-identical if blocks
2012-07-18 10:09:16 -07:00
Chris Robinson
02d39080c8
Destroy entities when they're done with.
2012-07-18 00:17:39 -07:00
Chris Robinson
4109d0d923
Destroy entities removed from the NPC
2012-07-17 22:47:56 -07:00
Chris Robinson
92546ca18d
Move the last bits of code to createEntities
2012-07-17 20:23:09 -07:00
Chris Robinson
94f3e7a6c0
Store the entity list in the object
2012-07-17 16:00:03 -07:00
Chris Robinson
a590db2cf4
Create entities when loading NIFs for the NPC base
2012-07-17 15:43:40 -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
c6cc82a51a
Handle multiple entities per NPC part
2012-07-17 12:20:52 -07:00
Chris Robinson
89cfe778f0
Support multiple entities for the NPC base
2012-07-17 11:38:50 -07:00
Chris Robinson
0a4a141f2e
Support multiple meshes for creatures
2012-07-17 11:23:34 -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
Marc Zinnschlag
483b125aad
avoid locking up in case actor updates repeatedly throw exceptions
2012-07-17 18:37:20 +02:00
Marc Zinnschlag
6744375636
fixed a logic error in the auto equip code
2012-07-17 18:35:01 +02:00
Marc Zinnschlag
beb18282bb
Issue #342 : various fixes
2012-07-17 16:44:55 +02:00
Marc Zinnschlag
76de2f7360
Issue #342 : handle magic effects 79-82 and 17-20
2012-07-17 15:49:37 +02:00
Marc Zinnschlag
a3652f16ce
Issue #342 : factored out dynamic stats calculation into a separate function
2012-07-17 12:18:43 +02: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
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
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
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
Chris Robinson
a539e98274
Handle all meshes when inserting objects into the scene
2012-07-16 10:48:48 -07: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
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
Chris Robinson
939d0d2fc5
Return a list of meshes and the skeleton from NIFLoader::load
2012-07-13 20:01:15 -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
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
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
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
Marc Zinnschlag
ec9ebe6b58
Merge branch 'skillgain' into potions
...
Conflicts:
apps/openmw/mwmechanics/activespells.cpp
2012-07-10 14:08:30 +02:00
Marc Zinnschlag
f11bf49a90
cmake fix; silenced some warnings
2012-07-10 13:23:41 +02:00
gugus
164a5c8fe4
rotation now also work with the physic representation
2012-07-10 12:10:50 +02:00
