greye
18cc435aa1
resolving conflicts
2012-09-21 13:13:11 +04:00
Marc Zinnschlag
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
2012-09-18 11:25:09 +02:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
scrawl
2793096b50
Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/world.hpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
2012-09-15 00:57:29 +02:00
scrawl
35f7216f2f
fixed some things
2012-09-14 17:25:32 +02:00
scrawl
6ac2a12296
item selection working on the preview
2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0
race selection preview
2012-09-13 19:03:31 +02:00
scrawl
4f3eb3c34a
character preview WIP
2012-09-13 00:54:32 +02:00
Jason Hooks
c5b25ef70b
Very basic actor physics (no set scale/rotate functions)
2012-09-10 20:29:24 -04:00
Jason Hooks
083e3537b4
post merge
2012-08-09 17:21:59 -04:00
Jason Hooks
cacf0bd10d
Basic collision with npcs
2012-08-04 15:43:33 -04:00
Chris Robinson
f953d7f8c0
Store text keys from base NIF animations
2012-07-23 17:27:35 -07:00
Chris Robinson
36be1536d9
Return text keys from NIFs when creating entities
2012-07-23 17:20:47 -07:00
Chris Robinson
e81fc42daa
Remove the beast-race special cases from updateParts
...
The special handling should happen at a much lower level, and prevent the
objects from being equipped in the first place.
2012-07-21 17:12:41 -07:00
Chris Robinson
c5b9098517
Remove an unused field from EntityList
2012-07-21 17:09:16 -07:00
Chris Robinson
81ce8dbe12
Combine animation handling into the base class
2012-07-21 14:41:26 -07:00
Chris Robinson
fcaa8aae06
Don't skip animation state updates for NPCs
2012-07-21 11:26:09 -07:00
Chris Robinson
66860825cf
Remove some unused and unneeded bits from the Animation class
2012-07-20 00:36:52 -07:00
Chris Robinson
8b5b74f9ee
Add a quick hack to let "playgroup all" work on creatures and NPCs
2012-07-19 22:34:26 -07:00
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
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
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
Chris Robinson
939d0d2fc5
Return a list of meshes and the skeleton from NIFLoader::load
2012-07-13 20:01:15 -07: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
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
c85aaafac2
more include cleanup (most removing Ogre.h)
2012-07-03 15:32:38 +02:00
Marc Zinnschlag
5a7b95bf7a
Issue #107 : cleaned up includes in apps/openmw/mwworld/class.hpp
2012-07-03 13:15:20 +02:00
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
2012-07-03 12:30:50 +02:00
Marc Zinnschlag
7fcd41c69d
Issue #107 : Detemplateised CellStore; some include cleanup
2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
2012-06-29 16:48:50 +02:00
scrawl
c85c794c86
fixed some cppcheck issues
2012-06-06 20:29:30 +02:00
Marc Zinnschlag
7ac9523e0c
Merge branch 'master' into next
2012-04-23 15:32:02 +02:00
Marc Zinnschlag
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
2012-04-23 15:27:03 +02:00
Marc Zinnschlag
cc86998281
removing some cout spam
2012-04-21 10:12:59 +02:00
Marc Zinnschlag
14ddcc1204
Merge remote branch 'jhooks/clothingarmor'
2012-04-17 00:26:39 +02:00
Jason Hooks
950378ff65
Khajiit male foot fix
2012-04-16 17:25:55 -04:00
Marc Zinnschlag
7483c78b4a
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
2012-04-16 14:06:27 +02:00
